Move Location to DOMWindow

Source/core/frame/DOMWindow.h

 // 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.
 
 #ifndef DOMWindow_h
 #define DOMWindow_h
 
 #include "core/events/EventTarget.h"
 #include "core/frame/DOMWindowBase64.h"
 #include "platform/heap/Handle.h"
 #include "platform/scroll/ScrollableArea.h"
 
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class ApplicationCache;
 class BarProp;
 class CSSRuleList;
 class CSSStyleDeclaration;
 class Console;
 class DOMSelection;
 class DOMWindowCSS;
+class DOMWindowProperty;
 class Document;
 class Element;
 class Frame;
 class History;
 class LocalDOMWindow;
 class Location;
 class MediaQueryList;
 class Navigator;
 class Performance;
 class RequestAnimationFrameCallback;
 class Screen;
 class ScrollToOptions;
 class SerializedScriptValue;
 class Storage;
 class StyleMedia;
 
 typedef WillBeHeapVector<RefPtrWillBeMember<MessagePort>, 1> MessagePortArray;
 
 class DOMWindow : public EventTargetWithInlineData, public RefCountedWillBeNoBase<DOMWindow>, public DOMWindowBase64 {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(DOMWindow);
 public:
+    virtual ~DOMWindow();
+
     // RefCountedWillBeGarbageCollectedFinalized overrides:
     void trace(Visitor* visitor) override
     {

[dcheng, 2015/02/02 19:27:52]

+haraken, is there a threshhold that it's preferable to inline trace() methods
vs out-of-lining them?

         EventTargetWithInlineData::trace(visitor);
+        visitor->trace(m_location);
     }
 
     virtual bool isLocalDOMWindow() const { return false; }
     virtual bool isRemoteDOMWindow() const { return false; }
 
     virtual Frame* frame() const = 0;
 
     // DOM Level 0
     virtual Screen* screen() const = 0;
     virtual History* history() const = 0;
     virtual BarProp* locationbar() const = 0;
     virtual BarProp* menubar() const = 0;
     virtual BarProp* personalbar() const = 0;
     virtual BarProp* scrollbars() const = 0;
     virtual BarProp* statusbar() const = 0;
     virtual BarProp* toolbar() const = 0;
     virtual Navigator* navigator() const = 0;
     Navigator* clientInformation() const { return navigator(); }
-    // FIXME: Temporary, until window.location is implemented for remote frames.
-    virtual Location* location() const = 0;
+    Location* location() const;
 
     virtual bool offscreenBuffering() const = 0;
 
     virtual int outerHeight() const = 0;
     virtual int outerWidth() const = 0;
     virtual int innerHeight() const = 0;
     virtual int innerWidth() const = 0;
     virtual int screenX() const = 0;
     virtual int screenY() const = 0;
     int screenLeft() const { return screenX(); }
@@ skipping 103 matching lines @@
     virtual String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) = 0;
     virtual bool isInsecureScriptAccess(DOMWindow& callingWindow, const String& urlString);
 
     // FIXME: When this DOMWindow is no longer the active DOMWindow (i.e.,
     // when its document is no longer the document that is displayed in its
     // frame), we would like to zero out m_frame to avoid being confused
     // by the document that is currently active in m_frame.
     // See https://bugs.webkit.org/show_bug.cgi?id=62054
     bool isCurrentlyDisplayedInFrame() const;
 
+    virtual void reset();
+
+    void registerProperty(DOMWindowProperty*);
+    void unregisterProperty(DOMWindowProperty*);
+    void willDestroyDocumentInFrame();
+    void willDetachDocumentFromFrame();
+
     DEFINE_ATTRIBUTE_EVENT_LISTENER(animationend);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(animationiteration);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(animationstart);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(transitionend);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
 
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart);
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration);
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd);
     DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
+
+private:
+

[dcheng, 2015/02/02 19:27:52]

Nit: remove blank line.

+    WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty>> m_properties;
+    mutable RefPtrWillBeMember<Location> m_location;
 };
 
 } // namespace blink
 
 #endif // DOMWindow_h