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

third_party/WebKit/Source/core/fetch/MockResourceClients.h

Index: third_party/WebKit/Source/core/fetch/MockResourceClients.h
diff --git a/third_party/WebKit/Source/core/fetch/MockResourceClients.h b/third_party/WebKit/Source/core/fetch/MockResourceClients.h
index 90fe127837a0340a7e287605568bee099fd9ecfe..1dcbf8e4be9650c095755c7c252f566b170d4701 100644
--- a/third_party/WebKit/Source/core/fetch/MockResourceClients.h
+++ b/third_party/WebKit/Source/core/fetch/MockResourceClients.h
@@ -60,7 +60,7 @@ class MockResourceClient : public GarbageCollectedFinalized<MockResourceClient>,
   virtual void removeAsClient();
   virtual void dispose();
 
-  DECLARE_TRACE();
+  DECLARE_VIRTUAL_TRACE();
 
  protected:
   Member<Resource> m_resource;
@@ -68,6 +68,8 @@ class MockResourceClient : public GarbageCollectedFinalized<MockResourceClient>,
   size_t m_encodedSizeOnNotifyFinished;
 };
 
+// MockImageResourceClient isn't re-registered to the new ImageResource
+// in LoFi image reloading.
 class MockImageResourceClient final : public MockResourceClient,
                                       public ImageResourceObserver {
  public:
@@ -81,7 +83,7 @@ class MockImageResourceClient final : public MockResourceClient,
 
   bool notifyFinishedCalled() const override;
 
-  void removeAsClient() override;
+  void removeAsClientAndObserver();
   void dispose() override;
 
   int imageChangedCount() const { return m_imageChangedCount; }
@@ -94,11 +96,17 @@ class MockImageResourceClient final : public MockResourceClient,
     return m_encodedSizeOnImageNotifyFinished;
   }
 
+  DEFINE_INLINE_VIRTUAL_TRACE() {
+    visitor->trace(m_content);
+    MockResourceClient::trace(visitor);
+  }
+
  private:
   int m_imageChangedCount;
   size_t m_encodedSizeOnLastImageChanged;
   int m_imageNotifyFinishedCount;
   size_t m_encodedSizeOnImageNotifyFinished;
+  Member<ImageResourceContent> m_content;
 };
 
 }  // namespace blink