Phase II Step 3: Reload LoFi/placeholder images via new ImageResource

third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h

Index: third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h
index 8d18c4424237690ca5679a420384adcb8e3ed474..29408abba2543634adbe10ef8aeca9d42616cec2 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h
@@ -22,6 +22,7 @@
 namespace blink {
 
 class FetchRequest;
+class ImageResource;
 class ImageResourceInfo;
 class ImageResourceObserver;
 class ResourceError;
@@ -124,7 +125,8 @@ class CORE_EXPORT ImageResourceContent final
   };
   void updateImage(PassRefPtr<SharedBuffer>,
                    UpdateImageOption,
-                   bool allDataReceived);
+                   bool allDataReceived,
+                   ResourceFetcher* fetcherForReload);
   ResourcePriority priorityFromObservers() const;
   void destroyDecodedData();
   void doResetAnimation();
@@ -137,6 +139,9 @@ class CORE_EXPORT ImageResourceContent final
     return m_isRefetchableDataFromDiskCache;
   }
 
+  // Only for tests.
+  const ImageResource* resourceForTest() const;

[Nate Chapin, 2016/12/28 00:14:58]

This is a pretty bad layering violation, right? But at least it's test-only? :/

[hiroshige, 2017/01/25 02:01:49]

Yes, bad violation.
This is currently needed for tests to retrieve the new ImageResource used for
reloading, because reloading can be initiated inside
ResourceLoader::didReveiveData(), and thus tests don't have direct access to
reloading interface.

I removed this by retrieving the new ImageResource for reloading from
ResourceFetcher::cachedResource() in the unit tests.
This is not super clean, but this doesn't affect non-test code.

+
  private:
   explicit ImageResourceContent(PassRefPtr<blink::Image> = nullptr);