Rename V8WindowShell to WindowProxy

Source/bindings/core/v8/ScriptController.cpp

Index: Source/bindings/core/v8/ScriptController.cpp
diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp
index 83dfcdd7ee3be6f57892502e3ddd8b8ba9431aac..5f176b4bb02895279e26be4695eff2ed45d3f557 100644
--- a/Source/bindings/core/v8/ScriptController.cpp
+++ b/Source/bindings/core/v8/ScriptController.cpp
@@ -46,7 +46,7 @@
 #include "bindings/core/v8/V8PerContextData.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/V8Window.h"
-#include "bindings/core/v8/V8WindowShell.h"
+#include "bindings/core/v8/WindowProxy.h"
 #include "bindings/core/v8/npruntime_impl.h"
 #include "bindings/core/v8/npruntime_priv.h"
 #include "core/dom/Document.h"
@@ -94,14 +94,14 @@ ScriptController::ScriptController(LocalFrame* frame)
     : m_frame(frame)
     , m_sourceURL(0)
     , m_isolate(v8::Isolate::GetCurrent())
-    , m_windowShell(V8WindowShell::create(frame, DOMWrapperWorld::mainWorld(), m_isolate))
+    , m_windowShell(WindowProxy::create(frame, DOMWrapperWorld::mainWorld(), m_isolate))
     , m_windowScriptNPObject(0)
 {
 }
 
 ScriptController::~ScriptController()
 {
-    // V8WindowShell::clearForClose() must be invoked before destruction starts.
+    // WindowProxy::clearForClose() must be invoked before destruction starts.
     ASSERT(!m_windowShell->isContextInitialized());
 }
 
@@ -207,7 +207,7 @@ bool ScriptController::initializeMainWorld()
     return windowShell(DOMWrapperWorld::mainWorld())->isContextInitialized();
 }
 
-V8WindowShell* ScriptController::existingWindowShell(DOMWrapperWorld& world)
+WindowProxy* ScriptController::existingWindowShell(DOMWrapperWorld& world)
 {
     if (world.isMainWorld())
         return m_windowShell->isContextInitialized() ? m_windowShell.get() : 0;
@@ -218,9 +218,9 @@ V8WindowShell* ScriptController::existingWindowShell(DOMWrapperWorld& world)
     return iter->value->isContextInitialized() ? iter->value.get() : 0;
 }
 
-V8WindowShell* ScriptController::windowShell(DOMWrapperWorld& world)
+WindowProxy* ScriptController::windowShell(DOMWrapperWorld& world)
 {
-    V8WindowShell* shell = 0;
+    WindowProxy* shell = 0;
     if (world.isMainWorld()) {
         shell = m_windowShell.get();
     } else {
@@ -228,7 +228,7 @@ V8WindowShell* ScriptController::windowShell(DOMWrapperWorld& world)
         if (iter != m_isolatedWorlds.end()) {
             shell = iter->value.get();
         } else {
-            OwnPtr<V8WindowShell> isolatedWorldShell = V8WindowShell::create(m_frame, world, m_isolate);
+            OwnPtr<WindowProxy> isolatedWorldShell = WindowProxy::create(m_frame, world, m_isolate);
             shell = isolatedWorldShell.get();
             m_isolatedWorlds.set(world.worldId(), isolatedWorldShell.release());
         }
@@ -436,7 +436,7 @@ void ScriptController::setCaptureCallStackForUncaughtExceptions(bool value)
 void ScriptController::collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*> >& result)
 {
     for (IsolatedWorldMap::iterator it = m_isolatedWorlds.begin(); it != m_isolatedWorlds.end(); ++it) {
-        V8WindowShell* isolatedWorldShell = it->value.get();
+        WindowProxy* isolatedWorldShell = it->value.get();
         SecurityOrigin* origin = isolatedWorldShell->world().isolatedWorldSecurityOrigin();
         if (!origin)
             continue;
@@ -450,7 +450,7 @@ void ScriptController::setWorldDebugId(int worldId, int debuggerId)
 {
     ASSERT(debuggerId > 0);
     bool isMainWorld = worldId == MainWorldId;
-    V8WindowShell* shell = 0;
+    WindowProxy* shell = 0;
     if (isMainWorld) {
         shell = m_windowShell.get();
     } else {
@@ -619,7 +619,7 @@ void ScriptController::executeScriptInIsolatedWorld(int worldID, const Vector<Sc
     ASSERT(worldID > 0);
 
     RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(worldID, extensionGroup);
-    V8WindowShell* isolatedWorldShell = windowShell(*world);
+    WindowProxy* isolatedWorldShell = windowShell(*world);
     if (!isolatedWorldShell->isContextInitialized())
         return;