Index: Source/core/html/HTMLImageLoader.cpp |
diff --git a/Source/core/html/HTMLImageLoader.cpp b/Source/core/html/HTMLImageLoader.cpp |
index 5af5a3ca463c31b49fdfe36f96d70faf035722fd..44fc879fe2f85abc3b3d5fe90ff5fef691766d39 100644 |
--- a/Source/core/html/HTMLImageLoader.cpp |
+++ b/Source/core/html/HTMLImageLoader.cpp |
@@ -26,6 +26,7 @@ |
#include "core/dom/Element.h" |
#include "core/events/Event.h" |
#include "core/fetch/ImageResource.h" |
+#include "core/html/HTMLImageElement.h" |
#include "core/html/HTMLObjectElement.h" |
#include "core/html/parser/HTMLParserIdioms.h" |
#include "platform/Logging.h" |
@@ -60,27 +61,17 @@ |
return stripLeadingAndTrailingHTMLSpaces(attr); |
} |
-void HTMLImageLoader::noImageResourceToLoad() |
-{ |
- // FIXME: Use fallback content even when there is no alt-text. The only blocker is the large amount of rebaselining it requires. |
- if (!toHTMLElement(element())->altText().isEmpty()) |
- toHTMLElement(element())->ensureFallbackContent(); |
-} |
- |
void HTMLImageLoader::notifyFinished(Resource*) |
{ |
ImageResource* cachedImage = image(); |
+ RefPtrWillBeRawPtr<Element> element = this->element(); |
ImageLoader::notifyFinished(cachedImage); |
bool loadError = cachedImage->errorOccurred() || cachedImage->response().httpStatusCode() >= 400; |
- if (loadError) |
- toHTMLElement(element())->ensureFallbackContent(); |
- else |
- toHTMLElement(element())->ensurePrimaryContent(); |
- if (loadError && isHTMLObjectElement(element())) |
- toHTMLObjectElement(element())->renderFallbackContent(); |
+ if (loadError && isHTMLObjectElement(*element)) |
+ toHTMLObjectElement(element)->renderFallbackContent(); |
} |
} |