| Index: third_party/WebKit/Source/core/dom/ScriptLoader.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.h b/third_party/WebKit/Source/core/dom/ScriptLoader.h
|
| index e44200f39f222e5484b383ce9e46914b53a4a5db..48648d5ad939af07aee0afc731ec3f5c52eaf650 100644
|
| --- a/third_party/WebKit/Source/core/dom/ScriptLoader.h
|
| +++ b/third_party/WebKit/Source/core/dom/ScriptLoader.h
|
| @@ -32,9 +32,8 @@
|
|
|
| namespace blink {
|
|
|
| -class LocalFrame;
|
| class ScriptElementBase;
|
| -class ScriptSourceCode;
|
| +class Script;
|
|
|
| class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
|
| public PendingScriptClient {
|
| @@ -68,7 +67,7 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
|
|
|
| String scriptContent() const;
|
| // Returns false if and only if execution was blocked.
|
| - bool executeScript(const ScriptSourceCode&);
|
| + bool executeScript(const Script*);
|
| virtual void execute();
|
|
|
| // XML parser calls these
|
| @@ -121,12 +120,11 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
|
| private:
|
| bool ignoresLoadRequest() const;
|
| bool isScriptForEventSupported() const;
|
| - void logScriptMIMEType(LocalFrame*, ScriptResource*, const String&);
|
|
|
| bool fetchScript(const String& sourceUrl,
|
| const String& encoding,
|
| FetchRequest::DeferOption);
|
| - bool doExecuteScript(const ScriptSourceCode&);
|
| + bool doExecuteScript(const Script*);
|
|
|
| // Clears the connection to the PendingScript.
|
| void detachPendingScript();
|
|
|