Changeset 82781 in webkit

Timestamp:

Apr 2, 2011 5:01:42 PM (13 years ago)

Author:

aestes@apple.com

Message:

2011-04-02 Andy Estes <​aestes@apple.com>

Reviewed by Oliver Hunt.

REGRESSION (r69237): Black border around map elements while using an image map on Mac platform
​https://bugs.webkit.org/show_bug.cgi?id=52518

Test: fast/images/imagemap-focus-ring-zero-outline-width.html

• rendering/RenderImage.cpp: (WebCore::RenderImage::paintAreaElementFocusRing): Return early if outlineWidth is 0.

2011-04-02 Andy Estes <​aestes@apple.com>

Reviewed by Oliver Hunt.

REGRESSION (r69237): Black border around map elements while using an image map on Mac platform
​https://bugs.webkit.org/show_bug.cgi?id=52518

• fast/images/imagemap-focus-ring-zero-outline-width.html: Added.
• platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.checksum: Added.
• platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.png: Added.
• platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/imagemap-focus-ring-zero-outline-width.html (added)
• LayoutTests/platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.checksum (added)
• LayoutTests/platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.png (added)
• LayoutTests/platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-02  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        REGRESSION (r69237): Black border around map elements while using an image map on Mac platform
+        https://bugs.webkit.org/show_bug.cgi?id=52518
+
+        * fast/images/imagemap-focus-ring-zero-outline-width.html: Added.
+        * platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.checksum: Added.
+        * platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.png: Added.
+        * platform/mac/fast/images/imagemap-focus-ring-zero-outline-width-expected.txt: Added.
+
 2011-04-01  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-02  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        REGRESSION (r69237): Black border around map elements while using an image map on Mac platform
+        https://bugs.webkit.org/show_bug.cgi?id=52518
+
+        Test: fast/images/imagemap-focus-ring-zero-outline-width.html
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::paintAreaElementFocusRing): Return early if outlineWidth is 0.
+
 2011-04-02  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -353 +353 @@
 
     RenderStyle* areaElementStyle = areaElement->computedStyle();
-    paintInfo.context->drawFocusRing(path, areaElementStyle->outlineWidth(), areaElementStyle->outlineOffset(),
+    unsigned short outlineWidth = areaElementStyle->outlineWidth();
+    if (!outlineWidth)
+        return;
+
+    paintInfo.context->drawFocusRing(path, outlineWidth,
+        areaElementStyle->outlineOffset(),
         areaElementStyle->visitedDependentColor(CSSPropertyOutlineColor));
 }