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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 306426d465c295a022d6c31a48e45798802719fc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 23:34:04 2010 +0000

    2010-08-14  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r65374.
            http://trac.webkit.org/changeset/65374
            https://bugs.webkit.org/show_bug.cgi?id=44018
    
            broke a myriad of svg tests (Requested by kling on #webkit).
    
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::strokeBoundingRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f337f12..b474357 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-14  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r65374.
+        http://trac.webkit.org/changeset/65374
+        https://bugs.webkit.org/show_bug.cgi?id=44018
+
+        broke a myriad of svg tests (Requested by kling on #webkit).
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::strokeBoundingRect):
+
 2010-08-14  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index 896d0c7..de9de07 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -163,17 +163,19 @@ FloatRect Path::boundingRect() const
 FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
 {
     GraphicsContext* gc = scratchContext();
-
-    if (applier)
+    QPainterPathStroker stroke;
+    if (applier) {
         applier->strokeStyle(gc);
 
-    QPen pen = gc->pen();
-
-    // Fast approximation of the stroke's bounding rect.
-    // This yields a slightly oversized rect but is very fast compared to QPainterPathStroker.
-    FloatRect rect = m_path.controlPointRect();
-    rect.inflate(pen.miterLimit() + pen.widthF());
-    return rect;
+        QPen pen = gc->pen();
+        stroke.setWidth(pen.widthF());
+        stroke.setCapStyle(pen.capStyle());
+        stroke.setJoinStyle(pen.joinStyle());
+        stroke.setMiterLimit(pen.miterLimit());
+        stroke.setDashPattern(pen.dashPattern());
+        stroke.setDashOffset(pen.dashOffset());
+    }
+    return stroke.createStroke(m_path).boundingRect();
 }
 
 void Path::moveTo(const FloatPoint& point)

-- 
WebKit Debian packaging