[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5e5c86c2b1800fd74526189a8fd7485e7270c369
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 22:37:11 2010 +0000

    2010-07-29  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Dirk Schulze.
    
            [Cairo] Remove setStrokeStyle workaround for InlineTextBoxes
            https://bugs.webkit.org/show_bug.cgi?id=43136
    
            Remove workaround added in https://bugs.webkit.org/show_bug.cgi?id=15659
            to fix stroke style for InlineTextBox underlines.
    
            No new tests as this should not change functionality.
    
            * platform/graphics/cairo/GraphicsContextCairo.cpp:
            (WebCore::GraphicsContext::drawLineForText): Remove old workaround.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 936b940..7655f8a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Dirk Schulze.
+
+        [Cairo] Remove setStrokeStyle workaround for InlineTextBoxes
+        https://bugs.webkit.org/show_bug.cgi?id=43136
+
+        Remove workaround added in https://bugs.webkit.org/show_bug.cgi?id=15659
+        to fix stroke style for InlineTextBox underlines.
+
+        No new tests as this should not change functionality.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::drawLineForText): Remove old workaround.
+
 2010-07-28  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index 96cd4ee..79431f0 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -700,14 +700,8 @@ void GraphicsContext::drawLineForText(const IntPoint& origin, int width, bool pr
     if (paintingDisabled())
         return;
 
-    // This is a workaround for http://bugs.webkit.org/show_bug.cgi?id=15659
-    StrokeStyle savedStrokeStyle = strokeStyle();
-    setStrokeStyle(SolidStroke);
-
     IntPoint endPoint = origin + IntSize(width, 0);
     drawLine(origin, endPoint);
-
-    setStrokeStyle(savedStrokeStyle);
 }
 
 #if !PLATFORM(GTK)

-- 
WebKit Debian packaging