Merge repaintRects and paintInvalidationObjects in text-based-repaint test results

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 2977f234e14c2838756887bfce545060711430b2..0fd76223fd2e28bb8174db7bcf361b8af3b1e8bb 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
@@ -181,7 +181,7 @@ public:
 
     void setNeedsDisplay();
     // Mark the given rect (in layer coords) as needing display. Never goes deep.
-    void setNeedsDisplayInRect(const IntRect&, PaintInvalidationReason);
+    void setNeedsDisplayInRect(const IntRect&, PaintInvalidationReason, const DisplayItemClient&);
 
     void setContentsNeedsDisplay();
 
@@ -210,8 +210,7 @@ public:
     bool isTrackingPaintInvalidations() const { return m_client->isTrackingPaintInvalidations(); }
     void resetTrackedPaintInvalidations();
     bool hasTrackedPaintInvalidations() const;
-    void trackPaintInvalidationRect(const FloatRect&);
-    void trackPaintInvalidationObject(const String&);
+    void trackPaintInvalidation(const String& objectDebugName, const FloatRect&, const char* reason);
 
     void addLinkHighlight(LinkHighlight*);
     void removeLinkHighlight(LinkHighlight*);
@@ -359,6 +358,9 @@ private:
     OwnPtr<PaintController> m_paintController;
 
     IntRect m_previousInterestRect;
+
+    // Used when tracking paint invalidation, to avoid duplicate DisplayItemClient invalidation entries.
+    const DisplayItemClient* m_lastSetNeedsDisplayInRectDisplayItemClient;

[pdr., 2016/04/12 00:20:06]

It doesn't seem right to add debug-only members to GraphicsLayer. Is it possible
to refactor the code so this isn't needed? Can you describe why this wasn't
needed before?

[Xianzhu, 2016/04/12 01:14:26]

Found a better way to handle this.

 };
 
 } // namespace blink