Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp |
index bf6e341d702d1bc5f8d8e782b31c19f96d077e87..d46baba1cd728630a9c5ba887523b8ed08ba8552 100644 |
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp |
@@ -260,18 +260,18 @@ TEST_F(DeferredImageDecoderTest, singleFrameImageLoading) |
{ |
m_status = ImageFrame::FramePartial; |
m_lazyDecoder->setData(*m_data, false); |
- EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
+ EXPECT_FALSE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0); |
ASSERT_TRUE(image); |
unsigned firstId = image->uniqueID(); |
- EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
+ EXPECT_FALSE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
EXPECT_TRUE(m_actualDecoder); |
m_status = ImageFrame::FrameComplete; |
m_data->append(" ", 1u); |
m_lazyDecoder->setData(*m_data, true); |
EXPECT_FALSE(m_actualDecoder); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
+ EXPECT_TRUE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
image = m_lazyDecoder->createFrameAtIndex(0); |
ASSERT_TRUE(image); |
@@ -291,7 +291,7 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) |
RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0); |
ASSERT_TRUE(image); |
unsigned firstId = image->uniqueID(); |
- EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
+ EXPECT_FALSE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0)); |
m_frameCount = 2; |
@@ -304,8 +304,8 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) |
ASSERT_TRUE(image); |
unsigned secondId = image->uniqueID(); |
EXPECT_NE(firstId, secondId); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1)); |
+ EXPECT_TRUE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
+ EXPECT_FALSE(m_lazyDecoder->frameIsFullyReceivedAtIndex(1)); |
EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1)); |
EXPECT_TRUE(m_actualDecoder); |
@@ -314,9 +314,9 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) |
m_status = ImageFrame::FrameComplete; |
m_lazyDecoder->setData(*m_data, true); |
EXPECT_FALSE(m_actualDecoder); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0)); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1)); |
- EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(2)); |
+ EXPECT_TRUE(m_lazyDecoder->frameIsFullyReceivedAtIndex(0)); |
+ EXPECT_TRUE(m_lazyDecoder->frameIsFullyReceivedAtIndex(1)); |
+ EXPECT_TRUE(m_lazyDecoder->frameIsFullyReceivedAtIndex(2)); |
EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0)); |
EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1)); |
EXPECT_EQ(30.0f, m_lazyDecoder->frameDurationAtIndex(2)); |