(WIP) Paint property hierarchy approach 1 of 2

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

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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
@@ skipping 22 matching lines @@
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/ContentLayerDelegate.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/graphics/GraphicsLayerDebugInfo.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "platform/graphics/PaintInvalidationReason.h"
 #include "platform/graphics/filters/FilterOperations.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
-#include "platform/graphics/paint/DisplayItemList.h"
+#include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebCompositorAnimationDelegate.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebImageLayer.h"
 #include "public/platform/WebLayerClient.h"
 #include "public/platform/WebLayerScrollClient.h"
 #include "public/platform/WebScrollBlocksOn.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
-class DisplayItemList;
 class FloatRect;
 class GraphicsContext;
 class GraphicsLayer;
 class GraphicsLayerFactory;
 class GraphicsLayerFactoryChromium;
 class Image;
 class LinkHighlight;
 class JSONObject;
 class ScrollableArea;
 class WebCompositorAnimation;
@@ skipping 178 matching lines @@
     // GraphicsContextPainter implementation.
     void paint(GraphicsContext&, const IntRect& clip) override;
 
     // WebCompositorAnimationDelegate implementation.
     void notifyAnimationStarted(double monotonicTime, int group) override;
     void notifyAnimationFinished(double monotonicTime, int group) override;
 
     // WebLayerScrollClient implementation.
     void didScroll() override;
 
-    DisplayItemList* displayItemList() override;
+    PaintArtifact* paintArtifact() override;
+
+    // TODO(pdr): This should be refactored so callers use paintArtifact() directly.
+    DisplayItemList* displayItemList() { return &paintArtifact()->displayItemList(); }
 
     // Exposed for tests.
     virtual WebLayer* contentsLayer() const { return m_contentsLayer; }
 
     static void setDrawDebugRedFillForTesting(bool);
     ContentLayerDelegate* contentLayerDelegateForTesting() const { return m_contentLayerDelegate.get(); }
 
 #ifndef NDEBUG
     DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
     String debugName() const { return m_client->debugName(this) + " debug red fill"; }
 #endif
 
 protected:
     String debugName(WebLayer*) const;
 
     explicit GraphicsLayer(GraphicsLayerClient*);
     // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends.
     friend class GraphicsLayerFactoryChromium;
     // for testing
     friend class FakeGraphicsLayerFactory;
 
 private:
     // Callback from the underlying graphics system to draw layer contents.
     void paintGraphicsLayerContents(GraphicsContext&, const IntRect& clip);
 
-    // Sets m_needsDisplay, but without invalidating the DisplayItemList. This allows us to test
-    // scenarios where paint needs to be re-calculated, but no DisplayItemClients were invalidated
+    // Sets m_needsDisplay, but without invalidating the PaintArtifact. This allows us to test
+    // scenarios where paint needs to be re-calculated, but no invalidations occurred
     // (such as re-paints due to change of interest rect).
     void setNeedsDisplayWithoutInvalidateForTesting();
 
     // Adds a child without calling updateChildList(), so that adding children
     // can be batched before updating.
     void addChildInternal(GraphicsLayer*);
 
 #if ENABLE(ASSERT)
     bool hasAncestor(GraphicsLayer*) const;
 #endif
@@ skipping 73 matching lines @@
     int m_contentsLayerId;
 
     Vector<LinkHighlight*> m_linkHighlights;
 
     OwnPtr<ContentLayerDelegate> m_contentLayerDelegate;
 
     ScrollableArea* m_scrollableArea;
     GraphicsLayerDebugInfo m_debugInfo;
     int m_3dRenderingContext;
 
-    OwnPtr<DisplayItemList> m_displayItemList;
+    OwnPtr<PaintArtifact> m_paintArtifact;
 
     friend class DisplayItemListPaintTestForSlimmingPaintV2;
 };
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the blink namespace for ease of invocation from gdb.
 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
 #endif
 
 #endif // GraphicsLayer_h