Associate Location with DOMWindow instead of Frame.

third_party/WebKit/Source/core/frame/Location.h

 /*
  * Copyright (C) 2008, 2010 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Location_h
 #define Location_h
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/dom/DOMStringList.h"
+#include "core/frame/DOMWindow.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
+class Document;
 class LocalDOMWindow;
 class ExceptionState;
-class Frame;
 class KURL;
 
-// This class corresponds to the JS Location API, which is the only DOM API
-// besides Window that is operable in a RemoteFrame. Location needs to be
-// manually updated in DOMWindow::reset() to ensure it doesn't retain a stale
-// Frame pointer.
+// This class corresponds to the Location interface. Location is the only
+// interface besides Window that is accessible cross-origin and must handle
+// remote frames.
+//
+// HTML standard: https://whatwg.org/C/browsers.html#the-location-interface
 class CORE_EXPORT Location final : public GarbageCollected<Location>,
                                    public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  static Location* create(Frame* frame) { return new Location(frame); }
+  static Location* create(DOMWindow* domWindow) {
+    return new Location(domWindow);
+  }
 
-  Frame* frame() const { return m_frame.get(); }
-  void reset() { m_frame = nullptr; }
+  DOMWindow* window() const { return m_domWindow.get(); }

[Yuki, 2017/02/20 08:57:46]

nit: Document, Frame, ScriptState and ContextLifecycleObserver name it
|domWindow()|.

[dcheng, 2017/02/20 09:22:56]

Good point, done.

+  // TODO(dcheng): Deprecated and will be removed. Do not use in new code!
+  Frame* frame() const { return m_domWindow->frame(); }
 
   void setHref(LocalDOMWindow* currentWindow,
                LocalDOMWindow* enteredWindow,
                const String&,
                ExceptionState&);
   String href() const;
 
   void assign(LocalDOMWindow* currentWindow,
               LocalDOMWindow* enteredWindow,
               const String&,
@@ skipping 45 matching lines @@
 
   // Just return the |this| object the way the normal valueOf function on the
   // Object prototype would.  The valueOf function is only added to make sure
   // that it cannot be overwritten on location objects, since that would provide
   // a hook to change the string conversion behavior of location objects.
   ScriptValue valueOf(const ScriptValue& thisObject) { return thisObject; }
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  explicit Location(Frame*);
+  explicit Location(DOMWindow*);
+
+  // Note: it is only valid to call this when this is a Location object is for a

[Yuki, 2017/02/20 08:57:47]

maybe typo?: s/is for/for/

[dcheng, 2017/02/20 09:22:56]

Done.

+  // LocalDOMWindow.
+  Document* document() const;
+
+  // Returns true if:
+  // (1) the associated Window is the active Window in the frame
+  // (2) and the frame is attached.
+  bool isAttached() const;
 
   enum class SetLocationPolicy { Normal, ReplaceThisFrame };
   void setLocation(const String&,
                    LocalDOMWindow* currentWindow,
                    LocalDOMWindow* enteredWindow,
                    ExceptionState* = nullptr,
                    SetLocationPolicy = SetLocationPolicy::Normal);
 
   const KURL& url() const;
 
-  Member<Frame> m_frame;
+  const Member<DOMWindow> m_domWindow;
 };
 
 }  // namespace blink
 
 #endif  // Location_h