Include the whole outline into visual overflow

Source/core/layout/LayoutInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1032 matching lines @@
     return clippedOverflowRect(paintInvalidationContainer);
 }
 
 LayoutRect LayoutInline::clippedOverflowRect(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
 {
     const LayoutBoxModelObject* continuation = this->continuation();
     if ((!firstLineBoxIncludingCulling() && !continuation) || style()->visibility() != VISIBLE)
         return LayoutRect();
 
     LayoutRect overflowRect(linesVisualOverflowBoundingBox());
-    mapRectToPaintInvalidationBacking(paintInvalidationContainer, overflowRect, paintInvalidationState);
 
     LayoutUnit outlineOutset = style()->outlineOutsetExtent();
     if (outlineOutset) {
-        for (LayoutObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
-            if (!curr->isText())
-                overflowRect.unite(curr->rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineOutset));
-        }
-
-        if (continuation && !continuation->isInline() && continuation->parent())
-            overflowRect.unite(continuation->rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineOutset));
+        Vector<LayoutRect> rects;
+        rects.append(overflowRect);
+        addOutlineRectsForChildrenAndContinuations(rects, LayoutPoint());
+        overflowRect = unionRect(rects);
+        overflowRect.inflate(outlineOutset);
     }
 
+    mapRectToPaintInvalidationBacking(paintInvalidationContainer, overflowRect, paintInvalidationState);
     return overflowRect;
 }
 
-LayoutRect LayoutInline::rectWithOutlineForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* paintInvalidationState) const
-{
-    LayoutRect r(LayoutBoxModelObject::rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineWidth, paintInvalidationState));
-    for (LayoutObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
-        if (!curr->isText())
-            r.unite(curr->rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineWidth, paintInvalidationState));
-    }
-    return r;
-}
-
 void LayoutInline::mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
 {
     if (paintInvalidationState && paintInvalidationState->canMapToContainer(paintInvalidationContainer)) {
         if (style()->hasInFlowPosition() && layer())
             rect.move(layer()->offsetForInFlowPosition());
         rect.move(paintInvalidationState->paintOffset());
         if (paintInvalidationState->isClipped())
             rect.intersect(paintInvalidationState->clipRect());
         return;
     }
@@ skipping 282 matching lines @@
     {
         if (!rect.isEmpty())
             AbsoluteLayoutRectsGeneratorContext::operator()(rect);
     }
 };
 
 } // unnamed namespace
 
 void LayoutInline::addOutlineRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
-    // Add line boxes only if this object is the first object of addOutlineRects().
-    // Otherwise the parent (LayoutBlockFlow or LayoutInline) should have added line box rects
-    // covering those of this object.
-    if (rects.isEmpty()) {
-        AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOffset);
-        generateLineBoxRects(context);
-    }
+    AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOffset);
+    generateLineBoxRects(context);
 
+    addOutlineRectsForChildrenAndContinuations(rects, additionalOffset);
+}
+
+void LayoutInline::addOutlineRectsForChildrenAndContinuations(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+{
     addOutlineRectsForNormalChildren(rects, additionalOffset);
+    addOutlineRectsForContinuations(rects, additionalOffset);
+}
 
+void LayoutInline::addOutlineRectsForContinuations(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+{
     if (LayoutBoxModelObject* continuation = this->continuation()) {
         if (continuation->isInline())
             continuation->addOutlineRects(rects, additionalOffset + (continuation->containingBlock()->location() - containingBlock()->location()));
         else
             continuation->addOutlineRects(rects, additionalOffset + (toLayoutBox(continuation)->location() - containingBlock()->location()));
     }
 }
 
 void LayoutInline::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const
 {
@@ skipping 26 matching lines @@
 }
 
 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer) const
 {
     LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContainer);
     for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
         paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
 }
 
 } // namespace blink