Remove ScriptController::namedItemAdded/Removed

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

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. 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
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 500 matching lines @@
   if (info.Holder()
           ->GetRealNamedPropertyInPrototypeChain(
               info.GetIsolate()->GetCurrentContext(), property.As<v8::String>())
           .ToLocal(&value))
     v8SetReturnValue(info, value);
 }
 
 void WindowProxy::namedItemAdded(HTMLDocument* document,
                                  const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
-
-  if (!isContextInitialized())
+  DCHECK(m_scriptState);
+  if (!m_scriptState->contextIsValid())

[Yuki, 2017/01/05 13:31:27]

Why do you want to replace !isContextInitialized() with
!m_scriptState->contextIsValid()?  They are almost the same except for the check
of m_scriptState.

We already have isContextInitialized() and isGlobalInitialized, and it's a kind
of headache.  I don't want to introduce yet another kind of check.

[haraken, 2017/01/05 23:50:26]

Reverted it back to !isContextInitialized().

I just wanted to use the contextIsValid() check because:

  if (!m_scriptState->contextIsValid()) return;
  ScriptState::Scope scope(m_scriptState.get());

is an idiom.

However, in this specific case, !m_scriptState->contextIsValid() is equivalent
to !isContextInitialized(), as you mentioned.

     return;
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
       m_world->domDataStore().get(document, m_isolate);
   // TODO(yukishiino,peria): We should check if the own property with the same
   // name already exists or not, and if it exists, we shouldn't define a new
   // accessor property (it fails).
   documentWrapper->SetAccessor(m_isolate->GetCurrentContext(),
                                v8String(m_isolate, name), getter);
 }
 
 void WindowProxy::namedItemRemoved(HTMLDocument* document,
                                    const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
-
-  if (!isContextInitialized())
+  DCHECK(m_scriptState);
+  if (!m_scriptState->contextIsValid())
     return;
-
   if (document->hasNamedItem(name) || document->hasExtraNamedItem(name))
     return;
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
       m_world->domDataStore().get(document, m_isolate);
   documentWrapper
       ->Delete(m_isolate->GetCurrentContext(), v8String(m_isolate, name))
       .ToChecked();
 }
 
 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
   if (!isContextInitialized())
     return;
   setSecurityToken(origin);
 }
 
 }  // namespace blink