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

Unified Diff: third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp

Issue 2800473002: Treat responses with legacy LoFi headers as LoFi images. (Closed)
Patch Set: Rebased on master Created 3 years, 8 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/loader/resource/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/loader/resource/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
index 4c70dd47c527326c26bbe84300838b28392af927..05e10ffa74057b6f67726c3c63a754937f580fdc 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
@@ -549,6 +549,49 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
WebCachePolicy::kBypassingCache);
}
+TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinishedWithOldHeaders) {
+ KURL test_url(kParsedURLString, kTestURL);
+ ScopedMockedURLLoad scoped_mocked_url_load(test_url, GetTestFilePath());
+ ResourceRequest request = ResourceRequest(test_url);
+ ImageResource* image_resource = ImageResource::Create(request);
+ image_resource->SetStatus(ResourceStatus::kPending);
+
+ std::unique_ptr<MockImageResourceObserver> observer =
+ MockImageResourceObserver::Create(image_resource->GetContent());
+ ResourceFetcher* fetcher = CreateFetcher();
+
+ // Send the image response.
+ ResourceResponse resource_response(KURL(), "image/jpeg", sizeof(kJpegImage),
+ g_null_atom);
+ resource_response.AddHTTPHeaderField("chrome-proxy", "q=low");
+
+ image_resource->ResponseReceived(resource_response, nullptr);
+ image_resource->AppendData(reinterpret_cast<const char*>(kJpegImage),
+ sizeof(kJpegImage));
+ image_resource->Finish();
+ EXPECT_FALSE(image_resource->ErrorOccurred());
+ ASSERT_TRUE(image_resource->GetContent()->HasImage());
+ EXPECT_FALSE(image_resource->GetContent()->GetImage()->IsNull());
+ EXPECT_EQ(2, observer->ImageChangedCount());
+ EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnLastImageChanged());
+ // The observer should have been notified that the image load completed.
+ EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
+ EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnImageNotifyFinished());
+ EXPECT_TRUE(image_resource->GetContent()->GetImage()->IsBitmapImage());
+ EXPECT_EQ(kJpegImageWidth, image_resource->GetContent()->GetImage()->width());
+ EXPECT_EQ(kJpegImageHeight,
+ image_resource->GetContent()->GetImage()->height());
+
+ // Call reloadIfLoFiOrPlaceholderImage() after the image has finished loading.
+ image_resource->ReloadIfLoFiOrPlaceholderImage(fetcher,
+ Resource::kReloadAlways);
+
+ EXPECT_EQ(3, observer->ImageChangedCount());
+ TestThatReloadIsStartedThenServeReload(
+ test_url, image_resource, image_resource->GetContent(), observer.get(),
+ WebCachePolicy::kBypassingCache);
+}
+
TEST(ImageResourceTest,
ReloadIfLoFiOrPlaceholderAfterFinishedWithoutLoFiHeaders) {
KURL test_url(kParsedURLString, kTestURL);
« no previous file with comments | « third_party/WebKit/Source/core/loader/resource/ImageResource.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698