Index: Source/core/paint/DrawingRecorderTest.cpp |
diff --git a/Source/core/paint/DrawingRecorderTest.cpp b/Source/core/paint/DrawingRecorderTest.cpp |
index 47654f57570886c47b0ab62e2246c39a576b1ac7..68dfcea8378756cd0c29c3cb38c2e2d72c39eeb2 100644 |
--- a/Source/core/paint/DrawingRecorderTest.cpp |
+++ b/Source/core/paint/DrawingRecorderTest.cpp |
@@ -5,12 +5,9 @@ |
#include "config.h" |
#include "core/paint/DrawingRecorder.h" |
-#include "core/rendering/RenderLayer.h" |
#include "core/rendering/RenderView.h" |
#include "core/rendering/RenderingTestHelper.h" |
#include "platform/graphics/GraphicsContext.h" |
-#include "platform/graphics/GraphicsLayer.h" |
-#include "platform/graphics/paint/DisplayItemList.h" |
#include <gtest/gtest.h> |
namespace blink { |
@@ -22,7 +19,6 @@ public: |
protected: |
RenderView* renderView() { return m_renderView; } |
- DisplayItemList& rootDisplayItemList() { return renderView()->layer()->graphicsLayerBacking()->displayItemList(); } |
private: |
virtual void SetUp() override |
@@ -30,7 +26,6 @@ private: |
RuntimeEnabledFeatures::setSlimmingPaintEnabled(true); |
RenderingTest::SetUp(); |
- enableCompositing(); |
m_renderView = document().view()->renderView(); |
ASSERT_TRUE(m_renderView); |
@@ -56,10 +51,10 @@ TEST_F(DrawingRecorderTest, DrawingRecorderTest_Nothing) |
{ |
GraphicsContext* context = new GraphicsContext(nullptr); |
FloatRect bound = renderView()->viewRect(); |
- EXPECT_EQ((size_t)0, rootDisplayItemList().paintList().size()); |
+ EXPECT_EQ((size_t)0, renderView()->viewDisplayList().paintList().size()); |
drawNothing(context, renderView(), PaintPhaseForeground, bound); |
- EXPECT_EQ((size_t)0, rootDisplayItemList().paintList().size()); |
+ EXPECT_EQ((size_t)0, renderView()->viewDisplayList().paintList().size()); |
} |
TEST_F(DrawingRecorderTest, DrawingRecorderTest_Rect) |
@@ -67,7 +62,7 @@ TEST_F(DrawingRecorderTest, DrawingRecorderTest_Rect) |
GraphicsContext* context = new GraphicsContext(nullptr); |
FloatRect bound = renderView()->viewRect(); |
drawRect(context, renderView(), PaintPhaseForeground, bound); |
- EXPECT_EQ((size_t)1, rootDisplayItemList().paintList().size()); |
+ EXPECT_EQ((size_t)1, renderView()->viewDisplayList().paintList().size()); |
} |
} |