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

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

Issue 2746343002: Phase III Step 1: Make ImageResourceContent manage its own ResourceStatus (Closed)
Patch Set: Reflect comments Created 3 years, 7 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
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 f54bc25d83dfe9acc96549127a32dff9e940a57b..67a803a9126ce8adb662f87d411fcc275863bbda 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
@@ -170,6 +170,8 @@ void ReceiveResponse(ImageResource* image_resource,
response.SetURL(url);
response.SetHTTPStatusCode(200);
response.SetMimeType(mime_type);
+ image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
image_resource->ResponseReceived(response, nullptr);
image_resource->AppendData(data, data_size);
image_resource->Finish();
@@ -446,6 +448,7 @@ TEST(ImageResourceTest, CancelOnRemoveObserver) {
TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients) {
ImageResource* image_resource = ImageResource::Create(ResourceRequest());
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());
@@ -488,6 +491,7 @@ TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients) {
TEST(ImageResourceTest, UpdateBitmapImages) {
ImageResource* image_resource = ImageResource::Create(ResourceRequest());
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());
@@ -513,6 +517,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
ResourceRequest request = ResourceRequest(test_url);
ImageResource* image_resource = ImageResource::Create(request);
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());
@@ -557,6 +562,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinishedWithOldHeaders) {
ResourceRequest request = ResourceRequest(test_url);
ImageResource* image_resource = ImageResource::Create(request);
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());
@@ -602,6 +608,7 @@ TEST(ImageResourceTest,
request.SetPreviewsState(WebURLRequest::kServerLoFiOn);
ImageResource* image_resource = ImageResource::Create(request);
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());
@@ -1523,6 +1530,7 @@ TEST(ImageResourceTest, PeriodicFlushTest) {
ResourceRequest request = ResourceRequest(test_url);
ImageResource* image_resource = ImageResource::Create(request);
image_resource->SetStatus(ResourceStatus::kPending);
+ image_resource->NotifyStartLoad();
std::unique_ptr<MockImageResourceObserver> observer =
MockImageResourceObserver::Create(image_resource->GetContent());

Powered by Google App Engine
This is Rietveld 408576698