Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: Source/core/html/HTMLImageLoader.cpp

Issue 696123002: Revert of Use Shadow DOM to display fallback content for images (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLImageLoader.h ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/html/HTMLImageLoader.h" 23 #include "core/html/HTMLImageLoader.h"
24 24
25 #include "core/HTMLNames.h" 25 #include "core/HTMLNames.h"
26 #include "core/dom/Element.h" 26 #include "core/dom/Element.h"
27 #include "core/events/Event.h" 27 #include "core/events/Event.h"
28 #include "core/fetch/ImageResource.h" 28 #include "core/fetch/ImageResource.h"
29 #include "core/html/HTMLImageElement.h"
29 #include "core/html/HTMLObjectElement.h" 30 #include "core/html/HTMLObjectElement.h"
30 #include "core/html/parser/HTMLParserIdioms.h" 31 #include "core/html/parser/HTMLParserIdioms.h"
31 #include "platform/Logging.h" 32 #include "platform/Logging.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 HTMLImageLoader::HTMLImageLoader(Element* node) 36 HTMLImageLoader::HTMLImageLoader(Element* node)
36 : ImageLoader(node) 37 : ImageLoader(node)
37 { 38 {
38 } 39 }
(...skipping 14 matching lines...) Expand all
53 if (isHTMLObjectElement(*element()) && !errorOccurred) 54 if (isHTMLObjectElement(*element()) && !errorOccurred)
54 errorOccurred = (image()->response().httpStatusCode() >= 400); // An <ob ject> considers a 404 to be an error and should fire onerror. 55 errorOccurred = (image()->response().httpStatusCode() >= 400); // An <ob ject> considers a 404 to be an error and should fire onerror.
55 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load)); 56 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load));
56 } 57 }
57 58
58 String HTMLImageLoader::sourceURI(const AtomicString& attr) const 59 String HTMLImageLoader::sourceURI(const AtomicString& attr) const
59 { 60 {
60 return stripLeadingAndTrailingHTMLSpaces(attr); 61 return stripLeadingAndTrailingHTMLSpaces(attr);
61 } 62 }
62 63
63 void HTMLImageLoader::noImageResourceToLoad()
64 {
65 // FIXME: Use fallback content even when there is no alt-text. The only bloc ker is the large amount of rebaselining it requires.
66 if (!toHTMLElement(element())->altText().isEmpty())
67 toHTMLElement(element())->ensureFallbackContent();
68 }
69
70 void HTMLImageLoader::notifyFinished(Resource*) 64 void HTMLImageLoader::notifyFinished(Resource*)
71 { 65 {
72 ImageResource* cachedImage = image(); 66 ImageResource* cachedImage = image();
73 67
68 RefPtrWillBeRawPtr<Element> element = this->element();
74 ImageLoader::notifyFinished(cachedImage); 69 ImageLoader::notifyFinished(cachedImage);
75 70
76 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400; 71 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400;
77 if (loadError)
78 toHTMLElement(element())->ensureFallbackContent();
79 else
80 toHTMLElement(element())->ensurePrimaryContent();
81 72
82 if (loadError && isHTMLObjectElement(element())) 73 if (loadError && isHTMLObjectElement(*element))
83 toHTMLObjectElement(element())->renderFallbackContent(); 74 toHTMLObjectElement(element)->renderFallbackContent();
84 } 75 }
85 76
86 } 77 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLImageLoader.h ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698