Rename V8WindowShell to WindowProxy

Rename V8WindowShell to WindowProxy

V8WindowShell is an implementation of "WindowProxy" in the spec
(http://www.w3.org/TR/2009/WD-html5-20090423/browsers.html#windowproxy).
We should rename it accordingly.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=180146

[haraken, 2014-08-11 02:18:27]

PTAL

[jochen (gone - plz use gerrit), 2014-08-11 14:27:31]

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Page...
File Source/bindings/core/v8/PageScriptDebugServer.cpp (right):

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Page...
Source/bindings/core/v8/PageScriptDebugServer.cpp:129: WindowProxy* shell =
scriptController.existingWindowShell(DOMWrapperWorld::mainWorld());
WindowProxy* existingWindowShell() looks odd. We should probably replace window
shell everywhere then?

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Scri...
File Source/bindings/core/v8/ScriptController.h (right):

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Scri...
Source/bindings/core/v8/ScriptController.h:162: OwnPtr<WindowProxy>
m_windowShell;
same here

[haraken, 2014-08-12 01:09:57]

PTAL

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Page...
File Source/bindings/core/v8/PageScriptDebugServer.cpp (right):

https://codereview.chromium.org/451013003/diff/1/Source/bindings/core/v8/Page...
Source/bindings/core/v8/PageScriptDebugServer.cpp:129: WindowProxy* shell =
scriptController.existingWindowShell(DOMWrapperWorld::mainWorld());
On 2014/08/11 14:27:31, jochen (slow - soon OOO) wrote:
> WindowProxy* existingWindowShell() looks odd. We should probably replace
window
> shell everywhere then?

Done.

[jochen (gone - plz use gerrit), 2014-08-12 14:56:26]

lgtm

[haraken, 2014-08-12 15:48:32]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-12 15:49:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/451013003/40001

[commit-bot: I haz the power, 2014-08-12 15:49:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-12 15:49:43]

Failed to apply patch for Source/bindings/core/v8/ScriptController.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/core/v8/ScriptController.cpp
  Hunk #8 FAILED at 416.
  Hunk #9 succeeded at 439 (offset 3 lines).
  Hunk #10 succeeded at 453 (offset 3 lines).
  Hunk #11 succeeded at 472 (offset 3 lines).
  Hunk #12 succeeded at 622 (offset 3 lines).
  1 out of 12 hunks FAILED -- saving rejects to file
Source/bindings/core/v8/ScriptController.cpp.rej

Patch:       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..89ef87446f8624d4d2dbd42f224b456e49cc9ac5
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,15 +94,15 @@ 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_windowProxy(WindowProxy::create(frame, DOMWrapperWorld::mainWorld(),
m_isolate))
     , m_windowScriptNPObject(0)
 {
 }
 
 ScriptController::~ScriptController()
 {
-    // V8WindowShell::clearForClose() must be invoked before destruction
starts.
-    ASSERT(!m_windowShell->isContextInitialized());
+    // WindowProxy::clearForClose() must be invoked before destruction starts.
+    ASSERT(!m_windowProxy->isContextInitialized());
 }
 
 void ScriptController::clearScriptObjects()
@@ -128,7 +128,7 @@ void ScriptController::clearScriptObjects()
 void ScriptController::clearForClose()
 {
     double start = currentTime();
-    m_windowShell->clearForClose();
+    m_windowProxy->clearForClose();
     for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin(); iter !=
m_isolatedWorlds.end(); ++iter)
         iter->value->clearForClose();
    
blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearForClose",
(currentTime() - start) * 1000, 0, 10000, 50);
@@ -136,7 +136,7 @@ void ScriptController::clearForClose()
 
 void ScriptController::updateSecurityOrigin(SecurityOrigin* origin)
 {
-    m_windowShell->updateSecurityOrigin(origin);
+    m_windowProxy->updateSecurityOrigin(origin);
 }
 
 v8::Local<v8::Value> ScriptController::callFunction(v8::Handle<v8::Function>
function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value>
info[])
@@ -202,15 +202,15 @@ v8::Local<v8::Value>
ScriptController::executeScriptAndReturnValue(v8::Handle<v8
 
 bool ScriptController::initializeMainWorld()
 {
-    if (m_windowShell->isContextInitialized())
+    if (m_windowProxy->isContextInitialized())
         return false;
-    return windowShell(DOMWrapperWorld::mainWorld())->isContextInitialized();
+    return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized();
 }
 
-V8WindowShell* ScriptController::existingWindowShell(DOMWrapperWorld& world)
+WindowProxy* ScriptController::existingWindowProxy(DOMWrapperWorld& world)
 {
     if (world.isMainWorld())
-        return m_windowShell->isContextInitialized() ? m_windowShell.get() : 0;
+        return m_windowProxy->isContextInitialized() ? m_windowProxy.get() : 0;
 
     IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId());
     if (iter == m_isolatedWorlds.end())
@@ -218,17 +218,17 @@ V8WindowShell*
ScriptController::existingWindowShell(DOMWrapperWorld& world)
     return iter->value->isContextInitialized() ? iter->value.get() : 0;
 }
 
-V8WindowShell* ScriptController::windowShell(DOMWrapperWorld& world)
+WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world)
 {
-    V8WindowShell* shell = 0;
+    WindowProxy* shell = 0;
     if (world.isMainWorld()) {
-        shell = m_windowShell.get();
+        shell = m_windowProxy.get();
     } else {
         IsolatedWorldMap::iterator iter =
m_isolatedWorlds.find(world.worldId());
         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());
         }
@@ -271,18 +271,18 @@ void ScriptController::bindToWindowObject(LocalFrame*
frame, const String& key,
 
 void ScriptController::enableEval()
 {
-    if (!m_windowShell->isContextInitialized())
+    if (!m_windowProxy->isContextInitialized())
         return;
     v8::HandleScope handleScope(m_isolate);
-    m_windowShell->context()->AllowCodeGenerationFromStrings(true);
+    m_windowProxy->context()->AllowCodeGenerationFromStrings(true);
 }
 
 void ScriptController::disableEval(const String& errorMessage)
 {
-    if (!m_windowShell->isContextInitialized())
+    if (!m_windowProxy->isContextInitialized())
         return;
     v8::HandleScope handleScope(m_isolate);
-    v8::Local<v8::Context> v8Context = m_windowShell->context();
+    v8::Local<v8::Context> v8Context = m_windowProxy->context();
     v8Context->AllowCodeGenerationFromStrings(false);
     v8Context->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isolate,
errorMessage));
 }
@@ -416,16 +416,16 @@ NPObject*
ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement
     return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(v8plugin),
window, scriptState->isolate());
 }
 
-void ScriptController::clearWindowShell()
+void ScriptController::clearWindowProxy()
 {
     double start = currentTime();
-    // V8 binding expects ScriptController::clearWindowShell only be called
+    // V8 binding expects ScriptController::clearWindowProxy only be called
     // when a frame is loading a new page. This creates a new context for the
new page.
     clearScriptObjects();
-    m_windowShell->clearForNavigation();
+    m_windowProxy->clearForNavigation();
     for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin(); iter !=
m_isolatedWorlds.end(); ++iter)
         iter->value->clearForNavigation();
-   
blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowShell",
(currentTime() - start) * 1000, 0, 10000, 50);
+   
blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowProxy",
(currentTime() - start) * 1000, 0, 10000, 50);
 }
 
 void ScriptController::setCaptureCallStackForUncaughtExceptions(bool value)
@@ -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,9 +450,9 @@ 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();
+        shell = m_windowProxy.get();
     } else {
         IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(worldId);
         if (iter != m_isolatedWorlds.end())
@@ -469,21 +469,21 @@ void ScriptController::setWorldDebugId(int worldId, int
debuggerId)
 void ScriptController::updateDocument()
 {
     // For an uninitialized main window shell, do not incur the cost of context
initialization.
-    if (!m_windowShell->isGlobalInitialized())
+    if (!m_windowProxy->isGlobalInitialized())
         return;
 
     if (!initializeMainWorld())
-        windowShell(DOMWrapperWorld::mainWorld())->updateDocument();
+        windowProxy(DOMWrapperWorld::mainWorld())->updateDocument();
 }
 
 void ScriptController::namedItemAdded(HTMLDocument* doc, const AtomicString&
name)
 {
-    windowShell(DOMWrapperWorld::mainWorld())->namedItemAdded(doc, name);
+    windowProxy(DOMWrapperWorld::mainWorld())->namedItemAdded(doc, name);
 }
 
 void ScriptController::namedItemRemoved(HTMLDocument* doc, const AtomicString&
name)
 {
-    windowShell(DOMWrapperWorld::mainWorld())->namedItemRemoved(doc, name);
+    windowProxy(DOMWrapperWorld::mainWorld())->namedItemRemoved(doc, name);
 }
 
 static bool isInPrivateScriptIsolateWorld(v8::Isolate* isolate)
@@ -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 = windowProxy(*world);
     if (!isolatedWorldShell->isContextInitialized())
         return;

[haraken, 2014-08-13 00:56:34]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-13 00:59:28]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/451013003/60001

[commit-bot: I haz the power, 2014-08-13 01:30:35]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/android_blink_compile_db...)
  android_blink_compile_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/android_blink_compile_re...)
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/2...)
  linux_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/2...)
  linux_chromium_gn_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_chromium_gn_rel/bu...)
  mac_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_compile_dbg/bu...)
  mac_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/19555)
  win_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_compile_dbg/bu...)
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/22433)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/40865)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/46092)

[commit-bot: I haz the power, 2014-08-13 01:32:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-13 01:32:56]

Try jobs failed on following builders:
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/40877)

[haraken, 2014-08-13 01:33:47]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-13 01:35:08]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/451013003/60001

[commit-bot: I haz the power, 2014-08-13 01:59:29]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/android_blink_compile_db...)
  android_blink_compile_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/android_blink_compile_re...)
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/2...)
  linux_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/2...)
  linux_chromium_gn_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_chromium_gn_rel/bu...)
  mac_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_compile_dbg/bu...)
  mac_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/19561)
  win_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_compile_dbg/bu...)
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/22435)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/40881)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/46104)

[commit-bot: I haz the power, 2014-08-13 02:04:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-13 02:04:41]

Try jobs failed on following builders:
  mac_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/19563)

[haraken, 2014-08-13 05:26:14]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-13 05:26:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/451013003/80001

[commit-bot: I haz the power, 2014-08-13 06:51:10]

Change committed as 180146