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

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 8e15896b3c091cda40746ea3bdd389308b3ebea7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 08:33:57 2011 +0000

    2011-01-24  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r76463.
            http://trac.webkit.org/changeset/76463
            https://bugs.webkit.org/show_bug.cgi?id=52993
    
            It broke canvas/philip/tests/2d.path.stroke.skew.html
            (Requested by Ossy on #webkit).
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::rotate):
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::addArc):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 224452b..0b11a73 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-24  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r76463.
+        http://trac.webkit.org/changeset/76463
+        https://bugs.webkit.org/show_bug.cgi?id=52993
+
+        It broke canvas/philip/tests/2d.path.stroke.skew.html
+        (Requested by Ossy on #webkit).
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::rotate):
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::addArc):
+
 2011-01-23  Andrey Kosyakov  <caseq at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 0718dcb..87cc87c 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -62,7 +62,10 @@
 #include <QPolygonF>
 #include <QStack>
 #include <QVector>
-#include <wtf/MathExtras.h>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
 
 namespace WebCore {
 
@@ -1132,7 +1135,7 @@ void GraphicsContext::rotate(float radians)
     if (paintingDisabled())
         return;
 
-    m_data->p()->rotate(rad2deg(radians));
+    m_data->p()->rotate(180 / M_PI*radians);
 }
 
 void GraphicsContext::scale(const FloatSize& s)
diff --git a/Source/WebCore/platform/graphics/qt/PathQt.cpp b/Source/WebCore/platform/graphics/qt/PathQt.cpp
index 37413d8..571b405 100644
--- a/Source/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/PathQt.cpp
@@ -39,9 +39,15 @@
 #include <QPainterPath>
 #include <QTransform>
 #include <QString>
-#include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
 
+#define _USE_MATH_DEFINES
+#include <math.h>
+
+#ifndef M_PI
+#   define M_PI 3.14159265358979323846
+#endif
+
 namespace WebCore {
 
 Path::Path()
@@ -257,6 +263,7 @@ void Path::closeSubpath()
     m_path.closeSubpath();
 }
 
+#define DEGREES(t) ((t) * 180.0 / M_PI)
 void Path::addArc(const FloatPoint& p, float r, float sar, float ear, bool anticlockwise)
 {
     qreal xc = p.x();
@@ -273,8 +280,8 @@ void Path::addArc(const FloatPoint& p, float r, float sar, float ear, bool antic
     anticlockwise = !anticlockwise;
     //end hack
 
-    float sa = rad2deg(sar);
-    float ea = rad2deg(ear);
+    float sa = DEGREES(sar);
+    float ea = DEGREES(ear);
 
     double span = 0;
 

-- 
WebKit Debian packaging