(NOT FOR COMMIT) Testing layer invalidation speedups.

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2034 matching lines @@
 {
     ApplyToGraphicsLayers(this, SetContentsNeedsDisplayFunctor(), ApplyToSquashingLayer);
 }
 
 void CompositedLayerMapping::setContentsNeedDisplay()
 {
     // FIXME: need to split out paint invalidations for the background.
     ApplyToGraphicsLayers(this, SetContentsNeedsDisplayFunctor(), ApplyToContentLayers);
 }
 
-struct SetContentsNeedsDisplayInRectFunctor {
-    void operator() (GraphicsLayer* layer) const
-    {
-        if (layer->drawsContent()) {
-            IntRect layerDirtyRect = r;
-            layerDirtyRect.move(-layer->offsetFromLayoutObject());
-            layer->setNeedsDisplayInRect(layerDirtyRect, invalidationReason, client);
-        }
-    }
-
-    IntRect r;
-    PaintInvalidationReason invalidationReason;
-    const DisplayItemClient& client;
-};
-
 // r is in the coordinate space of the layer's layout object
 void CompositedLayerMapping::setContentsNeedDisplayInRect(const LayoutRect& r, PaintInvalidationReason invalidationReason, const DisplayItemClient& client)
 {
     // TODO(wangxianzhu): Enable the following assert after paint invalidation for spv2 is ready.
     // ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
-    SetContentsNeedsDisplayInRectFunctor functor = {
+    NeedsDisplayRecord record {
         enclosingIntRect(LayoutRect(r.location() + m_owningLayer.subpixelAccumulation(), r.size())),
         invalidationReason,
         client
     };
-    ApplyToGraphicsLayers(this, functor, ApplyToContentLayers);
+
+    m_needsDisplayInRects.append(record);
+}
+
+struct SetContentsNeedsDisplayInRectsFunctor {
+    void operator()(GraphicsLayer* layer) const
+    {
+        if (layer->drawsContent()) {
+            layer->setNeedsDisplayInRect(needsDisplayInRects);
+        }
+    }
+
+    const Vector<NeedsDisplayRecord>& needsDisplayInRects;
+};
+
+void CompositedLayerMapping::finalizeInvalidations()
+{
+    if (m_needsDisplayInRects.size()) {
+        SetContentsNeedsDisplayInRectsFunctor functor = {
+            m_needsDisplayInRects
+        };
+        ApplyToGraphicsLayers(this, functor, ApplyToContentLayers);
+        m_needsDisplayInRects.clear();
+    }
 }
 
 void CompositedLayerMapping::invalidateDisplayItemClient(const DisplayItemClient& displayItemClient, PaintInvalidationReason paintInvalidationReason)
 {
     ApplyToGraphicsLayers(this, [&displayItemClient, paintInvalidationReason](GraphicsLayer* layer) {
         layer->invalidateDisplayItemClient(displayItemClient, paintInvalidationReason);
     }, ApplyToContentLayers);
 }
 
 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(const LayoutObject* layoutObject, const Vector<GraphicsLayerPaintInfo>& layers, unsigned maxSquashedLayerIndex)
@@ skipping 485 matching lines @@
     } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
         name = "Scrolling Contents Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink