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

Unified Diff: third_party/WebKit/Source/core/dom/ScriptLoader.h

Issue 2695713015: WIP: Reland CompiledScript, prototype compiling in a separate task.
Patch Set: allow fetchFinished to finish when there is no frame Created 3 years, 10 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
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 295c12c9250ccdb07d50c8265da4b9d5066f4d3d..3e142f13bbc93c5aab70a3bc3b8febd083f645cb 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.h
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.h
@@ -71,7 +71,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 ScriptSourceCode&, CompiledScript* = nullptr);
virtual void execute();
// XML parser calls these
@@ -115,6 +115,11 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
}
void setFetchDocWrittenScriptDeferIdle();
+ static AccessControlStatus accessControlStatusForScript(
+ bool isExternalScript,
+ const ScriptResource*,
+ const SecurityOrigin* scriptElementOrigin);
+
protected:
ScriptLoader(Element*,
bool createdByParser,
@@ -129,7 +134,7 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
bool fetchScript(const String& sourceUrl,
const String& encoding,
FetchRequest::DeferOption);
- bool doExecuteScript(const ScriptSourceCode&);
+ bool doExecuteScript(const ScriptSourceCode&, CompiledScript* = nullptr);
ScriptLoaderClient* client() const;
« no previous file with comments | « third_party/WebKit/Source/core/dom/PendingScript.cpp ('k') | third_party/WebKit/Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698