Changeset 21363 in webkit

Timestamp:

May 10, 2007 3:14:21 AM (17 years ago)

Author:

hyatt

Message:

Fix for:

<rdar://problem/4778099> Links with nested continuations fail to
paint their outlines (11255)

​http://bugs.webkit.org/show_bug.cgi?id=11255

Fix multiple bugs with outline painting of continuations to ensure that
all combos work (empty/full inline - block with/without margins -
empty/full inline).

Reviewed by mitz

fast/inline/continuation-outlines.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintObject):
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::addFocusRingRects):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFlow.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-10  David Hyatt  <hyatt@apple.com>
+
+        Fix for:
+
+        <rdar://problem/4778099> Links with nested continuations fail to 
+        paint their outlines (11255)
+        
+        http://bugs.webkit.org/show_bug.cgi?id=11255
+
+        Fix multiple bugs with outline painting of continuations to ensure that
+        all combos work (empty/full inline - block with/without margins - 
+        empty/full inline).
+
+        Reviewed by mitz
+
+        fast/inline/continuation-outlines.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject):
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::addFocusRingRects):
+
 2007-05-10  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1541 +1541 @@
 
     // 5. paint outline.
-    if (!inlineFlow && (paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) 
-        && hasOutline() && style()->visibility() == VISIBLE)
-        RenderObject::paintOutline(paintInfo.context, tx, ty, width(), height(), style());
+    if (!inlineFlow && (paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && style()->visibility() == VISIBLE) {
+        if (continuation() && continuation()->hasOutline()) {
+            RenderFlow* inlineFlow = static_cast<RenderFlow*>(continuation()->element()->renderer());
+            inlineFlow->paintOutline(paintInfo.context, tx - xPos() + inlineFlow->containingBlock()->xPos(),
+                                     ty - yPos() + inlineFlow->containingBlock()->yPos());
+        } else if (hasOutline())
+            RenderObject::paintOutline(paintInfo.context, tx, ty, width(), height(), style());
+    }
 
     // 6. paint caret.

trunk/WebCore/rendering/RenderFlow.cpp

@@ -672 +672 @@
 void RenderFlow::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty)
 {
-    if (isRenderBlock())
-       graphicsContext->addFocusRingRect(IntRect(tx, ty, width(), height()));
+    if (isRenderBlock()) {
+        // Continuations should include their margins in the outline rect.
+        if (continuation())
+            graphicsContext->addFocusRingRect(IntRect(tx, ty - collapsedMarginTop(), width(), height() + collapsedMarginTop() + collapsedMarginBottom()));
+        else
+            graphicsContext->addFocusRingRect(IntRect(tx, ty, width(), height()));
+    }
 
     if (!hasOverflowClip() && !hasControlClip()) {
@@ -684 +689 @@
     }
 
-    if (continuation())
-        continuation()->addFocusRingRects(graphicsContext, 
-                                          tx - containingBlock()->xPos() + continuation()->xPos(),
-                                          ty - containingBlock()->yPos() + continuation()->yPos());
+    if (continuation()) {
+        if (isInline())
+            continuation()->addFocusRingRects(graphicsContext, 
+                                              tx - containingBlock()->xPos() + continuation()->xPos(),
+                                              ty - containingBlock()->yPos() + continuation()->yPos());
+        else
+            continuation()->addFocusRingRects(graphicsContext, 
+                                              tx - xPos() + continuation()->containingBlock()->xPos(),
+                                              ty - yPos() + continuation()->containingBlock()->yPos());
+    }
 }