Remove call to setMayNeedPaintInvalidation in RenderLayer::updateLayerPositionRecursive

Source/core/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 244 matching lines @@
 {
     TRACE_EVENT0("blink_rendering", "RenderLayer::updateLayerPositionsAfterLayout");
 
     // FIXME: Remove incremental compositing updates after fixing the chicken/egg issues
     // https://code.google.com/p/chromium/issues/detail?id=343756
     DisableCompositingQueryAsserts disabler;
 
     RenderGeometryMap geometryMap(UseTransforms);
     if (this != rootLayer)
         geometryMap.pushMappingsToAncestor(parent(), 0);
-    updateLayerPositionRecursive(&geometryMap, rootLayer->renderer()->containerForPaintInvalidation(), flags);
+    updateLayerPositionRecursive(&geometryMap, flags);
 }
 
-void RenderLayer::updateLayerPositionRecursive(RenderGeometryMap* geometryMap, const RenderLayerModelObject* paintInvalidationContainer, UpdateLayerPositionsFlags flags)
+void RenderLayer::updateLayerPositionRecursive(RenderGeometryMap* geometryMap, UpdateLayerPositionsFlags flags)
 {
-    // For performance reasons we only check if the RenderObject has moved if we
-    // have a geometryMap. If not, blank out the paint invalidation container so we
-    // can skip doing any further work to update it.
-    if (!geometryMap)
-        paintInvalidationContainer = 0;
+    updateLayerPosition();
 
-    updateLayerPosition(); // For relpositioned layers or non-positioned layers,
-                           // we need to keep in sync, since we may have shifted relative
-                           // to our parent layer.
     if (geometryMap)
         geometryMap->pushMappingsToAncestor(this, parent());
 
     // Clear our cached clip rect information.
     m_clipper.clearClipRects();
 
     if (hasOverflowControls()) {
         LayoutPoint offsetFromRoot;
         if (geometryMap)
             offsetFromRoot = LayoutPoint(geometryMap->absolutePoint(FloatPoint()));
         else {
             // FIXME: It looks suspicious to call convertToLayerCoords here
             // as canUseConvertToLayerCoords may be true for an ancestor layer.
             convertToLayerCoords(root(), offsetFromRoot);
         }
         scrollableArea()->positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
     }
 
     updateDescendantDependentFlags();
 
     if (flags & UpdatePagination)
         updatePagination();
     else {
         m_isPaginated = false;
         m_enclosingPaginationLayer = 0;
     }
 
-    const RenderLayerModelObject* newPaintInvalidationContainer = paintInvalidationContainer;
-    // If we don't have a paintInvalidationContainer then we can't check if
-    // the object has moved.
-    if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && paintInvalidationContainer) {
-        bool establishesNewPaintInvalidationContainer = isRepaintContainer();
-        newPaintInvalidationContainer = renderer()->adjustCompositedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? renderer() : paintInvalidationContainer);
-
-        LayoutPoint offset = renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint();
-        if (renderer()->previousPositionFromPaintInvalidationContainer() != geometryMap->mapToContainer(offset, newPaintInvalidationContainer))
-            renderer()->setMayNeedPaintInvalidation(true);
-    }
-
     repainter().repaintAfterLayout(flags & CheckForRepaint);
 
     // Go ahead and update the reflection's position and size.
     if (m_reflectionInfo)
         m_reflectionInfo->reflection()->layout();
 
     if (useRegionBasedColumns() && renderer()->isRenderFlowThread()) {
         updatePagination();
         flags |= UpdatePagination;
     }
 
     if (renderer()->hasColumns())
         flags |= UpdatePagination;
 
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
-        child->updateLayerPositionRecursive(geometryMap, newPaintInvalidationContainer, flags);
+        child->updateLayerPositionRecursive(geometryMap, flags);
 
     if ((flags & NeedsFullRepaintInBacking) && hasCompositedLayerMapping() && !compositedLayerMapping()->paintsIntoCompositedAncestor())
         compositedLayerMapping()->setContentsNeedDisplay();
 
     if (geometryMap)
         geometryMap->popMappingsToAncestor(parent());
 }
 
 void RenderLayer::setAncestorChainHasSelfPaintingLayerDescendant()
 {
@@ skipping 1116 matching lines @@
         m_parent->addChild(current, nextSib);
 
         if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
             current->renderer()->setShouldDoFullPaintInvalidationAfterLayout(true);
         else
             current->repainter().setRepaintStatus(NeedsFullRepaint);
 
         // Hits in compositing/overflow/automatically-opt-into-composited-scrolling-part-1.html
         DisableCompositingQueryAsserts disabler;
 
-        current->updateLayerPositionRecursive(0, 0); // FIXME: use geometry map.
+        current->updateLayerPositionRecursive(0);
         current = next;
     }
 
     // Remove us from the parent.
     m_parent->removeChild(this);
     m_renderer->destroyLayer();
 }
 
 void RenderLayer::insertOnlyThisLayer()
 {
@@ skipping 2383 matching lines @@
     }
 }
 
 void showLayerTree(const WebCore::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif