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

Unified Diff: Source/core/dom/DocumentInit.cpp

Issue 19762002: [HTML Imports] Let script of imported document running. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Made a test more robust. Created 7 years, 5 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 | « LayoutTests/http/tests/htmlimports/resources/sniff-js.cgi ('k') | Source/core/dom/ScriptLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentInit.cpp
diff --git a/Source/core/dom/DocumentInit.cpp b/Source/core/dom/DocumentInit.cpp
index f6d74b297c792aa2ed76e6e3ee6788933ff2d4a5..8c508d4d27cc904ccd111e651b1aa630497dbe79 100644
--- a/Source/core/dom/DocumentInit.cpp
+++ b/Source/core/dom/DocumentInit.cpp
@@ -37,7 +37,8 @@ namespace WebCore {
bool DocumentInit::shouldSetURL() const
{
- return (m_frame && m_frame->ownerElement()) || !m_url.isEmpty();
+ Frame* frame = frameForSecurityContext();
+ return (frame && frame->ownerElement()) || !m_url.isEmpty();
}
bool DocumentInit::shouldTreatURLAsSrcdocDocument() const
« no previous file with comments | « LayoutTests/http/tests/htmlimports/resources/sniff-js.cgi ('k') | Source/core/dom/ScriptLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698