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

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
index 09471226ed730b1212a0a63f8f678560277cc325..52923d1b25cafbb257e23dbf0fff8e30934bc6b4 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
@@ -7,6 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "platform/PlatformExport.h"
+#include "platform/RuntimeEnabledFeatures.h"
+#include "platform/graphics/GraphicsLayerClient.h"
+#include "platform/graphics/paint/PaintController.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
@@ -23,6 +26,9 @@ class Vector2dF;
 
 namespace blink {
 
+class DisplayItemClient;
+class IntRect;
+class JSONObject;
 class PaintArtifact;
 class WebLayer;
 struct PaintChunk;
@@ -45,7 +51,7 @@ public:
     }
 
     // Updates the layer tree to match the provided paint artifact.
-    void update(const PaintArtifact&);
+    void update(const PaintArtifact&, RasterInvalidationTrackingMap<const PaintChunk>* paintChunkInvalidations);
 
     // The root layer of the tree managed by this object.
     cc::Layer* rootLayer() const { return m_rootLayer.get(); }
@@ -64,6 +70,12 @@ public:
     void enableExtraDataForTesting() { m_extraDataForTestingEnabled = true; }
     ExtraDataForTesting* getExtraDataForTesting() const { return m_extraDataForTesting.get(); }
 
+    void setTracksRasterInvalidations(bool);
+    void resetTrackedRasterInvalidations();
+    bool hasTrackedRasterInvalidations() const;
+
+    std::unique_ptr<JSONObject> layersAsJSON(LayerTreeFlags) const;
+
 private:
     PaintArtifactCompositor();
 
@@ -75,11 +87,11 @@ private:
     // the generated layer translates the paint chunk to align the bounding box to (0, 0) and
     // return the actual origin of the paint chunk in output parameter layerOffset.
     scoped_refptr<cc::Layer> layerForPaintChunk(const PaintArtifact&, const PaintChunk&, gfx::Vector2dF& layerOffset,
-        Vector<std::unique_ptr<ContentLayerClientImpl>>& newContentLayerClients);
+        Vector<std::unique_ptr<ContentLayerClientImpl>>& newContentLayerClients, RasterInvalidationTracking*);
 
     // Finds a client among the current vector of clients that matches the paint chunk's id,
     // or otherwise allocates a new one.
-    std::unique_ptr<ContentLayerClientImpl> clientForPaintChunk(const PaintChunk&);
+    std::unique_ptr<ContentLayerClientImpl> clientForPaintChunk(const PaintChunk&, const PaintArtifact&);
 
     scoped_refptr<cc::Layer> m_rootLayer;
     std::unique_ptr<WebLayer> m_webLayer;
@@ -88,6 +100,8 @@ private:
     bool m_extraDataForTestingEnabled = false;
     std::unique_ptr<ExtraDataForTesting> m_extraDataForTesting;
     friend class StubChromeClientForSPv2;
+
+    bool m_isTrackingRasterInvalidations;
 };
 
 } // namespace blink