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

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

Issue 908043002: Revert of Issue FrameDestructionObserver::frameDestroyed() notification on detach. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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/DOMWindowProperty.h ('k') | Source/core/frame/FrameDestructionObserver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameDestructionObserver.h
diff --git a/Source/core/frame/FrameDestructionObserver.h b/Source/core/frame/FrameDestructionObserver.h
index 708dd4ef8b75d955b1782b8d443f658e1d2618de..a62d20210447fe2a5986198e606afdd637e4bbd7 100644
--- a/Source/core/frame/FrameDestructionObserver.h
+++ b/Source/core/frame/FrameDestructionObserver.h
@@ -36,7 +36,15 @@
public:
explicit FrameDestructionObserver(LocalFrame*);
+#if !ENABLE(OILPAN)
+ // Oilpan: there is no known need for directly observing
+ // frameDestroyed() with Oilpan enabled, as its clearing is
+ // handled by keeping a weak reference.
+ //
+ // A weak callback version of frameDestroyed() can be reintroduced
+ // later, should the need arise.
virtual void frameDestroyed();
+#endif
virtual void willDetachFrameHost();
LocalFrame* frame() const { return m_frame; }
@@ -50,7 +58,7 @@
void observeFrame(LocalFrame*);
- RawPtrWillBeMember<LocalFrame> m_frame;
+ RawPtrWillBeWeakMember<LocalFrame> m_frame;
};
}
« no previous file with comments | « Source/core/frame/DOMWindowProperty.h ('k') | Source/core/frame/FrameDestructionObserver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698