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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e26fe27753d62ef1e4e9802e2b745b02f5843427
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 25 15:44:18 2010 +0000

    2010-09-25  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] GraphicsContext::setLineDash() should scale dashOffset to penWidth
            https://bugs.webkit.org/show_bug.cgi?id=46548
    
            Fixes incorrect rendering of <http://www.carto.net/svg/samples/animated_bustrack.shtml>
    
            This is covered by existing layout tests which need to be rebaselined.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::setLineDash):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 452036f..35ae252 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-25  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsContext::setLineDash() should scale dashOffset to penWidth
+        https://bugs.webkit.org/show_bug.cgi?id=46548
+
+        Fixes incorrect rendering of <http://www.carto.net/svg/samples/animated_bustrack.shtml>
+
+        This is covered by existing layout tests which need to be rebaselined.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::setLineDash):
+
 2010-09-24  Sam Weinig  <sam at webkit.org>
 
         Rubber-stamped by Dan Bernstein.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 73ecefb..7e4af40 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1002,7 +1002,7 @@ void GraphicsContext::setLineDash(const DashArray& dashes, float dashOffset)
             pattern.append(dashes[i % dashLength] / penWidth);
 
         pen.setDashPattern(pattern);
-        pen.setDashOffset(dashOffset);
+        pen.setDashOffset(dashOffset / penWidth);
     } else
         pen.setStyle(Qt::SolidLine);
     p->setPen(pen);

-- 
WebKit Debian packaging