Split ImageResourceClient into ResourceClient and ImageResourceObserver [2/2]

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
@@ skipping 71 matching lines @@
 
     RespectImageOrientationEnum oldOrientation = oldStyle ? oldStyle->respectImageOrientation() : ComputedStyle::initialRespectImageOrientation();
     if (style() && style()->respectImageOrientation() != oldOrientation)
         intrinsicSizeChanged();
 }
 
 void LayoutImage::setImageResource(PassOwnPtrWillBeRawPtr<LayoutImageResource> imageResource)
 {
     ASSERT(!m_imageResource);
     m_imageResource = imageResource;
-    m_imageResource->initialize(this, this);
+    m_imageResource->initialize(this);
 }
 
-void LayoutImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
+void LayoutImage::imageChanged(bool isNotifyingFinish, WrappedImagePtr newImage, const IntRect* rect)
 {
     ASSERT(view());
     ASSERT(view()->frameView());
     if (documentBeingDestroyed())
         return;
 
     if (hasBoxDecorationBackground() || hasMask() || hasShapeOutside())
-        LayoutReplaced::imageChanged(newImage, rect);
+        LayoutReplaced::imageChanged(isNotifyingFinish, newImage, rect);
 
     if (!m_imageResource)
         return;
 
+    if (isNotifyingFinish) {
+        invalidateBackgroundObscurationStatus();
+        if (newImage == m_imageResource->cachedImage()) {
+            // tell any potential compositing layers
+            // that the image is done and they can reference it directly.
+            contentChanged(ImageChanged);
+        }
+    }
+
     if (newImage != m_imageResource->imagePtr())
         return;
 
     if (isGeneratedContent() && isHTMLImageElement(node()) && m_imageResource->errorOccurred())  {
         toHTMLImageElement(node())->ensureFallbackForGeneratedContent();
         return;
     }
 
     // Per the spec, we let the server-sent header override srcset/other sources of dpr.
     // https://github.com/igrigorik/http-client-hints/blob/master/draft-grigorik-http-client-hints-01.txt#L255
@@ skipping 50 matching lines @@
 
     if (imageResource() && imageResource()->maybeAnimated())
         setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
     else
         setShouldDoFullPaintInvalidation(PaintInvalidationFull);
 
     // Tell any potential compositing layers that the image needs updating.
     contentChanged(ImageChanged);
 }
 
-void LayoutImage::notifyFinished(Resource* newImage)
-{
-    if (!m_imageResource)
-        return;
-
-    if (documentBeingDestroyed())
-        return;
-
-    invalidateBackgroundObscurationStatus();
-
-    if (newImage == m_imageResource->cachedImage()) {
-        // tell any potential compositing layers
-        // that the image is done and they can reference it directly.
-        contentChanged(ImageChanged);
-    }
-}
-
 void LayoutImage::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     ImagePainter(*this).paintReplaced(paintInfo, paintOffset);
 }
 
 void LayoutImage::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     ImagePainter(*this).paint(paintInfo, paintOffset);
 }
 
@@ skipping 113 matching lines @@
         return nullptr;
 
     ImageResource* cachedImage = m_imageResource->cachedImage();
     if (cachedImage && cachedImage->getImage() && cachedImage->getImage()->isSVGImage())
         return toSVGImage(cachedImage->getImage())->embeddedContentBox();
 
     return nullptr;
 }
 
 } // namespace blink