[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mrowe at apple.com mrowe at apple.com
Sun Feb 20 22:46:44 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit c9db71247dbaa1e431b90421a72e10001e6632ce
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 13:18:22 2011 +0000

    Roll out r75487 since it broke the 32-bit build.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 40b7e96..92ecb7c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -34,19 +34,6 @@
          * platform/image-encoders/skia/JPEGImageEncoder.cpp:
          (WebCore::preMultipliedBGRAtoRGB): Use Porter-Duff source-over black.
 
-2011-01-11  François Sausset  <sausset at gmail.com>
-
-        Reviewed by Eric Seidel.
-
-        Code cleaning in rendering/mathml/RenderMathMLFraction.cpp
-        https://bugs.webkit.org/show_bug.cgi?id=52201
-
-        Replace unneeded doubles by floats and remove unneeded casts.
-
-        * rendering/mathml/RenderMathMLFraction.cpp:
-        (WebCore::RenderMathMLFraction::paint):
-        * rendering/mathml/RenderMathMLFraction.h:
-
 2011-01-11  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
index 5e7465c..a3e66bd 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
+++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
@@ -38,12 +38,12 @@ namespace WebCore {
     
 using namespace MathMLNames;
 
-static const float gHorizontalPad = 0.2;
-static const float gLineThin = 0.33;
-static const float gLineMedium = 1.;
-static const float gLineThick = 3.;
-static const float gFractionBarWidth = 0.05;
-static const float gDenominatorPad = 0.1;
+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;
 
 RenderMathMLFraction::RenderMathMLFraction(Element* fraction) 
     : RenderMathMLBlock(fraction)
@@ -157,7 +157,7 @@ void RenderMathMLFraction::paint(PaintInfo& info, int tx, int ty)
     
     info.context->save();
     
-    info.context->setStrokeThickness(m_lineThickness);
+    info.context->setStrokeThickness(static_cast<float>(m_lineThickness));
     info.context->setStrokeStyle(SolidStroke);
     info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), ColorSpaceSRGB);
     
diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.h b/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
index c96d56d..2a03f81 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
+++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
@@ -43,7 +43,7 @@ public:
 protected:
     virtual void layout();
 private:
-    float m_lineThickness;
+    double m_lineThickness;
 };
 
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list