Changeset 139223 in webkit

Timestamp:

Jan 9, 2013 12:30:40 PM (11 years ago)

Author:

robert@webkit.org

Message:

REGRESSION(r111439): Focus ring is rendered incorrectly in fast/inline/continuation-outlines-with-layers.html
​https://bugs.webkit.org/show_bug.cgi?id=106064

Reviewed by David Hyatt.

Source/WebCore:

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintObject):

LayoutTests:

• platform/chromium-linux/fast/inline/continuation-outlines-with-layers-expected.png:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/inline/continuation-outlines-with-layers-expected.png (modified) (previous)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-09  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r111439): Focus ring is rendered incorrectly in fast/inline/continuation-outlines-with-layers.html
+        https://bugs.webkit.org/show_bug.cgi?id=106064
+
+        Reviewed by David Hyatt.
+
+        * platform/chromium-linux/fast/inline/continuation-outlines-with-layers-expected.png:
+
 2013-01-09  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1255 +1255 @@
 webkit.org/b/105999 [ Lion ] fast/canvas/canvas-composite-image.html [ Failure ]
 
-webkit.org/b/106064 fast/inline/continuation-outlines-with-layers.html [ Failure ]
-
 webkit.org/b/106075 [ Debug ] fast/regions/full-screen-video-from-region.html [ Crash ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-09  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r111439): Focus ring is rendered incorrectly in fast/inline/continuation-outlines-with-layers.html
+        https://bugs.webkit.org/show_bug.cgi?id=106064
+
+        Reviewed by David Hyatt.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject): 
+
 2013-01-09  Gregg Tavares  <gman@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3030 +3030 @@
     if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseChildOutlines)) {
         RenderInline* inlineCont = inlineElementContinuation();
-        // FIXME: For now, do not add continuations for outline painting by our containing block if we are a relative positioned
-        // anonymous block (i.e. have our own layer). This is because a block depends on renderers in its continuation table being
-        // in the same layer. 
-        if (inlineCont && inlineCont->hasOutline() && inlineCont->style()->visibility() == VISIBLE && !hasLayer()) {
+        if (inlineCont && inlineCont->hasOutline() && inlineCont->style()->visibility() == VISIBLE) {
             RenderInline* inlineRenderer = toRenderInline(inlineCont->node()->renderer());
             RenderBlock* cb = containingBlock();
@@ -3045 +3042 @@
             }
 
-            if (!inlineEnclosedInSelfPaintingLayer)
+            // Do not add continuations for outline painting by our containing block if we are a relative positioned
+            // anonymous block (i.e. have our own layer), paint them straightaway instead. This is because a block depends on renderers in its continuation table being
+            // in the same layer. 
+            if (!inlineEnclosedInSelfPaintingLayer && !hasLayer())
                 cb->addContinuationWithOutline(inlineRenderer);
-            else if (!inlineRenderer->firstLineBox())
+            else if (!inlineRenderer->firstLineBox() || (!inlineEnclosedInSelfPaintingLayer && hasLayer()))
                 inlineRenderer->paintOutline(paintInfo.context, paintOffset - locationOffset() + inlineRenderer->containingBlock()->location());
         }