Index: Source/core/frame/DOMWindow.h |
diff --git a/Source/core/frame/DOMWindow.h b/Source/core/frame/DOMWindow.h |
index ed475d7d5985026387aeb059959e394e42dc2af5..0f08a0beac8c9fbdba04cb88140aa5e3ec3e3eab 100644 |
--- a/Source/core/frame/DOMWindow.h |
+++ b/Source/core/frame/DOMWindow.h |
@@ -43,10 +43,13 @@ 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); |
haraken
2015/02/03 00:56:09
Nit: Make the trace call to a super class a tail c
Nate Chapin
2015/02/03 19:17:21
Done.
|
+ visitor->trace(m_location); |
} |
virtual bool isLocalDOMWindow() const { return false; } |
@@ -65,8 +68,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; |
@@ -194,6 +196,8 @@ public: |
// See https://bugs.webkit.org/show_bug.cgi?id=62054 |
bool isCurrentlyDisplayedInFrame() const; |
+ virtual void reset(); |
+ |
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationend); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationiteration); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(animationstart); |
@@ -211,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 |