Remove WindowProxy::isGlobalInitialized(). (DO NOT COMMIT YET)

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 80 matching lines @@
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
+#include "bindings/core/v8/WindowProxy.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/IconURL.h"
 #include "core/dom/MessagePort.h"
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/SuspendableTask.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
@@ skipping 729 matching lines @@
   v8::Local<v8::Value> result;
   if (!V8ScriptRunner::callFunction(
            function, frame()->document(), receiver, argc,
            static_cast<v8::Local<v8::Value>*>(argv), toIsolate(frame()))
            .ToLocal(&result))
     return v8::Local<v8::Value>();
   return result;
 }
 
 v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const {
-  ScriptState* scriptState = ScriptState::forMainWorld(frame());
-  DCHECK(scriptState);
-  return scriptState->context();
+  WindowProxy* windowProxy = frame()->getWindowProxyManager()->mainWorldProxy();
+  windowProxy->initializeIfNeeded();
+  return windowProxy->getScriptState()->context();
 }
 
 bool WebFrame::scriptCanAccess(WebFrame* target) {
   return BindingSecurity::shouldAllowAccessToFrame(
       currentDOMWindow(mainThreadIsolate()), target->toImplBase()->frame(),
       BindingSecurity::ErrorReportOption::DoNotReport);
 }
 
 void WebLocalFrameImpl::reload(WebFrameLoadType loadType) {
   // TODO(clamy): Remove this function once RenderFrame calls load for all
@@ skipping 1476 matching lines @@
     feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
   } else if (metric == "wasAlternateProtocolAvailable") {
     feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
   } else if (metric == "connectionInfo") {
     feature = UseCounter::ChromeLoadTimesConnectionInfo;
   }
   UseCounter::count(frame(), feature);
 }
 
 }  // namespace blink