Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp |
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp |
index daf35bd190b5dc7fb3e7d2aa8af05bc32d68e32f..07fd070cc90898149fa5d81d32facbf2eaa9f1aa 100644 |
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp |
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp |
@@ -354,21 +354,26 @@ TEST(ImageResourceTest, ReloadIfLoFi) |
ASSERT_EQ(client->imageChangedCount(), 2); |
ASSERT_TRUE(client->notifyFinishedCalled()); |
ASSERT_TRUE(cachedImage->getImage()->isBitmapImage()); |
+ EXPECT_EQ(1, cachedImage->getImage()->width()); |
+ EXPECT_EQ(1, cachedImage->getImage()->height()); |
cachedImage->reloadIfLoFi(fetcher); |
ASSERT_FALSE(cachedImage->errorOccurred()); |
ASSERT_FALSE(cachedImage->resourceBuffer()); |
- ASSERT_TRUE(cachedImage->hasImage()); |
+ ASSERT_FALSE(cachedImage->hasImage()); |
ASSERT_EQ(client->imageChangedCount(), 3); |
+ Vector<unsigned char> jpeg2 = jpegImage2(); |
cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(resourceResponse), nullptr); |
- cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg.data()), jpeg.size(), jpeg.size()); |
- cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg.size()); |
+ cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg2.data()), jpeg2.size(), jpeg2.size()); |
+ cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg2.size()); |
ASSERT_FALSE(cachedImage->errorOccurred()); |
ASSERT_TRUE(cachedImage->hasImage()); |
ASSERT_FALSE(cachedImage->getImage()->isNull()); |
ASSERT_TRUE(client->notifyFinishedCalled()); |
ASSERT_TRUE(cachedImage->getImage()->isBitmapImage()); |
+ EXPECT_EQ(50, cachedImage->getImage()->width()); |
+ EXPECT_EQ(50, cachedImage->getImage()->height()); |
} |
TEST(ImageResourceTest, SVGImage) |