Remove ScriptController::namedItemAdded/Removed

They are unnecessary indirection to WindowProxy::namedItemAdded/Removed.

Also this CL updates a dcheck in WindowProxy::namedItemAdded/Removed to verify
that those methods are called after the window proxy is initialized.

(The check will be replaced with a better lifecycle model in a follow-up CL.)

BUG=677253

Review-Url: https://codereview.chromium.org/2616903002
Cr-Commit-Position: refs/heads/master@{#441803}

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

@@ -312,16 +312,6 @@ void ScriptController::updateDocument() {
     windowProxy(DOMWrapperWorld::mainWorld())->updateDocument();
 }
 
-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);
-}
-
 bool ScriptController::canExecuteScripts(
     ReasonForCallingCanExecuteScripts reason) {
 

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

@@ -49,7 +49,6 @@ namespace blink {
 class CompiledScript;
 class DOMWrapperWorld;
 class Element;
-class HTMLDocument;
 class KURL;
 class ScriptSourceCode;
 class SecurityOrigin;
@@ -136,9 +135,6 @@ class CORE_EXPORT ScriptController final
   void clearWindowProxy();
   void updateDocument();
 
-  void namedItemAdded(HTMLDocument*, const AtomicString&);
-  void namedItemRemoved(HTMLDocument*, const AtomicString&);
-
   void updateSecurityOrigin(SecurityOrigin*);
 
   void clearForClose();

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

@@ -518,7 +518,7 @@ static void getter(v8::Local<v8::Name> property,
 void WindowProxy::namedItemAdded(HTMLDocument* document,
                                  const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
-
+  DCHECK(m_scriptState);
   if (!isContextInitialized())
     return;
 
@@ -535,10 +535,9 @@ void WindowProxy::namedItemAdded(HTMLDocument* document,
 void WindowProxy::namedItemRemoved(HTMLDocument* document,
                                    const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
-
+  DCHECK(m_scriptState);
   if (!isContextInitialized())
     return;
-
   if (document->hasNamedItem(name) || document->hasExtraNamedItem(name))
     return;
 

third_party/WebKit/Source/core/html/HTMLDocument.cpp

@@ -54,6 +54,7 @@
 #include "core/html/HTMLDocument.h"
 
 #include "bindings/core/v8/ScriptController.h"
+#include "bindings/core/v8/WindowProxy.h"
 #include "core/HTMLNames.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBodyElement.h"
@@ -152,8 +153,11 @@ void HTMLDocument::addItemToMap(HashCountedSet<AtomicString>& map,
   if (name.isEmpty())
     return;
   map.add(name);
-  if (LocalFrame* f = frame())
-    f->script().namedItemAdded(this, name);
+  if (LocalFrame* f = frame()) {
+    f->script()
+        .windowProxy(DOMWrapperWorld::mainWorld())
+        ->namedItemAdded(this, name);
+  }
 }
 
 void HTMLDocument::removeItemFromMap(HashCountedSet<AtomicString>& map,
@@ -161,8 +165,11 @@ void HTMLDocument::removeItemFromMap(HashCountedSet<AtomicString>& map,
   if (name.isEmpty())
     return;
   map.remove(name);
-  if (LocalFrame* f = frame())
-    f->script().namedItemRemoved(this, name);
+  if (LocalFrame* f = frame()) {
+    f->script()
+        .windowProxy(DOMWrapperWorld::mainWorld())
+        ->namedItemRemoved(this, name);
+  }
 }
 
 void HTMLDocument::addNamedItem(const AtomicString& name) {