Revert of Inline Document::allowExecutingScripts logic

third_party/WebKit/Source/core/dom/ScriptLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 218 matching lines @@
   if (!isScriptTypeSupported(supportLegacyTypes))
     return false;
 
   if (wasParserInserted) {
     m_parserInserted = true;
     m_forceAsync = false;
   }
 
   m_alreadyStarted = true;
 
-  // FIXME: Eventually we'd like to evaluate scripts which are inserted into a
-  // viewless document but this'll do for now.
-  // See http://bugs.webkit.org/show_bug.cgi?id=5727
   // FIXME: If script is parser inserted, verify it's still in the original
   // document.
   Document& elementDocument = m_element->document();
-  // TODO(kouhei): Remove the following check which doesn't make any sense.
-  if (!elementDocument.executingFrame())
+  Document* contextDocument = elementDocument.contextDocument();
+
+  if (!contextDocument || !contextDocument->allowExecutingScripts(m_element))
     return false;
 
-  Document* contextDocument = elementDocument.contextDocument();
-  if (!contextDocument)
-    return false;
-
-  LocalFrame* contextFrame = contextDocument->executingFrame();
-  if (!contextFrame)
-    return false;
-  if (!contextFrame->script().canExecuteScripts(AboutToExecuteScript))
-    return false;
-
-  LocalFrame* elementFrame = elementDocument.frame();
-
   if (!isScriptForEventSupported())
     return false;
 
   if (!client->charsetAttributeValue().isEmpty())
     m_characterEncoding = client->charsetAttributeValue();
   else
     m_characterEncoding = elementDocument.characterSet();
 
   if (client->hasSourceAttribute()) {
     FetchRequest::DeferOption defer = FetchRequest::NoDefer;
@@ skipping 32 matching lines @@
              !m_forceAsync) {
     m_pendingScript = PendingScript::create(m_element, m_resource.get());
     m_asyncExecType = ScriptRunner::InOrder;
     contextDocument->scriptRunner()->queueScriptForExecution(this,
                                                              m_asyncExecType);
     // Note that watchForLoad can immediately call pendingScriptFinished.
     m_pendingScript->watchForLoad(this);
   } else if (client->hasSourceAttribute()) {
     m_pendingScript = PendingScript::create(m_element, m_resource.get());
     m_asyncExecType = ScriptRunner::Async;
-    if (elementFrame) {
-      // TODO(kouhei): I'm not sure below is correct. I think we should use
-      // contextFrame rather than elementFrame.
-      ScriptState* scriptState = ScriptState::forMainWorld(elementFrame);
-      if (scriptState) {
+    LocalFrame* frame = m_element->document().frame();
+    if (frame) {
+      ScriptState* scriptState = ScriptState::forMainWorld(frame);
+      if (scriptState)
         ScriptStreamer::startStreaming(
-            m_pendingScript.get(), ScriptStreamer::Async,
-            elementFrame->settings(), scriptState,
-            elementFrame->frameScheduler()->loadingTaskRunner());
-      }
+            m_pendingScript.get(), ScriptStreamer::Async, frame->settings(),
+            scriptState, frame->frameScheduler()->loadingTaskRunner());
     }
     contextDocument->scriptRunner()->queueScriptForExecution(this,
                                                              m_asyncExecType);
     // Note that watchForLoad can immediately call pendingScriptFinished.
     m_pendingScript->watchForLoad(this);
   } else {
     // Reset line numbering for nested writes.
     TextPosition position = elementDocument.isInDocumentWrite()
                                 ? TextPosition()
                                 : scriptStartPosition;
@@ skipping 333 matching lines @@
   if (isHTMLScriptLoader(element))
     return toHTMLScriptElement(element)->loader();
 
   if (isSVGScriptLoader(element))
     return toSVGScriptElement(element)->loader();
 
   return 0;
 }
 
 }  // namespace blink