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

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

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayerClient.h
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerClient.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayerClient.h
index 71ec007489b8e47e2545f721beba286c41ed9ac4..28a374da7d8915c22351ea6c5966b24c1c727438 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerClient.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerClient.h
@@ -32,6 +32,7 @@
 
 namespace blink {
 
+class DisplayItemClient;
 class GraphicsContext;
 class GraphicsLayer;
 class IntRect;
@@ -50,12 +51,11 @@ typedef unsigned GraphicsLayerPaintingPhase;
 enum {
     LayerTreeNormal = 0,
     LayerTreeIncludesDebugInfo = 1 << 0, // Dump extra debugging info like layer addresses.
-    LayerTreeIncludesPaintInvalidationRects = 1 << 1,
+    LayerTreeIncludesPaintInvalidations = 1 << 1,
     LayerTreeIncludesPaintingPhases = 1 << 2,
     LayerTreeIncludesRootLayer = 1 << 3,
     LayerTreeIncludesClipAndScrollParents = 1 << 4,
-    LayerTreeIncludesPaintInvalidationObjects = 1 << 5,
-    LayerTreeIncludesCompositingReasons = 1 << 6,
+    LayerTreeIncludesCompositingReasons = 1 << 5,
 };
 typedef unsigned LayerTreeFlags;