[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit eb3d7d6e034fdfdaf108677bb7fc7b0053344346
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 19:41:30 2011 +0000

    2011-01-07  Xan Lopez  <xlopez at igalia.com>
    
            Unreviewed, rolling out r75256.
            http://trac.webkit.org/changeset/75256
            https://bugs.webkit.org/show_bug.cgi?id=50869
    
            Broke GTK+ canvas tests
    
            * platform/gtk/Skipped:
    2011-01-07  Xan Lopez  <xlopez at igalia.com>
    
            Unreviewed, rolling out r75256.
            http://trac.webkit.org/changeset/75256
            https://bugs.webkit.org/show_bug.cgi?id=50869
    
            Broke GTK+ canvas tests
    
            * platform/graphics/cairo/PathCairo.cpp:
            (WebCore::Path::addArc):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ddcebc0..dcee758 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-07  Xan Lopez  <xlopez at igalia.com>
+
+        Unreviewed, rolling out r75256.
+        http://trac.webkit.org/changeset/75256
+        https://bugs.webkit.org/show_bug.cgi?id=50869
+
+        Broke GTK+ canvas tests
+
+        * platform/gtk/Skipped:
+
 2011-01-07  Jessie Berlin  <jberlin at apple.com>
 
         Unreviewed, rolling out r75205.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 961881f..5baa374 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5580,6 +5580,11 @@ fast/dom/StyleSheet/detached-style-pi-2.xhtml
 fast/dom/StyleSheet/detached-style-pi.xhtml
 fast/dom/StyleSheet/detached-style.html
 
+# The test times out, we have to improve the performance of the
+# rendering in these situations to
+# https://bugs.webkit.org/show_bug.cgi?id=50869
+fast/canvas/canvas-largedraws.html
+
 # https://bugs.webkit.org/show_bug.cgi?id=50886
 fast/dom/Window/timer-resume-on-navigation-back.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 35121ac..30a8e26 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-07  Xan Lopez  <xlopez at igalia.com>
+
+        Unreviewed, rolling out r75256.
+        http://trac.webkit.org/changeset/75256
+        https://bugs.webkit.org/show_bug.cgi?id=50869
+
+        Broke GTK+ canvas tests
+
+        * platform/graphics/cairo/PathCairo.cpp:
+        (WebCore::Path::addArc):
+
 2011-01-07  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/cairo/PathCairo.cpp b/WebCore/platform/graphics/cairo/PathCairo.cpp
index 195269d..03f1d10 100644
--- a/WebCore/platform/graphics/cairo/PathCairo.cpp
+++ b/WebCore/platform/graphics/cairo/PathCairo.cpp
@@ -5,7 +5,6 @@
                   2005, 2007 Apple Inc. All Rights reserved.
                   2007 Alp Toker <alp at atoker.com>
                   2008 Dirk Schulze <krit at webkit.org>
-                  2011 Igalia S.L.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -152,21 +151,10 @@ void Path::addArc(const FloatPoint& p, float r, float sa, float ea, bool anticlo
         return;
 
     cairo_t* cr = platformPath()->context();
-    float sweep = ea - sa;
-    const float twoPI = 2 * M_PI;
-    if (sweep <= -twoPI || sweep >= twoPI) {
-        if (anticlockwise)
-            cairo_arc_negative(cr, p.x(), p.y(), r, sa, sa - twoPI);
-        else
-            cairo_arc(cr, p.x(), p.y(), r, sa, sa + twoPI);
-        cairo_new_sub_path(cr);
-        cairo_arc(cr, p.x(), p.y(), r, ea, ea);
-    } else {
-        if (anticlockwise)
-            cairo_arc_negative(cr, p.x(), p.y(), r, sa, ea);
-        else
-            cairo_arc(cr, p.x(), p.y(), r, sa, ea);
-    }
+    if (anticlockwise)
+        cairo_arc_negative(cr, p.x(), p.y(), r, sa, ea);
+    else
+        cairo_arc(cr, p.x(), p.y(), r, sa, ea);
 }
 
 void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)

-- 
WebKit Debian packaging