Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

 /*
  * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
  * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
  * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
@@ skipping 18 matching lines @@
 
 #include "core/dom/Element.h"
 #include "core/layout/LayoutImage.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
 LayoutImageResource::LayoutImageResource()
     : m_layoutObject(nullptr)
     , m_cachedImage(nullptr)
+    , m_client(nullptr)
 {
 }
 
 LayoutImageResource::~LayoutImageResource()
 {
 }
 
-void LayoutImageResource::initialize(LayoutObject* layoutObject)
+void LayoutImageResource::initialize(LayoutObject* layoutObject, ResourceClient* client)
 {
     ASSERT(!m_layoutObject);
     ASSERT(layoutObject);
     m_layoutObject = layoutObject;
+    m_client = client;
 }
 
 void LayoutImageResource::shutdown()
 {
     ASSERT(m_layoutObject);
 
-    if (m_cachedImage)
-        m_cachedImage->removeClient(m_layoutObject);
+    if (!m_cachedImage)
+        return;
+    if (m_client)
+        m_cachedImage->removeClient(m_client);
+    m_cachedImage->removeObserver(m_layoutObject);
 }
 
 void LayoutImageResource::setImageResource(ImageResource* newImage)
 {
     ASSERT(m_layoutObject);
 
     if (m_cachedImage == newImage)
         return;
 
-    if (m_cachedImage)
-        m_cachedImage->removeClient(m_layoutObject);
+    if (m_cachedImage) {
+        if (m_client)
+            m_cachedImage->removeClient(m_client);
+        m_cachedImage->removeObserver(m_layoutObject);
+    }
     m_cachedImage = newImage;
     if (m_cachedImage) {
-        m_cachedImage->addClient(m_layoutObject);
+        if (m_client)
+            m_cachedImage->addClient(m_client);
+        m_cachedImage->addObserver(m_layoutObject);
         if (m_cachedImage->errorOccurred())
             m_layoutObject->imageChanged(m_cachedImage.get());
     } else {
         m_layoutObject->imageChanged(m_cachedImage.get());
     }
 }
 
 void LayoutImageResource::resetAnimation()
 {
     ASSERT(m_layoutObject);
@@ skipping 34 matching lines @@
     return SVGImageForContainer::create(svgImage, containerSize, zoom, url);
 }
 
 bool LayoutImageResource::maybeAnimated() const
 {
     Image* image = m_cachedImage ? m_cachedImage->getImage() : Image::nullImage();
     return image->maybeAnimated();
 }
 
 } // namespace blink