Move Location to DOMWindow

Source/core/frame/RemoteFrame.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/frame/RemoteFrame.h"
 
+#include "bindings/core/v8/WindowProxy.h"
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/frame/RemoteDOMWindow.h"
 #include "core/frame/RemoteFrameClient.h"
 #include "core/frame/RemoteFrameView.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "platform/weborigin/SecurityPolicy.h"
 
 namespace blink {
 
@@ skipping 23 matching lines @@
     Frame::trace(visitor);
 }
 
 DOMWindow* RemoteFrame::domWindow() const
 {
     return m_domWindow.get();
 }
 
 WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world)
 {
-    return m_windowProxyManager->windowProxy(world);
+    WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
+    if (windowProxy)
+        windowProxy->initializeIfNeeded();
+    return windowProxy;
 }
 
 void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool lockBackForwardList)
 {
     // The process where this frame actually lives won't have sufficient information to determine
     // correct referrer, since it won't have access to the originDocument. Set it now.
     ResourceRequest request(url);
     request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.referrerPolicy(), url, originDocument.outgoingReferrer()));
     remoteFrameClient()->navigate(request, lockBackForwardList);
 }
 
 void RemoteFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRedirectPolicy)
 {
     remoteFrameClient()->reload(reloadPolicy, clientRedirectPolicy);
 }
 
 void RemoteFrame::detach()
 {
     detachChildren();
     if (!client())
         return;
     m_windowProxyManager->clearForClose();
+    m_domWindow->resetLocation();

[dcheng, 2015/02/09 23:29:58]

Hmm... is this something we could get away with doing in Frame::detach?

Right now, it looks like we have to call resetLocation() in three separate
locations, which doesn't seem ideal.

[Nate Chapin, 2015/02/10 19:45:27]

Done.

     Frame::detach();
 }
 
 RemoteSecurityContext* RemoteFrame::securityContext() const
 {
     return m_securityContext.get();
 }
 
 void RemoteFrame::forwardInputEvent(Event* event)
 {
@@ skipping 18 matching lines @@
         owner->setWidget(view);
     }
 }
 
 RemoteFrameClient* RemoteFrame::remoteFrameClient() const
 {
     return static_cast<RemoteFrameClient*>(client());
 }
 
 } // namespace blink