Implement the framework for the paint property hierarchy

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

 /*
  * 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 281 matching lines @@
 }
 
 void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
 {
     if (!m_client)
         return;
     if (firstPaintInvalidationTrackingEnabled())
         m_debugInfo.clearAnnotatedInvalidateRects();
     incrementPaintCount();
 #ifndef NDEBUG
-    if (m_displayItemList && contentsOpaque() && s_drawDebugRedFill) {
+    if (m_paintArtifact && contentsOpaque() && s_drawDebugRedFill) {
         FloatRect rect(FloatPoint(), size());
         if (!DrawingRecorder::useCachedDrawingIfPossible(context, *this, DisplayItem::DebugRedFill)) {
             DrawingRecorder recorder(context, *this, DisplayItem::DebugRedFill, rect);
             context.fillRect(rect, SK_ColorRED);
         }
     }
 #endif
     m_client->paintContents(this, context, m_paintingPhase, clip);
 }
 
@@ skipping 477 matching lines @@
     if (clampedSize == m_size)
         return;
 
     m_size = clampedSize;
 
     m_layer->layer()->setBounds(flooredIntSize(m_size));
     // Note that we don't resize m_contentsLayer. It's up the caller to do that.
 
 #ifndef NDEBUG
     // The red debug fill needs to be invalidated if the layer resizes.
-    if (m_displayItemList)
-        m_displayItemList->invalidateUntracked(displayItemClient());
+    if (m_paintArtifact)
+        m_paintArtifact->displayItemList().invalidateUntracked(displayItemClient());
 #endif
 }
 
 void GraphicsLayer::setTransform(const TransformationMatrix& transform)
 {
     m_transform = transform;
     platformLayer()->setTransform(TransformationMatrix::toSkMatrix44(m_transform));
 }
 
 void GraphicsLayer::setTransformOrigin(const FloatPoint3D& transformOrigin)
@@ skipping 370 matching lines @@
 {
     if (m_scrollableArea) {
         DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + toDoubleSize(m_layer->layer()->scrollPositionDouble());
 
         // FrameView::setScrollPosition doesn't work for compositor commits (interacts poorly with programmatic scroll animations)
         // so we need to use the ScrollableArea version. The FrameView method should go away soon anyway.
         m_scrollableArea->ScrollableArea::setScrollPosition(newPosition, CompositorScroll);
     }
 }
 
-DisplayItemList* GraphicsLayer::displayItemList()
+PaintArtifact* GraphicsLayer::paintArtifact()
 {
-    if (!m_displayItemList)
-        m_displayItemList = DisplayItemList::create();
-    return m_displayItemList.get();
+    if (!m_paintArtifact)
+        m_paintArtifact = PaintArtifact::create();
+    return m_paintArtifact.get();
 }
 
 } // namespace blink
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer) {
         fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
         return;
     }
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif