Remove ScriptController::updateDocument

third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
index cae05d3022e14a0b931354a59bba65c9aee99c69..49c41911e6d96a2f2969a55c323c1fcbd519fca2 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
@@ -209,12 +209,6 @@ void ScriptController::executeScriptInMainWorld(
                        InspectorUpdateCountersEvent::data());
 }
 
-bool ScriptController::initializeMainWorld() {
-  if (m_windowProxyManager->mainWorldProxy()->isContextInitialized())
-    return false;
-  return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized();
-}
-
 WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) {
   WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
   if (!windowProxy->isContextInitialized()) {
@@ -308,8 +302,15 @@ void ScriptController::updateDocument() {
   if (!m_windowProxyManager->mainWorldProxy()->isGlobalInitialized())
     return;
 
-  if (!initializeMainWorld())
-    windowProxy(DOMWrapperWorld::mainWorld())->updateDocument();
+  if (m_windowProxyManager->mainWorldProxy()->isContextInitialized()) {
+    m_windowProxyManager->mainWorldProxy()->updateDocument();
+    return;
+  }

[Yuki, 2017/01/05 12:10:06]

Do we really need the below code?  If so, in what scenarios?

At this point,
a) we already initialized the Window once, and
b) the Window was detached for some reason.

As we talked offline before, I think the document must NOT get updated while the
Window is detached.

+  windowProxy(DOMWrapperWorld::mainWorld());

[Yuki, 2017/01/05 12:10:06]

I know that |windowProxy(world)| initializes a WindowProxy for the given world
as needed, however, it's hard to understand from its name.  I'd like to have a
comment like below.

// |windowProxy(world)| guarantees that a WindowProxy for the given
// |world| is initialized.

It's a good idea to write a similar comment for ScriptController::windowProxy in
ScriptController.h.

+  if (!m_windowProxyManager->mainWorldProxy()->isContextInitialized()) {

[Yuki, 2017/01/05 12:10:06]

You made WindowProxy::initialize{,IfNeeded} always succeed and return void.  Why
do we need this line?  The WindowProxy must be always initialized at this point.

+    m_windowProxyManager->mainWorldProxy()->updateDocument();
+    return;
+  }
 }
 
 void ScriptController::namedItemAdded(HTMLDocument* doc,