[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bdakin at apple.com
bdakin at apple.com
Wed Dec 22 11:41:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 739f4d0fd8ef8a2ff9f6e698bb50ecb269a66e6c
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 22:42:57 2010 +0000
Speculative build fix for Leopard.
* mathml/RenderMathMLOperator.cpp:
* mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::paint):
(WebCore::RenderMathMLRoot::layout):
* mathml/RenderMathMLSquareRoot.cpp:
(WebCore::RenderMathMLSquareRoot::paint):
* mathml/RenderMathMLSubSup.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64596 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9942b44..5fe24dd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-08-03 Beth Dakin <bdakin at apple.com>
+ Speculative build fix for Leopard.
+
+ * mathml/RenderMathMLOperator.cpp:
+ * mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::paint):
+ (WebCore::RenderMathMLRoot::layout):
+ * mathml/RenderMathMLSquareRoot.cpp:
+ (WebCore::RenderMathMLSquareRoot::paint):
+ * mathml/RenderMathMLSubSup.cpp:
+
+2010-08-03 Beth Dakin <bdakin at apple.com>
+
Speculative build fix.
* css/mathml.css:
diff --git a/WebCore/mathml/RenderMathMLOperator.cpp b/WebCore/mathml/RenderMathMLOperator.cpp
index 911c5d2..570e2fc 100644
--- a/WebCore/mathml/RenderMathMLOperator.cpp
+++ b/WebCore/mathml/RenderMathMLOperator.cpp
@@ -56,8 +56,8 @@ bool RenderMathMLOperator::isChildAllowed(RenderObject*, RenderStyle*) const
return false;
}
-static const float gOperatorSpacer = 0.1;
-static const float gOperatorExpansion = 1.2;
+static const float gOperatorSpacer = 0.1f;
+static const float gOperatorExpansion = 1.2f;
void RenderMathMLOperator::stretchToHeight(int height)
{
@@ -113,7 +113,7 @@ static const int gMinimumStretchHeight = 24;
static const int gGlyphHeight = 10;
static const int gMiddleGlyphTopAdjust = -2;
static const int gBottomGlyphTopAdjust = -4;
-static const float gMinimumRatioForStretch = 0.10;
+static const float gMinimumRatioForStretch = 0.10f;
void RenderMathMLOperator::updateFromElement()
{
diff --git a/WebCore/mathml/RenderMathMLRoot.cpp b/WebCore/mathml/RenderMathMLRoot.cpp
index c624539..5bfff85 100644
--- a/WebCore/mathml/RenderMathMLRoot.cpp
+++ b/WebCore/mathml/RenderMathMLRoot.cpp
@@ -42,26 +42,26 @@ const int gRadicalLeftMargin = 3;
// Bottom padding of the radical (px)
const int gRadicalBasePad = 3;
// Threshold above which the radical shape is modified to look nice with big bases (%)
-const float gThresholdBaseHeight = 1.5;
+const float gThresholdBaseHeight = 1.5f;
// Radical width (%)
-const float gRadicalWidth = 0.75;
+const float gRadicalWidth = 0.75f;
// Horizontal position of the bottom point of the radical (%)
-const float gRadicalBottomPointXPos= 0.5;
+const float gRadicalBottomPointXPos= 0.5f;
// Horizontal position of the top left point of the radical (%)
-const float gRadicalTopLeftPointXPos = 0.8;
+const float gRadicalTopLeftPointXPos = 0.8f;
// Vertical position of the top left point of the radical (%)
-const float gRadicalTopLeftPointYPos = 0.625;
+const float gRadicalTopLeftPointYPos = 0.625f;
// Vertical shift of the left end point of the radical (%)
-const float gRadicalLeftEndYShift = 0.05;
+const float gRadicalLeftEndYShift = 0.05f;
// Root padding around the base (%)
-const float gRootPadding = 0.2;
+const float gRootPadding = 0.2f;
// Additional bottom root padding (%)
-const float gRootBottomPadding = 0.2;
+const float gRootBottomPadding = 0.2f;
// Radical line thickness (%)
-const float gRadicalLineThickness = 0.02;
+const float gRadicalLineThickness = 0.02f;
// Radical thick line thickness (%)
-const float gRadicalThickLineThickness = 0.1;
+const float gRadicalThickLineThickness = 0.1f;
RenderMathMLRoot::RenderMathMLRoot(Node *expression)
: RenderMathMLBlock(expression)
@@ -129,7 +129,7 @@ void RenderMathMLRoot::paint(PaintInfo& info, int tx, int ty)
if (maxHeight > thresholdHeight && thresholdHeight) {
float shift = (maxHeight - thresholdHeight) / static_cast<float>(thresholdHeight);
if (shift > 1.)
- shift = 1.;
+ shift = 1.0f;
topStartShift = static_cast<int>(gRadicalBottomPointXPos * frontWidth * shift);
}
@@ -219,7 +219,7 @@ void RenderMathMLRoot::layout()
if (maxHeight > thresholdHeight && thresholdHeight) {
float shift = (maxHeight - thresholdHeight) / static_cast<float>(thresholdHeight);
if (shift > 1.)
- shift = 1.;
+ shift = 1.0f;
int frontWidth = static_cast<int>(style()->fontSize() * gRadicalWidth);
topStartShift = static_cast<int>(gRadicalBottomPointXPos * frontWidth * shift);
diff --git a/WebCore/mathml/RenderMathMLSquareRoot.cpp b/WebCore/mathml/RenderMathMLSquareRoot.cpp
index be62f57..86add7a 100644
--- a/WebCore/mathml/RenderMathMLSquareRoot.cpp
+++ b/WebCore/mathml/RenderMathMLSquareRoot.cpp
@@ -41,24 +41,24 @@ using namespace MathMLNames;
// Bottom padding of the radical (px)
const int gRadicalBasePad = 3;
// Threshold above which the radical shape is modified to look nice with big bases (%)
-const float gThresholdBaseHeight = 1.5;
+const float gThresholdBaseHeight = 1.5f;
// Radical width (%)
-const float gRadicalWidth = 0.75;
+const float gRadicalWidth = 0.75f;
// Horizontal position of the bottom point of the radical (%)
-const float gRadicalBottomPointXPos= 0.5;
+const float gRadicalBottomPointXPos= 0.5f;
// Horizontal position of the top left point of the radical (%)
-const float gRadicalTopLeftPointXPos = 0.2;
+const float gRadicalTopLeftPointXPos = 0.2f;
// Vertical position of the top left point of the radical (%)
-const float gRadicalTopLeftPointYPos = 0.5;
+const float gRadicalTopLeftPointYPos = 0.5f;
// Vertical shift of the left end point of the radical (%)
-const float gRadicalLeftEndYShift = 0.05;
+const float gRadicalLeftEndYShift = 0.05f;
// Additional bottom root padding (%)
-const float gRootBottomPadding = 0.2;
+const float gRootBottomPadding = 0.2f;
// Radical line thickness (%)
-const float gRadicalLineThickness = 0.02;
+const float gRadicalLineThickness = 0.02f;
// Radical thick line thickness (%)
-const float gRadicalThickLineThickness = 0.1;
+const float gRadicalThickLineThickness = 0.1f;
RenderMathMLSquareRoot::RenderMathMLSquareRoot(Node *expression)
: RenderMathMLBlock(expression)
@@ -102,7 +102,7 @@ void RenderMathMLSquareRoot::paint(PaintInfo& info, int tx, int ty)
if (maxHeight > thresholdHeight && thresholdHeight) {
float shift = (maxHeight - thresholdHeight) / static_cast<float>(thresholdHeight);
if (shift > 1.)
- shift = 1.;
+ shift = 1.0f;
topStartShift = static_cast<int>(gRadicalBottomPointXPos * frontWidth * shift);
}
diff --git a/WebCore/mathml/RenderMathMLSubSup.cpp b/WebCore/mathml/RenderMathMLSubSup.cpp
index 45ad000..52ac0e3 100644
--- a/WebCore/mathml/RenderMathMLSubSup.cpp
+++ b/WebCore/mathml/RenderMathMLSubSup.cpp
@@ -44,7 +44,7 @@ using namespace MathMLNames;
static const int gTopAdjustDivisor = 3;
static const int gSubsupScriptMargin = 1;
-static const float gSubSupStretch = 1.2;
+static const float gSubSupStretch = 1.2f;
RenderMathMLSubSup::RenderMathMLSubSup(Element* element)
: RenderMathMLBlock(element)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list