| Index: Source/bindings/core/v8/ScriptController.h
|
| diff --git a/Source/bindings/core/v8/ScriptController.h b/Source/bindings/core/v8/ScriptController.h
|
| index 931275d5dcc4d264063616ee006d2bceb5ae7b8d..c16bf4bc095b12991e1630ce8d69702ca2f056cc 100644
|
| --- a/Source/bindings/core/v8/ScriptController.h
|
| +++ b/Source/bindings/core/v8/ScriptController.h
|
| @@ -82,9 +82,9 @@ public:
|
|
|
| // Evaluate JavaScript in the main world.
|
| void executeScriptInMainWorld(const String&, ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled);
|
| - void executeScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin);
|
| + void executeScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin, double* compilationFinishTime = 0);
|
| v8::Local<v8::Value> executeScriptInMainWorldAndReturnValue(const ScriptSourceCode&);
|
| - v8::Local<v8::Value> executeScriptAndReturnValue(v8::Handle<v8::Context>, const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin);
|
| + v8::Local<v8::Value> executeScriptAndReturnValue(v8::Handle<v8::Context>, const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin, double* compilationFinishTime = 0);
|
|
|
| // Executes JavaScript in an isolated world. The script gets its own global scope,
|
| // its own prototypes for intrinsic JavaScript objects (String, Array, and so-on),
|
| @@ -153,7 +153,7 @@ private:
|
| typedef HashMap<int, OwnPtr<WindowProxy> > IsolatedWorldMap;
|
| typedef HashMap<Widget*, NPObject*> PluginObjectMap;
|
|
|
| - v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy);
|
| + v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
|
|
|
| LocalFrame* m_frame;
|
| const String* m_sourceURL;
|
|
|