De-Element ScriptLoader

third_party/WebKit/Source/core/dom/Document.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 135 matching lines @@
 class Page;
 class ProcessingInstruction;
 class PropertyRegistry;
 class QualifiedName;
 class Range;
 class ResizeObserverController;
 class ResourceFetcher;
 class RootScrollerController;
 class SVGDocumentExtensions;
 class SVGUseElement;
+class ScriptLoaderClient;
 class ScriptRunner;
 class ScriptableDocumentParser;
 class ScriptedAnimationController;
 class ScriptedIdleTaskController;
 class Scrollbar;
 class SecurityOrigin;
 class SegmentedString;
 class SelectorQueryCache;
 class SerializedScriptValue;
 class Settings;
@@ skipping 760 matching lines @@
   bool inDesignMode() const { return m_designMode; }
   String designMode() const;
   void setDesignMode(const String&);
 
   Document* parentDocument() const;
   Document& topDocument() const;
   Document* contextDocument();
 
   ScriptRunner* scriptRunner() { return m_scriptRunner.get(); }
 
-  Element* currentScript() const {
-    return !m_currentScriptStack.isEmpty() ? m_currentScriptStack.back().get()
-                                           : nullptr;
-  }
   void currentScriptForBinding(HTMLScriptElementOrSVGScriptElement&) const;
-  void pushCurrentScript(Element*);
-  void popCurrentScript();
+  void pushCurrentScript(ScriptLoaderClient*);
+  void popCurrentScript(ScriptLoaderClient*);
 
   void setTransformSource(std::unique_ptr<TransformSource>);
   TransformSource* transformSource() const { return m_transformSource.get(); }
 
   void incDOMTreeVersion() {
     DCHECK(m_lifecycle.stateAllowsTreeMutations());
     m_domTreeVersion = ++s_globalTreeVersion;
   }
   uint64_t domTreeVersion() const { return m_domTreeVersion; }
 
@@ skipping 68 matching lines @@
   SVGDocumentExtensions& accessSVGExtensions();
 
   void initContentSecurityPolicy(ContentSecurityPolicy* = nullptr);
 
   bool isSecureTransitionTo(const KURL&) const;
 
   bool allowInlineEventHandler(Node*,
                                EventListener*,
                                const String& contextURL,
                                const WTF::OrdinalNumber& contextLine);
-  bool allowExecutingScripts(Node*);
+  bool allowExecutingScripts(Document*);

[hiroshige, 2017/03/01 00:58:14]

Document::allowExecutingScripts(Document*) looks unclear what it does (e.g. two
Documents are involved, what are the two Documents?), so adding a comment might
be helpful.
(Actually I'm still not sure even after I read the implementation of
allowExecutingScripts() though...what does it intend to do?)

[Nate Chapin, 2017/03/01 21:34:59]

It appears to do 2 things: (1) check that both elementDocument and
contextDocument are attached, (2) check canExecuteScripts() for the
contextDocument. Given that ScriptLoader is the sole caller, I've inlined these
checks to hopefully make them a little clearer.

 
   void enforceSandboxFlags(SandboxFlags mask) override;
 
   void statePopped(PassRefPtr<SerializedScriptValue>);
 
   enum LoadEventProgress {
     LoadEventNotRun,
     LoadEventInProgress,
     LoadEventCompleted,
     BeforeUnloadEventInProgress,
@@ skipping 503 matching lines @@
   TaskRunnerTimer<Document> m_updateFocusAppearanceTimer;
 
   Member<Element> m_cssTarget;
 
   LoadEventProgress m_loadEventProgress;
 
   double m_startTime;
 
   Member<ScriptRunner> m_scriptRunner;
 
-  HeapVector<Member<Element>> m_currentScriptStack;
+  HeapVector<Member<ScriptLoaderClient>> m_currentScriptStack;
 
   std::unique_ptr<TransformSource> m_transformSource;
 
   String m_xmlEncoding;
   String m_xmlVersion;
   unsigned m_xmlStandalone : 2;
   unsigned m_hasXMLDeclaration : 1;
 
   AtomicString m_contentLanguage;
 
@@ skipping 162 matching lines @@
 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 CORE_EXPORT void showLiveDocumentInstances();
 #endif
 
 #endif  // Document_h