Make ScriptController inherit LocalWindowProxyManager

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 82 matching lines @@
 }
 
 void WindowProxy::clearForClose() {
   disposeContext(DoNotDetachGlobal);
 }
 
 void WindowProxy::clearForNavigation() {
   disposeContext(DetachGlobal);
 }
 
-v8::Local<v8::Object> WindowProxy::globalIfNotDetached() {
-  if (m_lifecycle == Lifecycle::ContextInitialized) {
-    DCHECK(m_scriptState->contextIsValid());
-    DCHECK(m_globalProxy == m_scriptState->context()->Global());
-    return m_globalProxy.newLocal(m_isolate);
-  }
-  return v8::Local<v8::Object>();
+v8::Local<v8::Object> WindowProxy::globalProxy() {
+  if (m_frame->client())
+    initializeIfNeeded();
+  return m_globalProxy.newLocal(m_isolate);
 }
 
 v8::Local<v8::Object> WindowProxy::releaseGlobal() {
   DCHECK(m_lifecycle != Lifecycle::ContextInitialized);
   // Make sure the global object was detached from the proxy by calling
   // clearForNavigation().
   if (m_lifecycle == Lifecycle::ContextDetached)
     ASSERT(m_scriptState->isGlobalObjectDetached());
 
   v8::Local<v8::Object> global = m_globalProxy.newLocal(m_isolate);
   m_globalProxy.clear();
   return global;
 }
 
 void WindowProxy::setGlobal(v8::Local<v8::Object> global) {
+  DCHECK(m_lifecycle == Lifecycle::ContextUninitialized);
+
   m_globalProxy.set(m_isolate, global);
 
   // Initialize the window proxy now, to re-establish the connection between
   // the global object and the v8::Context. This is really only needed for a
   // RemoteDOMWindow, since it has no scripting environment of its own.
   // Without this, existing script references to a swapped in RemoteDOMWindow
   // would be broken until that RemoteDOMWindow was vended again through an
   // interface like window.frames.
   initializeIfNeeded();
 }
@@ skipping 102 matching lines @@
   V8DOMWrapper::setNativeInfo(m_isolate, windowProperties, wrapperTypeInfo,
                               window);
 
   // TODO(keishi): Remove installPagePopupController and implement
   // PagePopupController in another way.
   V8PagePopupControllerBinding::installPagePopupController(context,
                                                            windowWrapper);
 }
 
 }  // namespace blink