Associate Location with DOMWindow instead of Frame.

third_party/WebKit/Source/core/frame/DOMWindow.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 "core/frame/DOMWindow.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/SecurityContext.h"
@@ skipping 46 matching lines @@
 const AtomicString& DOMWindow::interfaceName() const {
   return EventTargetNames::DOMWindow;
 }
 
 const DOMWindow* DOMWindow::toDOMWindow() const {
   return this;
 }
 
 Location* DOMWindow::location() const {
   if (!m_location)
-    m_location = Location::create(frame());
+    m_location = Location::create(const_cast<DOMWindow*>(this));
   return m_location.get();
 }
 
 bool DOMWindow::closed() const {
   return m_windowIsClosing || !frame() || !frame()->host();
 }
 
 unsigned DOMWindow::length() const {
   return frame() ? frame()->tree().scopedChildCount() : 0;
 }
@@ skipping 62 matching lines @@
     if (callingWindow.document()->getSecurityOrigin()->canAccessCheckSuborigins(
             frame()->securityContext()->getSecurityOrigin()))
       return false;
   }
 
   callingWindow.printErrorMessage(
       crossDomainAccessErrorMessage(&callingWindow));
   return true;
 }
 
-void DOMWindow::resetLocation() {
-  // Location needs to be reset manually so that it doesn't retain a stale
-  // Frame pointer.
-  if (m_location) {
-    m_location->reset();
-    m_location = nullptr;
-  }
-}
-
 void DOMWindow::postMessage(PassRefPtr<SerializedScriptValue> message,
                             const MessagePortArray& ports,
                             const String& targetOrigin,
                             LocalDOMWindow* source,
                             ExceptionState& exceptionState) {
   if (!isCurrentlyDisplayedInFrame())
     return;
 
   Document* sourceDocument = source->document();
 
@@ skipping 264 matching lines @@
 }
 
 DEFINE_TRACE(DOMWindow) {
   visitor->trace(m_frame);
   visitor->trace(m_inputCapabilities);
   visitor->trace(m_location);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink