diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp')
-rw-r--r-- | Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp index 7117618..9d80fbe 100644 --- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp +++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp @@ -39,12 +39,12 @@ namespace WebCore { using namespace MathMLNames; -static const double gHorizontalPad = 0.2; -static const double gLineThin = 0.33; -static const double gLineMedium = 1.; -static const double gLineThick = 3.; -static const double gFractionBarWidth = 0.05; -static const double gDenominatorPad = 0.1; +static const float gHorizontalPad = 0.2f; +static const float gLineThin = 0.33f; +static const float gLineMedium = 1.f; +static const float gLineThick = 3.f; +static const float gFractionBarWidth = 0.05f; +static const float gDenominatorPad = 0.1f; RenderMathMLFraction::RenderMathMLFraction(Element* fraction) : RenderMathMLBlock(fraction) @@ -125,7 +125,7 @@ void RenderMathMLFraction::layout() // Adjust the fraction line thickness for the zoom if (lastChild() && lastChild()->isRenderBlock()) - m_lineThickness *= ceil(gFractionBarWidth * style()->fontSize()); + m_lineThickness *= ceilf(gFractionBarWidth * style()->fontSize()); RenderBlock::layout(); @@ -158,7 +158,7 @@ void RenderMathMLFraction::paint(PaintInfo& info, int tx, int ty) info.context->save(); - info.context->setStrokeThickness(static_cast<float>(m_lineThickness)); + info.context->setStrokeThickness(m_lineThickness); info.context->setStrokeStyle(SolidStroke); info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), ColorSpaceSRGB); |