bindings: Simplifies WindowProxyManager and its relation to Frame.

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

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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
@@ skipping 59 matching lines @@
 #include "public/platform/Platform.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/StringExtras.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/TextPosition.h"
 
 namespace blink {
 
-ScriptController::ScriptController(LocalFrame* frame)
-    : m_windowProxyManager(LocalWindowProxyManager::create(*frame)) {}
-
 DEFINE_TRACE(ScriptController) {
   visitor->trace(m_windowProxyManager);
 }
 
 void ScriptController::clearForClose() {
   m_windowProxyManager->clearForClose();
   MainThreadDebugger::instance()->didClearContextsForFrame(frame());
 }
 
 void ScriptController::updateSecurityOrigin(SecurityOrigin* securityOrigin) {
@@ skipping 60 matching lines @@
       return result;
   }
 
   TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
                        "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorUpdateCountersEvent::data());
 
   return result;
 }
 
-LocalWindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) {
-  LocalWindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
-  windowProxy->initializeIfNeeded();
-  return windowProxy;
-}
-
 bool ScriptController::shouldBypassMainWorldCSP() {
   v8::HandleScope handleScope(isolate());
   v8::Local<v8::Context> context = isolate()->GetCurrentContext();
   if (context.IsEmpty() || !toDOMWindow(context))
     return false;
   DOMWrapperWorld& world = DOMWrapperWorld::current(isolate());
   return world.isIsolatedWorld() ? world.isolatedWorldHasContentSecurityPolicy()
                                  : false;
 }
 
 TextPosition ScriptController::eventHandlerPosition() const {
   ScriptableDocumentParser* parser =
       frame()->document()->scriptableDocumentParser();
   if (parser)
     return parser->textPosition();
   return TextPosition::minimumPosition();
 }
 
 void ScriptController::enableEval() {
   v8::HandleScope handleScope(isolate());
   v8::Local<v8::Context> v8Context =
-      m_windowProxyManager->mainWorldProxy()->contextIfInitialized();
+      m_windowProxyManager->mainWorldProxyMaybeUninitialized()
+      ->contextIfInitialized();
   if (v8Context.IsEmpty())
     return;
   v8Context->AllowCodeGenerationFromStrings(true);
 }
 
 void ScriptController::disableEval(const String& errorMessage) {
   v8::HandleScope handleScope(isolate());
   v8::Local<v8::Context> v8Context =
-      m_windowProxyManager->mainWorldProxy()->contextIfInitialized();
+      m_windowProxyManager->mainWorldProxyMaybeUninitialized()
+      ->contextIfInitialized();
   if (v8Context.IsEmpty())
     return;
   v8Context->AllowCodeGenerationFromStrings(false);
   v8Context->SetErrorMessageForCodeGenerationFromStrings(
       v8String(isolate(), errorMessage));
 }
 
 PassRefPtr<SharedPersistent<v8::Object>> ScriptController::createPluginWrapper(
     Widget* widget) {
   ASSERT(widget);
@@ skipping 27 matching lines @@
 }
 
 void ScriptController::clearWindowProxy() {
   // V8 binding expects ScriptController::clearWindowProxy only be called when a
   // frame is loading a new page. This creates a new context for the new page.
   m_windowProxyManager->clearForNavigation();
   MainThreadDebugger::instance()->didClearContextsForFrame(frame());
 }
 
 void ScriptController::updateDocument() {
-  m_windowProxyManager->mainWorldProxy()->updateDocument();
+  m_windowProxyManager->mainWorldProxyMaybeUninitialized()->updateDocument();
 }
 
 bool ScriptController::executeScriptIfJavaScriptURL(const KURL& url,
                                                     Element* element) {
   if (!url.protocolIsJavaScript())
     return false;
 
   bool shouldBypassMainWorldContentSecurityPolicy =
       ContentSecurityPolicy::shouldBypassMainWorld(frame()->document());
   if (!frame()->page() ||
@@ skipping 123 matching lines @@
     for (size_t i = 0; i < resultArray->Length(); ++i) {
       v8::Local<v8::Value> value;
       if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
         return;
       results->push_back(value);
     }
   }
 }
 
 }  // namespace blink