Rename DisplayItemList to PaintController

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 21 matching lines @@
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayerFactory.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/LinkHighlight.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
-#include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
+#include "platform/graphics/paint/PaintController.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFilterOperations.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebGraphicsLayerDebugInfo.h"
 #include "public/platform/WebLayer.h"
@@ skipping 250 matching lines @@
 }
 
 void GraphicsLayer::paint(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_paintController && 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);
-    if (!m_textPainted && m_displayItemList->textPainted()) {
+    if (!m_textPainted && m_paintController->textPainted()) {
         m_textPainted = true;
         m_client->notifyTextPainted();
     }
 }
 
 void GraphicsLayer::updateChildList()
 {
     WebLayer* childHost = m_layer->layer();
     childHost->removeAllChildren();
 
@@ skipping 472 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_paintController)
+        m_paintController->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 171 matching lines @@
     // TODO(chrishtr): stop invalidating the rects once FrameView::paintRecursively does so.
     if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
         m_needsDisplay = true;
 
     m_layer->layer()->invalidate();
     if (isTrackingPaintInvalidations())
         trackPaintInvalidationRect(FloatRect(FloatPoint(), m_size));
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->invalidate();
 
-    displayItemList()->invalidateAll();
+    paintController()->invalidateAll();
     if (isTrackingPaintInvalidations())
         trackPaintInvalidationObject("##ALL##");
 }
 
 bool GraphicsLayer::needsDisplay() const
 {
     ASSERT(RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled());
     return m_needsDisplay;
 }
 
 bool GraphicsLayer::commitIfNeeded()
 {
     ASSERT(RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled());
     if (m_needsDisplay) {
-        displayItemList()->commitNewDisplayItems(this);
+        paintController()->commitNewDisplayItems(this);
         m_needsDisplay = false;
         return true;
     }
     return false;
 }
 
 void GraphicsLayer::setNeedsDisplayInRect(const IntRect& rect, PaintInvalidationReason invalidationReason)
 {
     if (!drawsContent())
         return;
 
     if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
         m_needsDisplay = true;
 
     m_layer->layer()->invalidateRect(rect);
     if (firstPaintInvalidationTrackingEnabled())
         m_debugInfo.appendAnnotatedInvalidateRect(rect, invalidationReason);
     if (isTrackingPaintInvalidations())
         trackPaintInvalidationRect(rect);
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->invalidate();
 }
 
 void GraphicsLayer::invalidateDisplayItemClient(const DisplayItemClientWrapper& displayItemClient, PaintInvalidationReason paintInvalidationReason, const IntRect& previousPaintInvalidationRect, const IntRect& newPaintInvalidationRect)
 {
     m_needsDisplay = true;
-    displayItemList()->invalidate(displayItemClient, paintInvalidationReason, previousPaintInvalidationRect, newPaintInvalidationRect);
+    paintController()->invalidate(displayItemClient, paintInvalidationReason, previousPaintInvalidationRect, newPaintInvalidationRect);
     if (isTrackingPaintInvalidations())
         trackPaintInvalidationObject(displayItemClient.debugName());
 }
 
 void GraphicsLayer::setContentsRect(const IntRect& rect)
 {
     if (rect == m_contentsRect)
         return;
 
     m_contentsRect = rect;
@@ skipping 134 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()
+PaintController* GraphicsLayer::paintController()
 {
-    if (!m_displayItemList)
-        m_displayItemList = DisplayItemList::create();
-    return m_displayItemList.get();
+    if (!m_paintController)
+        m_paintController = PaintController::create();
+    return m_paintController.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