WindowProxy::initialize should never return null

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 203 matching lines @@
     return false;
   return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized();
 }
 
 WindowProxy* ScriptController::existingWindowProxy(DOMWrapperWorld& world) {
   return m_windowProxyManager->existingWindowProxy(world);
 }
 
 WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) {
   WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
-  if (!windowProxy->isContextInitialized() &&
-      windowProxy->initializeIfNeeded() && world.isMainWorld())
-    frame()->loader().dispatchDidClearWindowObjectInMainWorld();
-  // FIXME: There are some situations where we can return an uninitialized
-  // context. This is broken.
+  if (!windowProxy->isContextInitialized()) {
+    windowProxy->initializeIfNeeded();
+    if (world.isMainWorld())
+      frame()->loader().dispatchDidClearWindowObjectInMainWorld();
+  }
   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()
@@ skipping 255 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