Chromium Code Reviews| Index: Source/core/frame/DOMWindow.h |
| diff --git a/Source/core/frame/DOMWindow.h b/Source/core/frame/DOMWindow.h |
| index ed475d7d5985026387aeb059959e394e42dc2af5..b946c2a4893b1f00e711065cb45ab1a5321aade8 100644 |
| --- a/Source/core/frame/DOMWindow.h |
| +++ b/Source/core/frame/DOMWindow.h |
| @@ -43,9 +43,12 @@ class DOMWindow : public EventTargetWithInlineData, public RefCountedWillBeNoBas |
| DEFINE_WRAPPERTYPEINFO(); |
| REFCOUNTED_EVENT_TARGET(DOMWindow); |
| public: |
| + virtual ~DOMWindow(); |
| + |
| // RefCountedWillBeGarbageCollectedFinalized overrides: |
| void trace(Visitor* visitor) override |
|
sof
2015/02/03 21:25:10
It would be preferable to have this trace() implem
Nate Chapin
2015/02/06 19:39:58
Done.
|
| { |
| + visitor->trace(m_location); |
| EventTargetWithInlineData::trace(visitor); |
| } |
| @@ -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(); |
|
sof
2015/02/03 21:25:10
Does this need to be virtual?
Nate Chapin
2015/02/06 19:39:58
Nope. Renamed to resetLocation anyway, to make its
|
| + |
| 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 |