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

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

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #ifndef GraphicsLayerClient_h
 #define GraphicsLayerClient_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/LayoutSize.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
+class DisplayItemClient;
 class GraphicsContext;
 class GraphicsLayer;
 class IntRect;
 
 enum GraphicsLayerPaintingPhaseFlags {
     GraphicsLayerPaintBackground = (1 << 0),
     GraphicsLayerPaintForeground = (1 << 1),
     GraphicsLayerPaintMask = (1 << 2),
     GraphicsLayerPaintOverflowContents = (1 << 3),
     GraphicsLayerPaintCompositedScroll = (1 << 4),
     GraphicsLayerPaintChildClippingMask = (1 << 5),
     GraphicsLayerPaintAllWithOverflowClip = (GraphicsLayerPaintBackground | GraphicsLayerPaintForeground | GraphicsLayerPaintMask)
 };
 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;
 
 class PLATFORM_EXPORT GraphicsLayerClient {
 public:
     virtual ~GraphicsLayerClient() {}
 
     virtual void notifyFirstPaint() { }
     virtual void notifyFirstTextPaint() { }
     virtual void notifyFirstImagePaint() { }
@@ skipping 14 matching lines @@
     // This is executed in GraphicsLayer construction and destruction
     // to verify that we don't create or destroy GraphicsLayers
     // while painting.
     virtual void verifyNotPainting() { }
 #endif
 };
 
 } // namespace blink
 
 #endif // GraphicsLayerClient_h