SPv2: Add support for tracking raster paint invalidations in testing.

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

Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
index 20791f1391c8371485b0420ae0f89d4cdd0dfbfa..5ca7a75f74bf11b883c21bc9396d00fce2436396 100644
--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
@@ -80,7 +80,7 @@ PaintLayerCompositor::PaintLayerCompositor(LayoutView& layoutView)
       m_compositing(false),
       m_rootShouldAlwaysCompositeDirty(true),
       m_needsUpdateFixedBackground(false),
-      m_isTrackingPaintInvalidations(
+      m_isTrackingRasterInvalidations(
           layoutView.frameView()->isTrackingPaintInvalidations()),
       m_inOverlayFullscreenVideo(false),
       m_needsUpdateDescendantDependentFlags(false),
@@ -969,42 +969,44 @@ GraphicsLayer* PaintLayerCompositor::fixedRootBackgroundLayer() const {
   return nullptr;
 }
 
-static void setTracksPaintInvalidationsRecursive(
+static void setTracksRasterInvalidationsRecursive(
     GraphicsLayer* graphicsLayer,
     bool tracksPaintInvalidations) {
   if (!graphicsLayer)
     return;
 
-  graphicsLayer->setTracksPaintInvalidations(tracksPaintInvalidations);
+  graphicsLayer->setTracksRasterInvalidations(tracksPaintInvalidations);
 
-  for (size_t i = 0; i < graphicsLayer->children().size(); ++i)
-    setTracksPaintInvalidationsRecursive(graphicsLayer->children()[i],
-                                         tracksPaintInvalidations);
+  for (size_t i = 0; i < graphicsLayer->children().size(); ++i) {
+    setTracksRasterInvalidationsRecursive(graphicsLayer->children()[i],
+                                          tracksPaintInvalidations);
+  }
 
   if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer())
-    setTracksPaintInvalidationsRecursive(maskLayer, tracksPaintInvalidations);
+    setTracksRasterInvalidationsRecursive(maskLayer, tracksPaintInvalidations);
 
   if (GraphicsLayer* clippingMaskLayer =
-          graphicsLayer->contentsClippingMaskLayer())
-    setTracksPaintInvalidationsRecursive(clippingMaskLayer,
-                                         tracksPaintInvalidations);
+          graphicsLayer->contentsClippingMaskLayer()) {
+    setTracksRasterInvalidationsRecursive(clippingMaskLayer,
+                                          tracksPaintInvalidations);
+  }
 }
 
-void PaintLayerCompositor::setTracksPaintInvalidations(
-    bool tracksPaintInvalidations) {
+void PaintLayerCompositor::setTracksRasterInvalidations(
+    bool tracksRasterInvalidations) {
 #if ENABLE(ASSERT)
   FrameView* view = m_layoutView.frameView();
   ASSERT(lifecycle().state() == DocumentLifecycle::PaintClean ||
          (view && view->shouldThrottleRendering()));
 #endif
 
-  m_isTrackingPaintInvalidations = tracksPaintInvalidations;
+  m_isTrackingRasterInvalidations = tracksRasterInvalidations;
   if (GraphicsLayer* rootLayer = rootGraphicsLayer())
-    setTracksPaintInvalidationsRecursive(rootLayer, tracksPaintInvalidations);
+    setTracksRasterInvalidationsRecursive(rootLayer, tracksRasterInvalidations);
 }
 
-bool PaintLayerCompositor::isTrackingPaintInvalidations() const {
-  return m_isTrackingPaintInvalidations;
+bool PaintLayerCompositor::isTrackingRasterInvalidations() const {
+  return m_isTrackingRasterInvalidations;
 }
 
 bool PaintLayerCompositor::requiresHorizontalScrollbarLayer() const {