Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

Issue 2114213002: Fix loading placeholders for Lo-Fi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 239564a918038758d5deca2b400df1257277affe..6fb9c900df4f1f5d6ba589054ce35872ad8b22d3 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -334,7 +334,9 @@ TEST(ImageResourceTest, ReloadIfLoFi)
{
KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
- ImageResource* cachedImage = ImageResource::create(ResourceRequest(testURL));
+ ResourceRequest request = ResourceRequest(testURL);
+ request.setLoFiState(WebURLRequest::LoFiOn);
+ ImageResource* cachedImage = ImageResource::create(request);
cachedImage->setStatus(Resource::Pending);
Persistent<MockImageResourceClient> client = new MockImageResourceClient(cachedImage);
@@ -354,21 +356,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)
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698