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

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

Issue 1017313002: Simplify handling of LocalFrame lifecycle notifications. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: clear context on FDO::contextDestroyed() Created 5 years, 9 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
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 8fafd6db4ec2d7896450908b2ad3e96187d42ad8..01f812dcc32627258e6f8ec21a693ab52e9efb62 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -215,7 +215,6 @@ DEFINE_TRACE(LocalFrame)
{
visitor->trace(m_instrumentingAgents);
#if ENABLE(OILPAN)
- visitor->trace(m_destructionObservers);
visitor->trace(m_loader);
visitor->trace(m_navigationScheduler);
visitor->trace(m_view);
@@ -231,6 +230,7 @@ DEFINE_TRACE(LocalFrame)
visitor->template registerWeakMembers<LocalFrame, &LocalFrame::clearWeakMembers>(this);
HeapSupplementable<LocalFrame>::trace(visitor);
#endif
+ LocalFrameLifecycleNotifier::trace(visitor);
Frame::trace(visitor);
}
@@ -289,10 +289,7 @@ void LocalFrame::detach()
// Signal frame destruction here rather than in the destructor.
// Main motivation is to avoid being dependent on its exact timing (Oilpan.)
- for (const auto& frameDestructionObserver : m_destructionObservers)
- frameDestructionObserver->frameDestroyed();
-
- m_destructionObservers.clear();
haraken 2015/03/19 23:42:00 We lose this logic in the new code, but it would b
sof 2015/03/20 06:22:05 That was what I thought too, but as observers call
+ LocalFrameLifecycleNotifier::notifyContextDestroyed();
m_supplements.clear();
}
@@ -339,21 +336,9 @@ void LocalFrame::disconnectOwnerElement()
Frame::disconnectOwnerElement();
}
-void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer)
-{
- m_destructionObservers.add(observer);
-}
-
-void LocalFrame::removeDestructionObserver(FrameDestructionObserver* observer)
-{
- m_destructionObservers.remove(observer);
-}
-
void LocalFrame::willDetachFrameHost()
{
-
- for (const auto& frameDestructionObserver : m_destructionObservers)
- frameDestructionObserver->willDetachFrameHost();
+ LocalFrameLifecycleNotifier::notifyWillDetachFrameHost();
// FIXME: Page should take care of updating focus/scrolling instead of Frame.
// FIXME: It's unclear as to why this is called more than once, but it is,

Powered by Google App Engine
This is Rietveld 408576698