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 7367c74d41e7ea20d65e0f14ef304b8c246f8c0b..519a400811981079bc238898b1c7af3fe6fbb7a1 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(layoutView.frameView()->isTrackingPaintInvalidations())
+    , m_isTrackingRasterInvalidations(layoutView.frameView()->isTrackingPaintInvalidations())
     , m_inOverlayFullscreenVideo(false)
     , m_needsUpdateDescendantDependentFlags(false)
     , m_rootLayerAttachment(RootLayerUnattached)
@@ -922,24 +922,24 @@ GraphicsLayer* PaintLayerCompositor::fixedRootBackgroundLayer() const
     return nullptr;
 }
 
-static void setTracksPaintInvalidationsRecursive(GraphicsLayer* graphicsLayer, bool tracksPaintInvalidations)
+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);
+        setTracksRasterInvalidationsRecursive(graphicsLayer->children()[i], tracksPaintInvalidations);
 
     if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer())
-        setTracksPaintInvalidationsRecursive(maskLayer, tracksPaintInvalidations);
+        setTracksRasterInvalidationsRecursive(maskLayer, tracksPaintInvalidations);
 
     if (GraphicsLayer* clippingMaskLayer = graphicsLayer->contentsClippingMaskLayer())
-        setTracksPaintInvalidationsRecursive(clippingMaskLayer, tracksPaintInvalidations);
+        setTracksRasterInvalidationsRecursive(clippingMaskLayer, tracksPaintInvalidations);
 }
 
-void PaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidations)
+void PaintLayerCompositor::setTracksRasterInvalidations(bool tracksRasterInvalidations)
 {
 #if ENABLE(ASSERT)
     FrameView* view = m_layoutView.frameView();
@@ -947,14 +947,14 @@ void PaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidat
         || (view && view->shouldThrottleRendering()));
 #endif
 
-    m_isTrackingPaintInvalidations = tracksPaintInvalidations;
+    m_isTrackingRasterInvalidations = tracksRasterInvalidations;
     if (GraphicsLayer* rootLayer = rootGraphicsLayer())
-        setTracksPaintInvalidationsRecursive(rootLayer, tracksPaintInvalidations);
+        setTracksRasterInvalidationsRecursive(rootLayer, tracksRasterInvalidations);
 }
 
-bool PaintLayerCompositor::isTrackingPaintInvalidations() const
+bool PaintLayerCompositor::isTrackingRasterInvalidations() const
 {
-    return m_isTrackingPaintInvalidations;
+    return m_isTrackingRasterInvalidations;
 }
 
 bool PaintLayerCompositor::requiresHorizontalScrollbarLayer() const