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

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

Issue 757583002: 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 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/HTMLImageElement.h"
30 #include "core/html/HTMLInputElement.h"
31 #include "core/html/HTMLObjectElement.h" 30 #include "core/html/HTMLObjectElement.h"
32 #include "core/html/parser/HTMLParserIdioms.h" 31 #include "core/html/parser/HTMLParserIdioms.h"
33 #include "platform/Logging.h" 32 #include "platform/Logging.h"
34 33
35 namespace blink { 34 namespace blink {
36 35
37 using namespace HTMLNames; 36 HTMLImageLoader::HTMLImageLoader(Element* node)
38 37 : ImageLoader(node)
39 HTMLImageLoader::HTMLImageLoader(Element* element)
40 : ImageLoader(element)
41 , m_loadFallbackContentTimer(this, &HTMLImageLoader::timerFired)
42 { 38 {
43 } 39 }
44 40
45 HTMLImageLoader::~HTMLImageLoader() 41 HTMLImageLoader::~HTMLImageLoader()
46 { 42 {
47 } 43 }
48 44
49 void HTMLImageLoader::dispatchLoadEvent() 45 void HTMLImageLoader::dispatchLoadEvent()
50 { 46 {
51 WTF_LOG(Timers, "HTMLImageLoader::dispatchLoadEvent %p", this); 47 WTF_LOG(Timers, "HTMLImageLoader::dispatchLoadEvent %p", this);
52 48
53 // HTMLVideoElement uses this class to load the poster image, but it should not fire events for loading or failure. 49 // HTMLVideoElement uses this class to load the poster image, but it should not fire events for loading or failure.
54 if (isHTMLVideoElement(*element())) 50 if (isHTMLVideoElement(*element()))
55 return; 51 return;
56 52
57 bool errorOccurred = image()->errorOccurred(); 53 bool errorOccurred = image()->errorOccurred();
58 if (isHTMLObjectElement(*element()) && !errorOccurred) 54 if (isHTMLObjectElement(*element()) && !errorOccurred)
59 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.
60 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load)); 56 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load));
61 } 57 }
62 58
63 String HTMLImageLoader::sourceURI(const AtomicString& attr) const 59 String HTMLImageLoader::sourceURI(const AtomicString& attr) const
64 { 60 {
65 return stripLeadingAndTrailingHTMLSpaces(attr); 61 return stripLeadingAndTrailingHTMLSpaces(attr);
66 } 62 }
67 63
68 static void loadFallbackContentForElement(Element* element)
69 {
70 if (isHTMLImageElement(element))
71 toHTMLImageElement(element)->ensureFallbackContent();
72 else if (isHTMLInputElement(element))
73 toHTMLInputElement(element)->ensureFallbackContent();
74 }
75
76 void HTMLImageLoader::noImageResourceToLoad()
77 {
78 // FIXME: Use fallback content even when there is no alt-text. The only bloc ker is the large amount of rebaselining it requires.
79 if (!toHTMLElement(element())->altText().isEmpty())
80 loadFallbackContentForElement(element());
81 }
82
83 void HTMLImageLoader::notifyFinished(Resource*) 64 void HTMLImageLoader::notifyFinished(Resource*)
84 { 65 {
85 ImageResource* cachedImage = image(); 66 ImageResource* cachedImage = image();
67
86 RefPtrWillBeRawPtr<Element> element = this->element(); 68 RefPtrWillBeRawPtr<Element> element = this->element();
87 ImageLoader::notifyFinished(cachedImage); 69 ImageLoader::notifyFinished(cachedImage);
88 70
89 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400; 71 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400;
90 if (isHTMLImageElement(*element)) {
91 if (loadError)
92 ensureFallbackContent();
93 else
94 toHTMLImageElement(element)->ensurePrimaryContent();
95 }
96
97 if (isHTMLInputElement(*element)) {
98 if (loadError)
99 ensureFallbackContent();
100 else
101 toHTMLInputElement(element)->ensurePrimaryContent();
102 }
103 72
104 if (loadError && isHTMLObjectElement(*element)) 73 if (loadError && isHTMLObjectElement(*element))
105 toHTMLObjectElement(element)->renderFallbackContent(); 74 toHTMLObjectElement(element)->renderFallbackContent();
106 } 75 }
107 76
108 void HTMLImageLoader::ensureFallbackContent()
109 {
110 if (image()->url().protocolIsData())
111 m_loadFallbackContentTimer.startOneShot(0, FROM_HERE);
112 else
113 loadFallbackContentForElement(element());
114 } 77 }
115
116 void HTMLImageLoader::timerFired(Timer<HTMLImageLoader>*)
117 {
118 loadFallbackContentForElement(element());
119 }
120 }
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