Let FrameView track object paint invalidations

third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
index d5345355ef7734d59a371a7860b6dfd4e765c0b9..b6f703211397897aeec4abb4406285d03d740d18 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
@@ -186,10 +186,6 @@ public:
 
     void setContentsNeedsDisplay();
 
-    // This is called only if we are tracking paint invalidation for testing, or ENABLE(ASSERT)
-    // for error checking and debugging.
-    void displayItemClientWasInvalidated(const DisplayItemClient&, PaintInvalidationReason);
-
     // Set that the position/size of the contents (image or video).
     void setContentsRect(const IntRect&);
 
@@ -201,15 +197,14 @@ public:
     // For hosting this GraphicsLayer in a native layer hierarchy.
     WebLayer* platformLayer() const;
 
-    typedef HashMap<int, int> RenderingContextMap;
-    PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags, RenderingContextMap&) const;
-
     int paintCount() const { return m_paintCount; }
 
     // Return a string with a human readable form of the layer tree, If debug is true
     // pointers for the layers and timing data will be included in the returned string.
     String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const;
 
+    PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;
+
     void setTracksPaintInvalidations(bool);
     bool isTrackingOrCheckingPaintInvalidations() const
     {
@@ -301,6 +296,9 @@ private:
     void clearContentsLayerIfUnregistered();
     WebLayer* contentsLayerIfRegistered();
 
+    typedef HashMap<int, int> RenderingContextMap;
+    PassRefPtr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const;
+
 #if DCHECK_IS_ON()
     PassRefPtr<SkPicture> capturePicture();
     void checkPaintUnderInvalidations(const SkPicture&);