Move Location to DOMWindow

Source/core/frame/LocalDOMWindow.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 73 matching lines @@
     virtual LocalFrame* frame() const override;
     Screen* screen() const override;
     History* history() const override;
     BarProp* locationbar() const override;
     BarProp* menubar() const override;
     BarProp* personalbar() const override;
     BarProp* scrollbars() const override;
     BarProp* statusbar() const override;
     BarProp* toolbar() const override;
     Navigator* navigator() const override;
-    Location* location() const override;
     bool offscreenBuffering() const override;
     int outerHeight() const override;
     int outerWidth() const override;
     int innerHeight() const override;
     int innerWidth() const override;
     int screenX() const override;
     int screenY() const override;
     double scrollX() const override;
     double scrollY() const override;
     const AtomicString& name() const override;
@@ skipping 35 matching lines @@
     PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&) override;
     PassRefPtrWillBeRawPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const override;
     PassRefPtrWillBeRawPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt) const override;
     int requestAnimationFrame(RequestAnimationFrameCallback*) override;
     int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override;
     void cancelAnimationFrame(int id) override;
     void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&) override;
     String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
     String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
 
-    void registerProperty(DOMWindowProperty*);
-    void unregisterProperty(DOMWindowProperty*);
-
-    void reset();
+    void reset() override;
 
     unsigned pendingUnloadEventListeners() const;
 
     static FloatRect adjustWindowRect(LocalFrame&, const FloatRect& pendingChanges);
 
     bool allowPopUp(); // Call on first window, not target window.
     static bool allowPopUp(LocalFrame& firstFrame);
     static bool canShowModalDialogNow(const LocalFrame*);
 
     Element* frameElement() const;
@@ skipping 24 matching lines @@
     void dispatchLoadEvent();
 
     void finishedLoading();
 
     ApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
 
     // Dispatch the (deprecated) orientationchange event to this DOMWindow and
     // recurse on its child frames.
     void sendOrientationChangeEvent();
 
-    void willDetachDocumentFromFrame();
-
     bool isInsecureScriptAccess(DOMWindow& callingWindow, const String& urlString) override;
 
     PassOwnPtr<LifecycleNotifier<LocalDOMWindow>> createLifecycleNotifier();
 
     EventQueue* eventQueue() const;
     void enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event>);
     void enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event>);
     void enqueuePageshowEvent(PageshowEventPersistence);
     void enqueueHashchangeEvent(const String& oldURL, const String& newURL);
     void enqueuePopstateEvent(PassRefPtr<SerializedScriptValue>);
@@ skipping 35 matching lines @@
 
         RawPtrWillBeMember<LocalDOMWindow> m_window;
     };
     friend WTF::OwnedPtrDeleter<WindowFrameObserver>;
 
     explicit LocalDOMWindow(LocalFrame&);
 
     Page* page();
 
     void clearDocument();
-    void willDestroyDocumentInFrame();
 
     // FIXME: Oilpan: the need for this internal method will fall
     // away when EventTargets are no longer using refcounts and
     // window properties are also on the heap. Inline the minimal
     // do-not-broadcast handling then and remove the enum +
     // removeAllEventListenersInternal().
     enum BroadcastListenerRemoval {
         DoNotBroadcastListenerRemoval,
         DoBroadcastListenerRemoval
     };
 
     void willDetachFrameHost();
     void removeAllEventListenersInternal(BroadcastListenerRemoval);
 
     OwnPtrWillBeMember<WindowFrameObserver> m_frameObserver;
     RefPtrWillBeMember<Document> m_document;
 
     bool m_shouldPrintWhenFinishedLoading;
 #if ENABLE(ASSERT)
     bool m_hasBeenReset;
 #endif
 
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty>> m_properties;
-
     mutable RefPtrWillBeMember<Screen> m_screen;
     mutable RefPtrWillBeMember<History> m_history;
     mutable RefPtrWillBeMember<BarProp> m_locationbar;
     mutable RefPtrWillBeMember<BarProp> m_menubar;
     mutable RefPtrWillBeMember<BarProp> m_personalbar;
     mutable RefPtrWillBeMember<BarProp> m_scrollbars;
     mutable RefPtrWillBeMember<BarProp> m_statusbar;
     mutable RefPtrWillBeMember<BarProp> m_toolbar;
     mutable RefPtrWillBeMember<Console> m_console;
     mutable RefPtrWillBeMember<Navigator> m_navigator;
-    mutable RefPtrWillBeMember<Location> m_location;
     mutable RefPtrWillBeMember<StyleMedia> m_media;
 
     String m_status;
     String m_defaultStatus;
 
     mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache;
 
     mutable RefPtrWillBeMember<Performance> m_performance;
 
     mutable RefPtrWillBeMember<DOMWindowCSS> m_css;
@@ skipping 12 matching lines @@
 }
 
 inline String LocalDOMWindow::defaultStatus() const
 {
     return m_defaultStatus;
 }
 
 } // namespace blink
 
 #endif // LocalDOMWindow_h