| 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 c580df1416cf952af5b144a13dfaefa153c2cfed..053a2a5bd1f2bb85d9b42b2a529418c1b54f800c 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
|
| @@ -233,18 +233,18 @@ TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) {
|
| TEST_F(DeferredImageDecoderTest, singleFrameImageLoading) {
|
| status_ = ImageFrame::kFramePartial;
|
| lazy_decoder_->SetData(data_, false);
|
| - EXPECT_FALSE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| + EXPECT_FALSE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
| sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
|
| ASSERT_TRUE(image);
|
| unsigned first_id = image->uniqueID();
|
| - EXPECT_FALSE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| + EXPECT_FALSE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
| EXPECT_TRUE(actual_decoder_);
|
|
|
| status_ = ImageFrame::kFrameComplete;
|
| data_->Append(" ", 1u);
|
| lazy_decoder_->SetData(data_, true);
|
| EXPECT_FALSE(actual_decoder_);
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
|
|
| image = lazy_decoder_->CreateFrameAtIndex(0);
|
| ASSERT_TRUE(image);
|
| @@ -263,7 +263,7 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) {
|
| sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
|
| ASSERT_TRUE(image);
|
| unsigned first_id = image->uniqueID();
|
| - EXPECT_FALSE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| + EXPECT_FALSE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
| EXPECT_EQ(10.0f, lazy_decoder_->FrameDurationAtIndex(0));
|
|
|
| frame_count_ = 2;
|
| @@ -276,8 +276,8 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) {
|
| ASSERT_TRUE(image);
|
| unsigned second_id = image->uniqueID();
|
| EXPECT_NE(first_id, second_id);
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(1));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(1));
|
| EXPECT_EQ(20.0f, lazy_decoder_->FrameDurationAtIndex(1));
|
| EXPECT_TRUE(actual_decoder_);
|
|
|
| @@ -286,9 +286,9 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading) {
|
| status_ = ImageFrame::kFrameComplete;
|
| lazy_decoder_->SetData(data_, true);
|
| EXPECT_FALSE(actual_decoder_);
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(0));
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(1));
|
| - EXPECT_TRUE(lazy_decoder_->FrameIsCompleteAtIndex(2));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(0));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(1));
|
| + EXPECT_TRUE(lazy_decoder_->FrameIsReceivedAtIndex(2));
|
| EXPECT_EQ(10.0f, lazy_decoder_->FrameDurationAtIndex(0));
|
| EXPECT_EQ(20.0f, lazy_decoder_->FrameDurationAtIndex(1));
|
| EXPECT_EQ(30.0f, lazy_decoder_->FrameDurationAtIndex(2));
|
|
|