Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp |
index b37d903e2b1e73ee3e82c5eee201fd1322dfd0c5..e4d44dc975ce841ed74d70f5c1770ddc9211e3e5 100644 |
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp |
@@ -25,60 +25,23 @@ using testing::Test; |
namespace blink { |
-class MockSurfaceFactory : public RecordingImageBufferFallbackSurfaceFactory { |
- public: |
- MockSurfaceFactory() : create_surface_count_(0) {} |
- |
- virtual std::unique_ptr<ImageBufferSurface> CreateSurface( |
- const IntSize& size, |
- OpacityMode opacity_mode, |
- const CanvasColorParams& color_params) { |
- create_surface_count_++; |
- return WTF::WrapUnique(new UnacceleratedImageBufferSurface( |
- size, opacity_mode, kInitializeImagePixels, color_params)); |
- } |
- |
- virtual ~MockSurfaceFactory() {} |
- |
- int CreateSurfaceCount() { return create_surface_count_; } |
- |
- private: |
- int create_surface_count_; |
-}; |
- |
class RecordingImageBufferSurfaceTest : public Test { |
protected: |
RecordingImageBufferSurfaceTest() { |
- std::unique_ptr<MockSurfaceFactory> surface_factory = |
- WTF::MakeUnique<MockSurfaceFactory>(); |
- surface_factory_ = surface_factory.get(); |
- std::unique_ptr<RecordingImageBufferSurface> test_surface = |
- WTF::WrapUnique(new RecordingImageBufferSurface( |
- IntSize(10, 10), std::move(surface_factory), kNonOpaque)); |
+ auto test_surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), kNonOpaque); |
test_surface_ = test_surface.get(); |
- // We create an ImageBuffer in order for the testSurface to be |
+ // We create an ImageBuffer in order for the |test_surface| to be |
// properly initialized with a GraphicsContext |
image_buffer_ = ImageBuffer::Create(std::move(test_surface)); |
- EXPECT_FALSE(!image_buffer_); |
- test_surface_->InitializeCurrentFrame(); |
+ EXPECT_TRUE(image_buffer_); |
} |
public: |
RecordingImageBufferSurface* TestSurface() { return test_surface_; } |
- int CreateSurfaceCount() { return surface_factory_->CreateSurfaceCount(); } |
PaintCanvas* Canvas() { return image_buffer_->Canvas(); } |
- void ExpectDisplayListEnabled(bool display_list_enabled) { |
- EXPECT_EQ(display_list_enabled, (bool)test_surface_->current_frame_.get()); |
- EXPECT_EQ(!display_list_enabled, |
- (bool)test_surface_->fallback_surface_.get()); |
- int expected_surface_creation_count = display_list_enabled ? 0 : 1; |
- EXPECT_EQ(expected_surface_creation_count, |
- surface_factory_->CreateSurfaceCount()); |
- } |
- |
private: |
- MockSurfaceFactory* surface_factory_; |
RecordingImageBufferSurface* test_surface_; |
std::unique_ptr<ImageBuffer> image_buffer_; |
}; |
@@ -86,13 +49,13 @@ class RecordingImageBufferSurfaceTest : public Test { |
TEST_F(RecordingImageBufferSurfaceTest, testEmptyPicture) { |
sk_sp<PaintRecord> record = TestSurface()->GetRecord(); |
EXPECT_TRUE(record.get()); |
- ExpectDisplayListEnabled(true); |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
} |
TEST_F(RecordingImageBufferSurfaceTest, testNoFallbackWithClear) { |
TestSurface()->WillOverwriteCanvas(); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(true); |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
} |
TEST_F(RecordingImageBufferSurfaceTest, testNonAnimatedCanvasUpdate) { |
@@ -101,17 +64,16 @@ TEST_F(RecordingImageBufferSurfaceTest, testNonAnimatedCanvasUpdate) { |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->GetRecord(); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(true); |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
} |
TEST_F(RecordingImageBufferSurfaceTest, testAnimatedWithoutClear) { |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->GetRecord(); |
- EXPECT_EQ(0, CreateSurfaceCount()); |
- ExpectDisplayListEnabled(true); // first frame has an implicit clear |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(false); |
+ EXPECT_FALSE(TestSurface()->IsRecording()); |
} |
TEST_F(RecordingImageBufferSurfaceTest, testAnimatedWithClear) { |
@@ -119,12 +81,12 @@ TEST_F(RecordingImageBufferSurfaceTest, testAnimatedWithClear) { |
TestSurface()->WillOverwriteCanvas(); |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(true); |
- // clear after use |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
+ // Clear after use. |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->WillOverwriteCanvas(); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(true); |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
} |
TEST_F(RecordingImageBufferSurfaceTest, testClearRect) { |
@@ -136,7 +98,7 @@ TEST_F(RecordingImageBufferSurfaceTest, testClearRect) { |
clear_flags); |
TestSurface()->DidDraw(FloatRect(0, 0, 1, 1)); |
TestSurface()->GetRecord(); |
- ExpectDisplayListEnabled(true); |
+ EXPECT_TRUE(TestSurface()->IsRecording()); |
} |
} // namespace blink |