Split ImageResourceClient into ResourceClient and ImageResourceObserver [2/2]

third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

Index: third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
index ed4aab39721a1802cc29f2a7bc9ad6ca7142784e..db02a2b96416e66a3acc18e2226b18ea6c61917a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
@@ -36,7 +36,6 @@ namespace blink {
 LayoutImageResource::LayoutImageResource()
     : m_layoutObject(nullptr)
     , m_cachedImage(nullptr)
-    , m_client(nullptr)
 {
 }
 
@@ -44,12 +43,11 @@ LayoutImageResource::~LayoutImageResource()
 {
 }
 
-void LayoutImageResource::initialize(LayoutObject* layoutObject, ResourceClient* client)
+void LayoutImageResource::initialize(LayoutObject* layoutObject)
 {
     ASSERT(!m_layoutObject);
     ASSERT(layoutObject);
     m_layoutObject = layoutObject;
-    m_client = client;
 }
 
 void LayoutImageResource::shutdown()
@@ -58,8 +56,6 @@ void LayoutImageResource::shutdown()
 
     if (!m_cachedImage)
         return;
-    if (m_client)
-        m_cachedImage->removeClient(m_client);
     m_cachedImage->removeObserver(m_layoutObject);
 }
 
@@ -71,19 +67,15 @@ void LayoutImageResource::setImageResource(ImageResource* newImage)
         return;
 
     if (m_cachedImage) {
-        if (m_client)
-            m_cachedImage->removeClient(m_client);
         m_cachedImage->removeObserver(m_layoutObject);
     }
     m_cachedImage = newImage;
     if (m_cachedImage) {
-        if (m_client)
-            m_cachedImage->addClient(m_client);
         m_cachedImage->addObserver(m_layoutObject);
         if (m_cachedImage->errorOccurred())
-            m_layoutObject->imageChanged(m_cachedImage.get());
+            m_layoutObject->imageChanged(false, m_cachedImage.get());
     } else {
-        m_layoutObject->imageChanged(m_cachedImage.get());
+        m_layoutObject->imageChanged(false, m_cachedImage.get());
     }
 }