Avoid ForceHorriblySlowRectMapping in RenderInline::clippedOverflowRectForPaintInvalidation()

Source/core/rendering/RenderInline.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 1008 matching lines @@
         rect = rect.transposedRect();
     return rect;
 }
 
 LayoutRect RenderInline::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
 {
     if ((!firstLineBoxIncludingCulling() && !continuation()) || style()->visibility() != VISIBLE)
         return LayoutRect();
 
     LayoutRect paintInvalidationRect(linesVisualOverflowBoundingBox());
-    bool hitPaintInvalidationContainer = false;
-
-    // We need to add in the in-flow position offsets of any inlines (including us) up to our
-    // containing block.
-    RenderBlock* cb = containingBlock();
-    for (const RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isRenderInline() && inlineFlow != cb;
-         inlineFlow = inlineFlow->parent()) {
-        if (inlineFlow == paintInvalidationContainer) {
-            hitPaintInvalidationContainer = true;
-            break;
-        }
-        if (inlineFlow->style()->hasInFlowPosition() && inlineFlow->hasLayer())
-            paintInvalidationRect.move(toRenderInline(inlineFlow)->layer()->offsetForInFlowPosition());
-    }
 
     LayoutUnit outlineSize = style()->outlineSize();
     paintInvalidationRect.inflate(outlineSize);
 
-    if (hitPaintInvalidationContainer || !cb)
-        return paintInvalidationRect;
-
-    if (cb->hasColumns())
-        cb->adjustRectForColumns(paintInvalidationRect);
-
-    if (cb->hasOverflowClip())
-        cb->applyCachedClipAndScrollOffsetForPaintInvalidation(paintInvalidationRect);
-
-    // FIXME: Passing paintInvalidationState directly to mapRectToPaintInvalidationBacking causes incorrect invalidations.
-    // Should avoid slowRectMapping by properly adjusting paintInvalidationState. crbug.com/402994.
-    ForceHorriblySlowRectMapping slowRectMapping(paintInvalidationState);
-    cb->mapRectToPaintInvalidationBacking(paintInvalidationContainer, paintInvalidationRect, paintInvalidationState);
+    mapRectToPaintInvalidationBacking(paintInvalidationContainer, paintInvalidationRect, paintInvalidationState);
 
     if (outlineSize) {
         for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
             if (!curr->isText())
                 paintInvalidationRect.unite(curr->rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineSize));
         }
 
         if (continuation() && !continuation()->isInline() && continuation()->parent())
             paintInvalidationRect.unite(continuation()->rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineSize));
     }
@@ skipping 527 matching lines @@
         container = this;
 
     FloatPoint absPos = container->localToAbsolute();
     region.bounds.setX(absPos.x() + region.bounds.x());
     region.bounds.setY(absPos.y() + region.bounds.y());
 
     regions.append(region);
 }
 
 } // namespace blink