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

Unified Diff: Source/core/html/imports/LinkImport.cpp

Issue 298413004: Remove the importedDocument functions from HTML imports classes. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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/imports/HTMLImportLoader.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/LinkImport.cpp
diff --git a/Source/core/html/imports/LinkImport.cpp b/Source/core/html/imports/LinkImport.cpp
index 9265f86f7b5183e2c62627f2900f0c6c4f84fdf5..92e01fe1eebce5c1e61b822463a5e284c2ed116b 100644
--- a/Source/core/html/imports/LinkImport.cpp
+++ b/Source/core/html/imports/LinkImport.cpp
@@ -64,7 +64,9 @@ Document* LinkImport::importedDocument() const
{
if (!m_child || !m_owner || !m_owner->inDocument())
return 0;
- return m_child->importedDocument();
+ if (m_child->loader()->hasError())
+ return 0;
+ return m_child->document();
}
void LinkImport::process()
« no previous file with comments | « Source/core/html/imports/HTMLImportLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698