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

Unified Diff: Source/core/frame/FrameDestructionObserver.cpp

Issue 584403002: Oilpan: remove unused support for removing FrameDestructionObservers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | « Source/core/frame/FrameDestructionObserver.h ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameDestructionObserver.cpp
diff --git a/Source/core/frame/FrameDestructionObserver.cpp b/Source/core/frame/FrameDestructionObserver.cpp
index 6c561da7b28d1136e9370b3f33caa5aeb7b41022..8ba4ed32c9c9f7bf694aed51acdd8449b2acf6b7 100644
--- a/Source/core/frame/FrameDestructionObserver.cpp
+++ b/Source/core/frame/FrameDestructionObserver.cpp
@@ -39,14 +39,17 @@ FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame)
#if !ENABLE(OILPAN)
FrameDestructionObserver::~FrameDestructionObserver()
{
- observeFrame(0);
+ observeFrame(nullptr);
}
#endif
void FrameDestructionObserver::observeFrame(LocalFrame* frame)
{
+ ASSERT(!m_frame || !frame);
+#if !ENABLE(OILPAN)
if (m_frame)
m_frame->removeDestructionObserver(this);
+#endif
m_frame = frame;
« no previous file with comments | « Source/core/frame/FrameDestructionObserver.h ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698