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

Unified Diff: Source/core/html/HTMLObjectElement.cpp

Issue 1125053002: Move renderFallbackContent() into FrameOwner interface. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add comment Created 5 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLObjectElement.cpp
diff --git a/Source/core/html/HTMLObjectElement.cpp b/Source/core/html/HTMLObjectElement.cpp
index a1e4cd2d46b37567ce7c0b32cbacc90ee653355a..f5b9935c50d5f5e8a4ebdf5e384471a8d6422d33 100644
--- a/Source/core/html/HTMLObjectElement.cpp
+++ b/Source/core/html/HTMLObjectElement.cpp
@@ -360,13 +360,13 @@ void HTMLObjectElement::reattachFallbackContent()
lazyReattachIfAttached();
}
-void HTMLObjectElement::renderFallbackContent()
+bool HTMLObjectElement::renderFallbackContent()
{
- if (useFallbackContent())
- return;
-
if (!inDocument())
- return;
+ return false;
dcheng 2015/05/06 18:57:38 I moved this check because if it's not in a docume
Nate Chapin 2015/05/06 20:15:05 My guess is it's irrelevant. I'd think that any ca
+
+ if (useFallbackContent())
+ return true;
// Before we give up and use fallback content, check to see if this is a MIME type issue.
if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->status() != Resource::LoadError) {
@@ -375,7 +375,7 @@ void HTMLObjectElement::renderFallbackContent()
// If we don't think we have an image type anymore, then clear the image from the loader.
m_imageLoader->setImage(0);
reattachFallbackContent();
- return;
+ return true;
}
}
@@ -383,6 +383,7 @@ void HTMLObjectElement::renderFallbackContent()
// FIXME: Style gets recalculated which is suboptimal.
reattachFallbackContent();
+ return true;
}
bool HTMLObjectElement::isExposed() const
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698