Changeset 73125 in webkit

Timestamp:

Dec 2, 2010 5:39:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-02 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] GraphicsContext::strokeRect() taints the context's lineWidth
​https://bugs.webkit.org/show_bug.cgi?id=50269

• fast/canvas/canvas-lineWidth-intact-after-strokeRect-expected.txt: Added.
• fast/canvas/canvas-lineWidth-intact-after-strokeRect.html: Added.
• fast/canvas/script-tests/canvas-lineWidth-intact-after-strokeRect.js: Added.

2010-12-02 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] GraphicsContext::strokeRect() taints the context's lineWidth
​https://bugs.webkit.org/show_bug.cgi?id=50269

Test: fast/canvas/canvas-lineWidth-intact-after-strokeRect.html

• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::strokeRect): Restore the context's original stroke thickness after painting.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-lineWidth-intact-after-strokeRect-expected.txt (added)
• LayoutTests/fast/canvas/canvas-lineWidth-intact-after-strokeRect.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-lineWidth-intact-after-strokeRect.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsContextQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-02  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsContext::strokeRect() taints the context's lineWidth
+        https://bugs.webkit.org/show_bug.cgi?id=50269
+
+        * fast/canvas/canvas-lineWidth-intact-after-strokeRect-expected.txt: Added.
+        * fast/canvas/canvas-lineWidth-intact-after-strokeRect.html: Added.
+        * fast/canvas/script-tests/canvas-lineWidth-intact-after-strokeRect.js: Added.
+
 2010-12-02  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsContext::strokeRect() taints the context's lineWidth
+        https://bugs.webkit.org/show_bug.cgi?id=50269
+
+        Test: fast/canvas/canvas-lineWidth-intact-after-strokeRect.html
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::strokeRect): Restore the context's
+        original stroke thickness after painting.
+
 2010-12-02  Renata Hodovan  <reni@webkit.org>
 

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -1043 +1043 @@
 }
 
-void GraphicsContext::strokeRect(const FloatRect& rect, float width)
+void GraphicsContext::strokeRect(const FloatRect& rect, float lineWidth)
 {
     if (paintingDisabled())
@@ -1050 +1050 @@
     Path path;
     path.addRect(rect);
-    setStrokeThickness(width);
+
+    float previousStrokeThickness = strokeThickness();
+
+    if (lineWidth != previousStrokeThickness)
+        setStrokeThickness(lineWidth);
+
     strokePath(path);
+
+    if (lineWidth != previousStrokeThickness)
+        setStrokeThickness(previousStrokeThickness);
 }