Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.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 286 matching lines @@
               info.GetIsolate()->GetCurrentContext(), property.As<v8::String>())
           .ToLocal(&value))
     v8SetReturnValue(info, value);
 }
 
 void LocalWindowProxy::namedItemAdded(HTMLDocument* document,
                                       const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
 
   // Context must be initialized before this point.
-  DCHECK(m_lifecycle >= Lifecycle::ContextInitialized);
-  // TODO(yukishiino): Is it okay to not update named properties
-  // after the context gets detached?
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    return;
+  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
       m_world->domDataStore().get(document, 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(isolate()->GetCurrentContext(),
                                v8String(isolate(), name), getter);
 }
 
 void LocalWindowProxy::namedItemRemoved(HTMLDocument* document,
                                         const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
 
-  // Context must be initialized before this point.
-  DCHECK(m_lifecycle >= Lifecycle::ContextInitialized);
-  // TODO(yukishiino): Is it okay to not update named properties
-  // after the context gets detached?
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    return;
+  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
 
   if (document->hasNamedItem(name) || document->hasExtraNamedItem(name))
     return;
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
       m_world->domDataStore().get(document, isolate());
   documentWrapper
       ->Delete(isolate()->GetCurrentContext(), v8String(isolate(), name))
       .ToChecked();
 }
@@ skipping 10 matching lines @@
 
   setSecurityToken(origin);
 }
 
 LocalWindowProxy::LocalWindowProxy(v8::Isolate* isolate,
                                    LocalFrame& frame,
                                    RefPtr<DOMWrapperWorld> world)
     : WindowProxy(isolate, frame, std::move(world)) {}
 
 }  // namespace blink