Changeset 87174 in webkit

Timestamp:

May 24, 2011 11:24:56 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-24 Mike Reed <​reed@google.com>

Reviewed by Kenneth Russell.

skia: fix stroking of zero-height rectangles
​https://bugs.webkit.org/show_bug.cgi?id=61284

Tests: canvas/philip/tests/2d.line.miter.lineedge.html

canvas/philip/tests/2d.strokeRect.zero.4.html

• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::strokeRect):

Location:

trunk

Files:

• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (modified) (1 diff)

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1011 +1011 @@
 // Misc. render failures
 BUGCR81718 WIN LINUX GPU : compositing/tiling/huge-layer-img.html = CRASH
-BUGCR80593 WIN LINUX GPU : canvas/philip/tests/2d.strokeRect.zero.4.html = TEXT
 BUGCR79741 WIN LINUX GPU : fast/canvas/canvasDrawingIntoSelf.html = IMAGE
 BUGCR79741 WIN LINUX GPU : fast/canvas/drawImage.html = IMAGE
 BUGCR81601 WIN LINUX GPU : fast/repaint/canvas-putImageData.html = IMAGE+TEXT
-BUGCR81600 WIN LINUX GPU : canvas/philip/tests/2d.line.miter.lineedge.html = TEXT
 BUGCR81606 WIN LINUX GPU : fast/canvas/drawImage-with-globalAlpha.html = IMAGE
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Mike Reed  <reed@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        skia: fix stroking of zero-height rectangles
+        https://bugs.webkit.org/show_bug.cgi?id=61284
+
+        Tests: canvas/philip/tests/2d.line.miter.lineedge.html
+               canvas/philip/tests/2d.strokeRect.zero.4.html
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::strokeRect):
+
 2011-05-24  Zan Dobersek  <zandobersek@gmail.com> and Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -1231 +1231 @@
     platformContext()->setupPaintForStroking(&paint, 0, 0);
     paint.setStrokeWidth(WebCoreFloatToSkScalar(lineWidth));
-    platformContext()->canvas()->drawRect(rect, paint);
+    // strokerect has special rules for CSS when the rect is degenerate:
+    // if width==0 && height==0, do nothing
+    // if width==0 || height==0, then just draw line for the other dimension
+    SkRect r(rect);
+    bool validW = r.width() > 0;
+    bool validH = r.height() > 0;
+    SkCanvas* canvas = platformContext()->canvas();
+    if (validW && validH)
+        canvas->drawRect(r, paint);
+    else if (validW || validH) {
+        // we are expected to respect the lineJoin, so we can't just call
+        // drawLine -- we have to create a path that doubles back on itself.
+        SkPath path;
+        path.moveTo(r.fLeft, r.fTop);
+        path.lineTo(r.fRight, r.fBottom);
+        path.close();
+        canvas->drawPath(path, paint);
+    }
 }