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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/core/frame/DOMWindowProperty.h ('k') | Source/core/frame/FrameDestructionObserver.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "platform/heap/Handle.h" 29 #include "platform/heap/Handle.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class LocalFrame; 33 class LocalFrame;
34 34
35 class FrameDestructionObserver : public WillBeGarbageCollectedMixin { 35 class FrameDestructionObserver : public WillBeGarbageCollectedMixin {
36 public: 36 public:
37 explicit FrameDestructionObserver(LocalFrame*); 37 explicit FrameDestructionObserver(LocalFrame*);
38 38
39 #if !ENABLE(OILPAN)
40 // Oilpan: there is no known need for directly observing
41 // frameDestroyed() with Oilpan enabled, as its clearing is
42 // handled by keeping a weak reference.
43 //
44 // A weak callback version of frameDestroyed() can be reintroduced
45 // later, should the need arise.
39 virtual void frameDestroyed(); 46 virtual void frameDestroyed();
47 #endif
40 virtual void willDetachFrameHost(); 48 virtual void willDetachFrameHost();
41 49
42 LocalFrame* frame() const { return m_frame; } 50 LocalFrame* frame() const { return m_frame; }
43 51
44 virtual void trace(Visitor*); 52 virtual void trace(Visitor*);
45 53
46 protected: 54 protected:
47 #if !ENABLE(OILPAN) 55 #if !ENABLE(OILPAN)
48 virtual ~FrameDestructionObserver(); 56 virtual ~FrameDestructionObserver();
49 #endif 57 #endif
50 58
51 void observeFrame(LocalFrame*); 59 void observeFrame(LocalFrame*);
52 60
53 RawPtrWillBeMember<LocalFrame> m_frame; 61 RawPtrWillBeWeakMember<LocalFrame> m_frame;
54 }; 62 };
55 63
56 } 64 }
57 65
58 #endif 66 #endif
OLDNEW
« 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