Chromium Code Reviews| Index: Source/core/dom/ScriptLoader.h |
| diff --git a/Source/core/dom/ScriptLoader.h b/Source/core/dom/ScriptLoader.h |
| index 0fa6d52ce9a7970a2937952072177b6fe40f4c69..d657e8316354301cbf3f07a7931d83d635b2c64b 100644 |
| --- a/Source/core/dom/ScriptLoader.h |
| +++ b/Source/core/dom/ScriptLoader.h |
| @@ -21,6 +21,7 @@ |
| #ifndef ScriptLoader_h |
| #define ScriptLoader_h |
| +#include "core/dom/PendingScript.h" |
| #include "core/fetch/FetchRequest.h" |
| #include "core/fetch/ResourceClient.h" |
| #include "core/fetch/ResourcePtr.h" |
| @@ -48,7 +49,7 @@ public: |
| String scriptCharset() const { return m_characterEncoding; } |
| String scriptContent() const; |
| void executeScript(const ScriptSourceCode&, double* compilationFinishTime = 0); |
| - void execute(ScriptResource*); |
| + void execute(); |
| // XML parser calls these |
| void dispatchLoadEvent(); |
| @@ -72,6 +73,8 @@ public: |
| void handleSourceAttribute(const String& sourceUrl); |
| void handleAsyncAttribute(); |
| + bool isReady() const { return m_pendingScript.isReady(); } |
| + |
| private: |
| ScriptLoader(Element*, bool createdByParser, bool isEvaluated); |
| @@ -79,7 +82,6 @@ private: |
| bool isScriptForEventSupported() const; |
| bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption); |
| - void stopLoadRequest(); |
| ScriptLoaderClient* client() const; |
| @@ -101,6 +103,8 @@ private: |
| bool m_willExecuteInOrder : 1; |
| String m_characterEncoding; |
| String m_fallbackCharacterEncoding; |
| + |
| + PendingScript m_pendingScript; |
|
sof
2014/10/17 10:23:17
This is a problem; PendingScript has traceable Mem
|
| }; |
| ScriptLoader* toScriptLoaderIfPossible(Element*); |