Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: Source/core/frame/LocalDOMWindow.h

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/LocalDOMWindow.h
diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
index 6919d4a29f967571e6ad07d6286d1254f05f1a72..d37fbdbbfcaf50cd1a5020e88cbd351aa561d3ac 100644
--- a/Source/core/frame/LocalDOMWindow.h
+++ b/Source/core/frame/LocalDOMWindow.h
@@ -91,7 +91,6 @@ public:
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;
@@ -147,10 +146,7 @@ public:
String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
- void registerProperty(DOMWindowProperty*);
- void unregisterProperty(DOMWindowProperty*);
-
- void reset();
+ void reset() override;
unsigned pendingUnloadEventListeners() const;
@@ -195,8 +191,6 @@ public:
// recurse on its child frames.
void sendOrientationChangeEvent();
- void willDetachDocumentFromFrame();
-
bool isInsecureScriptAccess(DOMWindow& callingWindow, const String& urlString) override;
PassOwnPtr<LifecycleNotifier<LocalDOMWindow>> createLifecycleNotifier();
@@ -252,7 +246,6 @@ private:
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
@@ -275,8 +268,6 @@ private:
bool m_hasBeenReset;
#endif
- WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty>> m_properties;
-
mutable RefPtrWillBeMember<Screen> m_screen;
mutable RefPtrWillBeMember<History> m_history;
mutable RefPtrWillBeMember<BarProp> m_locationbar;
@@ -287,7 +278,6 @@ private:
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;

Powered by Google App Engine
This is Rietveld 408576698