(WIP) Paint property hierarchy approach 1 of 2

third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp

Index: third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
index 7919c8b812fd4590065be181c4b9a26656c3603b..331f1f212d7139c7ff3b37a986573f2413788f3b 100644
--- a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
@@ -33,6 +33,7 @@
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/DisplayItemList.h"
+#include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebDisplayItemList.h"
@@ -85,11 +86,11 @@ void ContentLayerDelegate::paintContents(
     // here so the browser is usable during development and does not crash due
     // to committing the new display items twice.
     if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) {
-        m_painter->displayItemList()->appendToWebDisplayItemList(webDisplayItemList);
+        m_painter->paintArtifact()->displayItemList().appendToWebDisplayItemList(webDisplayItemList);
         return;
     }
 
-    DisplayItemList* displayItemList = m_painter->displayItemList();
+    DisplayItemList* displayItemList = &m_painter->paintArtifact()->displayItemList();
     ASSERT(displayItemList);
     displayItemList->setDisplayItemConstructionIsDisabled(
         paintingControl == WebContentLayerClient::DisplayListConstructionDisabled);
@@ -112,7 +113,7 @@ void ContentLayerDelegate::paintContents(
 
 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const
 {
-    return m_painter->displayItemList()->approximateUnsharedMemoryUsage();
+    return m_painter->paintArtifact()->displayItemList().approximateUnsharedMemoryUsage();
 }
 
 } // namespace blink