Remove ScriptController::updateDocument

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

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 191 matching lines @@
           V8ScriptRunner::runCompiledScript(
               isolate(), compiledScript.script(isolate()), frame()->document()),
           result, tryCatch))
     return;
 
   TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
                        "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data",
                        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()) {
     windowProxy->initializeIfNeeded();
     if (world.isMainWorld())
       frame()->loader().dispatchDidClearWindowObjectInMainWorld();
   }
   return windowProxy;
 }
 
@@ skipping 73 matching lines @@
   m_windowProxyManager->clearForNavigation();
   MainThreadDebugger::instance()->didClearContextsForFrame(frame());
 }
 
 void ScriptController::updateDocument() {
   // For an uninitialized main window windowProxy, do not incur the cost of
   // context initialization.
   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,
                                       const AtomicString& name) {
   windowProxy(DOMWrapperWorld::mainWorld())->namedItemAdded(doc, name);
 }
 
 void ScriptController::namedItemRemoved(HTMLDocument* doc,
                                         const AtomicString& name) {
   windowProxy(DOMWrapperWorld::mainWorld())->namedItemRemoved(doc, name);
@@ skipping 166 matching lines @@
     for (size_t i = 0; i < resultArray->Length(); ++i) {
       v8::Local<v8::Value> value;
       if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
         return;
       results->push_back(value);
     }
   }
 }
 
 }  // namespace blink