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

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

Issue 481753002: Use Shadow DOM to display fallback content for images (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated 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
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/dom/Microtask.h"
27 #include "core/events/Event.h" 28 #include "core/events/Event.h"
28 #include "core/fetch/ImageResource.h" 29 #include "core/fetch/ImageResource.h"
29 #include "core/html/HTMLImageElement.h"
30 #include "core/html/HTMLObjectElement.h" 30 #include "core/html/HTMLObjectElement.h"
31 #include "core/html/parser/HTMLParserIdioms.h" 31 #include "core/html/parser/HTMLParserIdioms.h"
32 #include "platform/Logging.h" 32 #include "platform/Logging.h"
33 #include "public/platform/WebThread.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
37 using namespace HTMLNames;
38
39 class HTMLImageLoader::EnsureFallbackContentTask : public blink::WebThread::Task {
pdr. 2014/11/14 07:34:17 A Timer with startOneShot seems like it would be m
40 public:
41 static PassOwnPtr<EnsureFallbackContentTask> create(HTMLElement* element)
42 {
43 return adoptPtr(new EnsureFallbackContentTask(element));
44 }
45
46 EnsureFallbackContentTask(HTMLElement* element)
47 : m_element(element)
48 {
49 }
50 virtual void run() override
pdr. 2014/11/14 07:34:17 Nit: missing newline.
51 {
52 m_element->ensureFallbackContent();
53 }
54
55 private:
56 HTMLElement* m_element;
57 };
58
36 HTMLImageLoader::HTMLImageLoader(Element* node) 59 HTMLImageLoader::HTMLImageLoader(Element* node)
37 : ImageLoader(node) 60 : ImageLoader(node)
38 { 61 {
39 } 62 }
40 63
41 HTMLImageLoader::~HTMLImageLoader() 64 HTMLImageLoader::~HTMLImageLoader()
42 { 65 {
43 } 66 }
44 67
45 void HTMLImageLoader::dispatchLoadEvent() 68 void HTMLImageLoader::dispatchLoadEvent()
46 { 69 {
47 WTF_LOG(Timers, "HTMLImageLoader::dispatchLoadEvent %p", this); 70 WTF_LOG(Timers, "HTMLImageLoader::dispatchLoadEvent %p", this);
48 71
49 // HTMLVideoElement uses this class to load the poster image, but it should not fire events for loading or failure. 72 // HTMLVideoElement uses this class to load the poster image, but it should not fire events for loading or failure.
50 if (isHTMLVideoElement(*element())) 73 if (isHTMLVideoElement(*element()))
51 return; 74 return;
52 75
53 bool errorOccurred = image()->errorOccurred(); 76 bool errorOccurred = image()->errorOccurred();
54 if (isHTMLObjectElement(*element()) && !errorOccurred) 77 if (isHTMLObjectElement(*element()) && !errorOccurred)
55 errorOccurred = (image()->response().httpStatusCode() >= 400); // An <ob ject> considers a 404 to be an error and should fire onerror. 78 errorOccurred = (image()->response().httpStatusCode() >= 400); // An <ob ject> considers a 404 to be an error and should fire onerror.
56 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load)); 79 element()->dispatchEvent(Event::create(errorOccurred ? EventTypeNames::error : EventTypeNames::load));
57 } 80 }
58 81
59 String HTMLImageLoader::sourceURI(const AtomicString& attr) const 82 String HTMLImageLoader::sourceURI(const AtomicString& attr) const
60 { 83 {
61 return stripLeadingAndTrailingHTMLSpaces(attr); 84 return stripLeadingAndTrailingHTMLSpaces(attr);
62 } 85 }
63 86
87 void HTMLImageLoader::noImageResourceToLoad()
88 {
89 // FIXME: Use fallback content even when there is no alt-text. The only bloc ker is the large amount of rebaselining it requires.
90 if (!toHTMLElement(element())->altText().isEmpty())
91 toHTMLElement(element())->ensureFallbackContent();
92 }
93
64 void HTMLImageLoader::notifyFinished(Resource*) 94 void HTMLImageLoader::notifyFinished(Resource*)
65 { 95 {
66 ImageResource* cachedImage = image(); 96 ImageResource* cachedImage = image();
67 97
68 RefPtrWillBeRawPtr<Element> element = this->element();
69 ImageLoader::notifyFinished(cachedImage); 98 ImageLoader::notifyFinished(cachedImage);
70 99
71 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400; 100 bool loadError = cachedImage->errorOccurred() || cachedImage->response().htt pStatusCode() >= 400;
101 if (loadError)
102 ensureFallbackContent();
103 else
104 toHTMLElement(element())->ensurePrimaryContent();
72 105
73 if (loadError && isHTMLObjectElement(*element)) 106 if (loadError && isHTMLObjectElement(element()))
74 toHTMLObjectElement(element)->renderFallbackContent(); 107 toHTMLObjectElement(element())->renderFallbackContent();
75 } 108 }
76 109
110 void HTMLImageLoader::ensureFallbackContent()
111 {
112 if (image()->url().protocolIsData()) {
113 OwnPtr<EnsureFallbackContentTask> task = EnsureFallbackContentTask::crea te(toHTMLElement(element()));
114 Microtask::enqueueMicrotask(task.release());
115 } else {
116 toHTMLElement(element())->ensureFallbackContent();
117 }
77 } 118 }
119 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698