(WIP) Paint property hierarchy approach 1 of 2

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

 /*
  * Copyright (C) 2012 Google 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 15 matching lines @@
 
 #include "platform/graphics/ContentLayerDelegate.h"
 
 #include "platform/EventTracer.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/TracedValue.h"
 #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"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace blink {
@@ skipping 32 matching lines @@
 void ContentLayerDelegate::paintContents(
     WebDisplayItemList* webDisplayItemList, const WebRect& clip,
     WebContentLayerClient::PaintingControlSetting paintingControl)
 {
     TRACE_EVENT1("blink,benchmark", "ContentLayerDelegate::paintContents", "clip_rect", toTracedValue(clip));
 
     // TODO(pdr): Remove when slimming paint v2 is further along. This is only
     // 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);
 
     // We also disable caching when Painting or Construction are disabled. In both cases we would like
     // to compare assuming the full cost of recording, not the cost of re-using cached content.
     if (paintingControl != WebContentLayerClient::PaintDefaultBehavior)
         displayItemList->invalidateAll();
 
     GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
     if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled
         || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
         disabledMode = GraphicsContext::FullyDisabled;
     GraphicsContext context(displayItemList, disabledMode);
 
     m_painter->paint(context, clip);
 
     displayItemList->commitNewDisplayItemsAndAppendToWebDisplayItemList(webDisplayItemList);
 }
 
 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const
 {
-    return m_painter->displayItemList()->approximateUnsharedMemoryUsage();
+    return m_painter->paintArtifact()->displayItemList().approximateUnsharedMemoryUsage();
 }
 
 } // namespace blink