Index: third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h |
diff --git a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h |
index 4ba54884700030e12c78b2fda9ec09ed7a441c91..900a4201d0bc310993edd863e5f9ca5aad0ac407 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h |
+++ b/third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h |
@@ -7,13 +7,13 @@ |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/graphics/GraphicsContext.h" |
-#include "platform/graphics/paint/DisplayItemList.h" |
+#include "platform/graphics/paint/PaintController.h" |
#include "wtf/OwnPtr.h" |
namespace blink { |
// When slimming paint ships we can remove this SkPicture abstraction and |
-// rely on DisplayItemList here. |
+// rely on PaintController here. |
class SkPictureBuilder { |
WTF_MAKE_NONCOPYABLE(SkPictureBuilder); |
STACK_ALLOCATED(); |
@@ -25,8 +25,8 @@ public: |
if (containingContext && containingContext->contextDisabled()) |
disabledMode = GraphicsContext::FullyDisabled; |
- m_displayItemList = DisplayItemList::create(); |
- m_context = adoptPtr(new GraphicsContext(m_displayItemList.get(), disabledMode, metaData)); |
+ m_paintController = PaintController::create(); |
+ m_context = adoptPtr(new GraphicsContext(m_paintController.get(), disabledMode, metaData)); |
if (containingContext) { |
m_context->setDeviceScaleFactor(containingContext->deviceScaleFactor()); |
@@ -39,13 +39,13 @@ public: |
PassRefPtr<const SkPicture> endRecording() |
{ |
m_context->beginRecording(m_bounds); |
- m_displayItemList->commitNewDisplayItems(); |
- m_displayItemList->paintArtifact().replay(*m_context); |
+ m_paintController->commitNewDisplayItems(); |
+ m_paintController->paintArtifact().replay(*m_context); |
return m_context->endRecording(); |
} |
private: |
- OwnPtr<DisplayItemList> m_displayItemList; |
+ OwnPtr<PaintController> m_paintController; |
OwnPtr<GraphicsContext> m_context; |
FloatRect m_bounds; |
}; |