Index: third_party/WebKit/Source/core/loader/ImageLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
index 8b2d0b83d37840810ae1d672da56f955f6d7cbc1..58dd080a7ad71f8e60efe0afcc83424722acfa47 100644 |
--- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
@@ -181,6 +181,7 @@ void ImageLoader::dispose() |
if (m_image) { |
m_image->removeClient(this); |
+ m_image->removeObserver(this); |
m_image = nullptr; |
} |
@@ -244,10 +245,14 @@ void ImageLoader::setImageWithoutConsideringPendingLoadEvent(ImageResource* newI |
m_hasPendingErrorEvent = false; |
} |
m_imageComplete = true; |
- if (newImage) |
+ if (newImage) { |
newImage->addClient(this); |
- if (oldImage) |
+ newImage->addObserver(this); |
+ } |
+ if (oldImage) { |
oldImage->removeClient(this); |
+ oldImage->removeObserver(this); |
+ } |
} |
if (LayoutImageResource* imageResource = layoutImageResource()) |
@@ -390,11 +395,14 @@ void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, Up |
updateLayoutObject(); |
// If newImage exists and is cached, addClient() will result in the load event |
// being queued to fire. Ensure this happens after beforeload is dispatched. |
- if (newImage) |
+ if (newImage) { |
newImage->addClient(this); |
- |
- if (oldImage) |
+ newImage->addObserver(this); |
+ } |
+ if (oldImage) { |
oldImage->removeClient(this); |
+ oldImage->removeObserver(this); |
+ } |
} |
if (LayoutImageResource* imageResource = layoutImageResource()) |
@@ -432,8 +440,10 @@ void ImageLoader::updateFromElement(UpdateFromElementBehavior updateBehavior, Re |
// an asynchronous load completes. |
if (imageSourceURL.isEmpty()) { |
ImageResource* image = m_image.get(); |
- if (image) |
+ if (image) { |
image->removeClient(this); |
+ image->removeObserver(this); |
+ } |
m_image = nullptr; |
} |
@@ -638,7 +648,7 @@ void ImageLoader::willRemoveClient(ImageLoaderClient& client) |
} |
} |
-bool ImageLoader::getImageAnimationPolicy(ImageResource*, ImageAnimationPolicy& policy) |
+bool ImageLoader::getImageAnimationPolicy(ImageAnimationPolicy& policy) |
{ |
if (!element()->document().settings()) |
return false; |