| Index: third_party/WebKit/Source/core/html/HTMLImageLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp b/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp
|
| index 01e59d35a5261c135f29f0445146c64e97c8177c..dd628292a55b7fcd0a0d59879e9d8ccd8646a489 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLImageLoader.cpp
|
| @@ -73,13 +73,11 @@ void HTMLImageLoader::noImageResourceToLoad()
|
| loadFallbackContentForElement(element());
|
| }
|
|
|
| -void HTMLImageLoader::imageNotifyFinished(ImageResource*)
|
| +void HTMLImageLoader::finishInternal(ImageResource* imageResource)
|
| {
|
| - ImageResource* cachedImage = image();
|
| RawPtr<Element> element = this->element();
|
| - ImageLoader::imageNotifyFinished(cachedImage);
|
|
|
| - bool loadError = cachedImage->errorOccurred();
|
| + bool loadError = imageResource->errorOccurred();
|
| if (isHTMLImageElement(*element)) {
|
| if (loadError)
|
| ensureFallbackContent();
|
| @@ -94,7 +92,7 @@ void HTMLImageLoader::imageNotifyFinished(ImageResource*)
|
| toHTMLInputElement(element)->ensurePrimaryContent();
|
| }
|
|
|
| - if ((loadError || cachedImage->response().httpStatusCode() >= 400) && isHTMLObjectElement(*element))
|
| + if ((loadError || imageResource->response().httpStatusCode() >= 400) && isHTMLObjectElement(*element))
|
| toHTMLObjectElement(element)->renderFallbackContent();
|
| }
|
|
|
|
|