Chromium Code Reviews| Index: Source/core/frame/FrameDestructionObserver.h | 
| diff --git a/Source/core/frame/FrameDestructionObserver.h b/Source/core/frame/FrameDestructionObserver.h | 
| index 3337ceb99d350b0de8e5249efbf4ab0ef6d2ee12..a9db185567883851491311913645a99aa8b04e3f 100644 | 
| --- a/Source/core/frame/FrameDestructionObserver.h | 
| +++ b/Source/core/frame/FrameDestructionObserver.h | 
| @@ -26,32 +26,27 @@ | 
| #ifndef FrameDestructionObserver_h | 
| #define FrameDestructionObserver_h | 
| +#include "core/frame/LocalFrame.h" | 
| +#include "platform/LifecycleObserver.h" | 
| #include "platform/heap/Handle.h" | 
| namespace blink { | 
| class LocalFrame; | 
| +class LocalFrameLifecycleNotifier; | 
| -class FrameDestructionObserver : public WillBeGarbageCollectedMixin { | 
| +class FrameDestructionObserver : public LifecycleObserver<LocalFrame, FrameDestructionObserver, LocalFrameLifecycleNotifier> { | 
| 
 
haraken
2015/03/19 23:42:00
Would it make sense to rename FrameDestructionObse
 
sof
2015/03/20 06:22:05
I think it makes sense to be consistent, but will
 
 | 
| public: | 
| - virtual void frameDestroyed(); | 
| virtual void willDetachFrameHost(); | 
| + virtual void contextDestroyed() | 
| + { | 
| + setContext(nullptr); | 
| + } | 
| - LocalFrame* frame() const { return m_frame; } | 
| - | 
| - DECLARE_VIRTUAL_TRACE(); | 
| + LocalFrame* frame() const { return lifecycleContext(); } | 
| protected: | 
| explicit FrameDestructionObserver(LocalFrame*); | 
| - | 
| -#if !ENABLE(OILPAN) | 
| - virtual ~FrameDestructionObserver(); | 
| -#endif | 
| - | 
| - void observeFrame(LocalFrame*); | 
| - | 
| -private: | 
| - RawPtrWillBeMember<LocalFrame> m_frame; | 
| }; | 
| } // namespace blink |