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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameDestructionObserver.h ('k') | Source/core/frame/LocalFrame.h » ('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 21 matching lines...) Expand all
32 32
33 FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame) 33 FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame)
34 : m_frame(nullptr) 34 : m_frame(nullptr)
35 { 35 {
36 observeFrame(frame); 36 observeFrame(frame);
37 } 37 }
38 38
39 #if !ENABLE(OILPAN) 39 #if !ENABLE(OILPAN)
40 FrameDestructionObserver::~FrameDestructionObserver() 40 FrameDestructionObserver::~FrameDestructionObserver()
41 { 41 {
42 observeFrame(0); 42 observeFrame(nullptr);
43 } 43 }
44 #endif 44 #endif
45 45
46 void FrameDestructionObserver::observeFrame(LocalFrame* frame) 46 void FrameDestructionObserver::observeFrame(LocalFrame* frame)
47 { 47 {
48 ASSERT(!m_frame || !frame);
49 #if !ENABLE(OILPAN)
48 if (m_frame) 50 if (m_frame)
49 m_frame->removeDestructionObserver(this); 51 m_frame->removeDestructionObserver(this);
52 #endif
50 53
51 m_frame = frame; 54 m_frame = frame;
52 55
53 if (m_frame) 56 if (m_frame)
54 m_frame->addDestructionObserver(this); 57 m_frame->addDestructionObserver(this);
55 } 58 }
56 59
57 #if !ENABLE(OILPAN) 60 #if !ENABLE(OILPAN)
58 void FrameDestructionObserver::frameDestroyed() 61 void FrameDestructionObserver::frameDestroyed()
59 { 62 {
60 m_frame = nullptr; 63 m_frame = nullptr;
61 } 64 }
62 #endif 65 #endif
63 66
64 void FrameDestructionObserver::willDetachFrameHost() 67 void FrameDestructionObserver::willDetachFrameHost()
65 { 68 {
66 // Subclasses should override this function to handle this notification. 69 // Subclasses should override this function to handle this notification.
67 } 70 }
68 71
69 void FrameDestructionObserver::trace(Visitor* visitor) 72 void FrameDestructionObserver::trace(Visitor* visitor)
70 { 73 {
71 visitor->trace(m_frame); 74 visitor->trace(m_frame);
72 } 75 }
73 76
74 } 77 }
OLDNEW
« 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