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

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

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: resetLocation call to Frame::detach Created 5 years, 10 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
« no previous file with comments | « no previous file | Source/core/frame/DOMWindow.cpp » ('j') | Source/core/frame/LocalDOMWindow.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/DOMWindow.h
diff --git a/Source/core/frame/DOMWindow.h b/Source/core/frame/DOMWindow.h
index 6bd5a454db7df7c7f687866c535f390eb436641d..98cd745f2b53008e07a3458cf5ca487d31c784bd 100644
--- a/Source/core/frame/DOMWindow.h
+++ b/Source/core/frame/DOMWindow.h
@@ -43,11 +43,10 @@ class DOMWindow : public EventTargetWithInlineData, public RefCountedWillBeNoBas
DEFINE_WRAPPERTYPEINFO();
REFCOUNTED_EVENT_TARGET(DOMWindow);
public:
+ virtual ~DOMWindow();
+
// RefCountedWillBeGarbageCollectedFinalized overrides:
- void trace(Visitor* visitor) override
- {
- EventTargetWithInlineData::trace(visitor);
- }
+ void trace(Visitor*) override;
virtual bool isLocalDOMWindow() const { return false; }
virtual bool isRemoteDOMWindow() const { return false; }
@@ -65,8 +64,7 @@ public:
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;
@@ -198,6 +196,8 @@ public:
// See https://bugs.webkit.org/show_bug.cgi?id=62054
bool isCurrentlyDisplayedInFrame() const;
+ void resetLocation();
+
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationend);
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationiteration);
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationstart);
@@ -215,6 +215,9 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
+
+private:
+ mutable RefPtrWillBeMember<Location> m_location;
};
} // namespace blink
« no previous file with comments | « no previous file | Source/core/frame/DOMWindow.cpp » ('j') | Source/core/frame/LocalDOMWindow.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698