Move all fast-path paint invalidation mapping into PaintInvalidationState

third_party/WebKit/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 1003 matching lines @@
     LayoutUnit logicalHeight = lastLineBox()->logicalBottomVisualOverflow(lastRootBox.lineBottom()) - logicalTop;
 
     LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight);
     if (!style()->isHorizontalWritingMode())
         rect = rect.transposedRect();
     return rect;
 }
 
 LayoutRect LayoutInline::absoluteClippedOverflowRect() const
 {
-    if (!continuation())
-        return clippedOverflowRect(view());
+    if (!continuation()) {
+        LayoutRect rect = visualOverflowRect();
+        mapToVisibleRectInAncestorSpace(view(), rect);
+        return rect;
+    }
 
     FloatRect floatResult;
     LinesBoundingBoxGeneratorContext context(floatResult);
 
     LayoutInline* endContinuation = inlineElementContinuation();
     while (LayoutInline* nextContinuation = endContinuation->inlineElementContinuation())
         endContinuation = nextContinuation;
 
     for (LayoutBlock* currBlock = containingBlock(); currBlock && currBlock->isAnonymousBlock(); currBlock = toLayoutBlock(currBlock->nextSibling())) {
         for (LayoutObject* curr = currBlock->firstChild(); curr; curr = curr->nextSibling()) {
-            LayoutRect rect(curr->clippedOverflowRectForPaintInvalidation(view()));
+            LayoutRect rect(curr->localOverflowRectForPaintInvalidation());
             context(FloatRect(rect));
-            if (curr == endContinuation)
-                return LayoutRect(enclosingIntRect(floatResult));
+            if (curr == endContinuation) {
+                LayoutRect rect(enclosingIntRect(floatResult));
+                mapToVisibleRectInAncestorSpace(view(), rect);
+                return rect;
+            }
         }
     }
     return LayoutRect();
 }
 
-LayoutRect LayoutInline::clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
+LayoutRect LayoutInline::localOverflowRectForPaintInvalidation() const
 {
     // If we don't create line boxes, we don't have any invalidations to do.
     if (!alwaysCreateLineBoxes())
         return LayoutRect();
-    return clippedOverflowRect(paintInvalidationContainer);
-}
-
-LayoutRect LayoutInline::clippedOverflowRect(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
-{
-    if (style()->visibility() != VISIBLE)

[chrishtr, 2016/03/24 01:05:42]

Did you lose this optimization?

[Xianzhu, 2016/03/25 16:35:54]

Done.

-        return LayoutRect();
-
-    LayoutRect overflowRect(visualOverflowRect());
-    if (overflowRect.isEmpty())
-        return overflowRect;
-
-    mapToVisibleRectInAncestorSpace(paintInvalidationContainer, overflowRect, paintInvalidationState);
-    return overflowRect;
+    return visualOverflowRect();
 }
 
 LayoutRect LayoutInline::visualOverflowRect() const
 {
     LayoutRect overflowRect = linesVisualOverflowBoundingBox();
     LayoutUnit outlineOutset(style()->outlineOutsetExtent());
     if (outlineOutset) {
         Vector<LayoutRect> rects;
         // We have already included outline extents of line boxes in linesVisualOverflowBoundingBox(),
         // so the following just add outline rects for children and continuations.
         addOutlineRectsForChildrenAndContinuations(rects, LayoutPoint(), outlineRectsShouldIncludeBlockVisualOverflow());
         if (!rects.isEmpty()) {
             LayoutRect outlineRect = unionRectEvenIfEmpty(rects);
             outlineRect.inflate(outlineOutset);
             overflowRect.unite(outlineRect);
         }
     }
     return overflowRect;
 }
 
-void LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
+void LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect) const
 {
-    if (paintInvalidationState && paintInvalidationState->canMapToAncestor(ancestor)) {
-        paintInvalidationState->mapObjectRectToAncestor(*this, ancestor, rect);
-        return;
-    }
-
     if (ancestor == this)
         return;
 
     bool ancestorSkipped;
     LayoutObject* container = this->container(ancestor, &ancestorSkipped);
     if (!container)
         return;
 
     LayoutPoint topLeft = rect.location();
 
@@ skipping 17 matching lines @@
             return;
     }
 
     if (ancestorSkipped) {
         // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates.
         LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(container);
         rect.move(-containerOffset);
         return;
     }
 
-    container->mapToVisibleRectInAncestorSpace(ancestor, rect, nullptr);
+    container->mapToVisibleRectInAncestorSpace(ancestor, rect);
 }
 
 LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container) const
 {
     ASSERT(container == this->container());
 
     LayoutSize offset;
     if (isInFlowPositioned())
         offset += offsetForInFlowPosition();
 
@@ skipping 240 matching lines @@
 
 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer, PaintInvalidationReason invalidationReason) const
 {
     LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContainer, invalidationReason);
 
     for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
         paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, invalidationReason);
 }
 
 } // namespace blink