Changeset 102526 in webkit

Timestamp:

Dec 10, 2011 12:30:35 PM (12 years ago)

Author:

robert@webkit.org

Message:

CSS 2.1 failure: outline-color-* tests fail
​https://bugs.webkit.org/show_bug.cgi?id=71931

Source/WebCore:

Reviewed by Julien Chaffraix.

Test: css2.1/20110323/outline-color-001.html

WebKit didn't paint the top block in this series of tests because it ignored the outline
of objects with a zero size. Fix this by taking account of both offset and width of the
outline when deciding whether to paint it.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::paintOutline): paint the outline even when the block has zero size

LayoutTests:

Add outline-color-001.htm to catch regressions against displaying outlines
on objects with zero size. The rest of the outline-color-* test series will
be landed separately.

Reviewed by Julien Chaffraix.

• css2.1/20110323/outline-color-001-expected.html: Added.
• css2.1/20110323/outline-color-001.htm: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css2.1/20110323/outline-color-001-expected.html (added)
• LayoutTests/css2.1/20110323/outline-color-001.htm (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-09  Robert Hogan  <robert@webkit.org>
+
+        CSS 2.1 failure: outline-color-* tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=71931
+
+        Add outline-color-001.htm to catch regressions against displaying outlines
+        on objects with zero size. The rest of the outline-color-* test series will
+        be landed separately.
+
+        Reviewed by Julien Chaffraix.
+
+        * css2.1/20110323/outline-color-001-expected.html: Added.
+        * css2.1/20110323/outline-color-001.htm: Added.
+
 2011-12-10  Alan Stearns  <stearns@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Robert Hogan  <robert@webkit.org>
+
+        CSS 2.1 failure: outline-color-* tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=71931
+
+        Reviewed by Julien Chaffraix.
+
+        Test: css2.1/20110323/outline-color-001.html
+
+        WebKit didn't paint the top block in this series of tests because it ignored the outline
+        of objects with a zero size. Fix this by taking account of both offset and width of the
+        outline when deciding whether to paint it. 
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::paintOutline): paint the outline even when the block has zero size
+
 2011-12-10   Arko Saha  <arko@motorola.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1131 +1131 @@
     Color outlineColor = styleToUse->visitedDependentColor(CSSPropertyOutlineColor);
 
-    LayoutUnit offset = styleToUse->outlineOffset();
+    LayoutUnit outlineOffset = styleToUse->outlineOffset();
 
     if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) {
@@ -1144 +1144 @@
 
     LayoutRect inner = paintRect;
-    inner.inflate(offset);
-
-    if (inner.isEmpty())
-        return;
+    inner.inflate(outlineOffset);
 
     LayoutRect outer = inner;
     outer.inflate(outlineWidth);
+
+    // FIXME: This prevents outlines from painting inside the object. See bug 12042
+    if (outer.isEmpty())
+        return;
 
     bool useTransparencyLayer = outlineColor.hasAlpha();