Index: Source/bindings/core/v8/ScriptController.h |
diff --git a/Source/bindings/core/v8/ScriptController.h b/Source/bindings/core/v8/ScriptController.h |
index ddae150b67f23197585b5c07734335ecc31ba51d..3a7f98cc46f5ba649bf8ff93ad289ed8b84212c3 100644 |
--- a/Source/bindings/core/v8/ScriptController.h |
+++ b/Source/bindings/core/v8/ScriptController.h |
@@ -56,7 +56,7 @@ class LocalFrame; |
class ScriptState; |
class ScriptSourceCode; |
class SecurityOrigin; |
-class V8WindowShell; |
+class WindowProxy; |
class Widget; |
typedef WTF::Vector<v8::Extension*> V8Extensions; |
@@ -77,8 +77,8 @@ public: |
~ScriptController(); |
bool initializeMainWorld(); |
- V8WindowShell* windowShell(DOMWrapperWorld&); |
- V8WindowShell* existingWindowShell(DOMWrapperWorld&); |
+ WindowProxy* windowShell(DOMWrapperWorld&); |
+ WindowProxy* existingWindowShell(DOMWrapperWorld&); |
// Evaluate JavaScript in the main world. |
void executeScriptInMainWorld(const String&, ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled); |
@@ -150,7 +150,7 @@ public: |
v8::Isolate* isolate() const { return m_isolate; } |
private: |
- typedef HashMap<int, OwnPtr<V8WindowShell> > IsolatedWorldMap; |
+ typedef HashMap<int, OwnPtr<WindowProxy> > IsolatedWorldMap; |
typedef HashMap<Widget*, NPObject*> PluginObjectMap; |
v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy); |
@@ -159,7 +159,7 @@ private: |
const String* m_sourceURL; |
v8::Isolate* m_isolate; |
- OwnPtr<V8WindowShell> m_windowShell; |
+ OwnPtr<WindowProxy> m_windowShell; |
jochen (gone - plz use gerrit)
2014/08/11 14:27:31
same here
|
IsolatedWorldMap m_isolatedWorlds; |
// A mapping between Widgets and their corresponding script object. |