| Index: Source/core/frame/FrameDestructionObserver.cpp
|
| diff --git a/Source/core/frame/FrameDestructionObserver.cpp b/Source/core/frame/FrameDestructionObserver.cpp
|
| index 501d9b2d3dad3f6e566191bd4f94277e20f8bf25..2d6c71521994a24c810d81acf70305e03f69d6d4 100644
|
| --- a/Source/core/frame/FrameDestructionObserver.cpp
|
| +++ b/Source/core/frame/FrameDestructionObserver.cpp
|
| @@ -31,32 +31,8 @@
|
| namespace blink {
|
|
|
| FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame)
|
| - : m_frame(nullptr)
|
| {
|
| - observeFrame(frame);
|
| -}
|
| -
|
| -#if !ENABLE(OILPAN)
|
| -FrameDestructionObserver::~FrameDestructionObserver()
|
| -{
|
| - observeFrame(nullptr);
|
| -}
|
| -#endif
|
| -
|
| -void FrameDestructionObserver::observeFrame(LocalFrame* frame)
|
| -{
|
| - if (m_frame)
|
| - m_frame->removeDestructionObserver(this);
|
| -
|
| - m_frame = frame;
|
| -
|
| - if (m_frame)
|
| - m_frame->addDestructionObserver(this);
|
| -}
|
| -
|
| -void FrameDestructionObserver::frameDestroyed()
|
| -{
|
| - m_frame = nullptr;
|
| + setContext(frame);
|
| }
|
|
|
| void FrameDestructionObserver::willDetachFrameHost()
|
| @@ -64,9 +40,4 @@ void FrameDestructionObserver::willDetachFrameHost()
|
| // Subclasses should override this function to handle this notification.
|
| }
|
|
|
| -DEFINE_TRACE(FrameDestructionObserver)
|
| -{
|
| - visitor->trace(m_frame);
|
| -}
|
| -
|
| } // namespace blink
|
|
|