OLD | NEW |
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 13 matching lines...) Expand all Loading... |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/frame/FrameDestructionObserver.h" | 27 #include "core/frame/FrameDestructionObserver.h" |
28 | 28 |
29 #include "core/frame/LocalFrame.h" | 29 #include "core/frame/LocalFrame.h" |
30 | 30 |
31 namespace blink { | 31 namespace blink { |
32 | 32 |
33 FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame) | 33 FrameDestructionObserver::FrameDestructionObserver(LocalFrame* frame) |
34 : m_frame(0) | 34 : m_frame(nullptr) |
35 { | 35 { |
36 observeFrame(frame); | 36 observeFrame(frame); |
37 } | 37 } |
38 | 38 |
| 39 #if !ENABLE(OILPAN) |
39 FrameDestructionObserver::~FrameDestructionObserver() | 40 FrameDestructionObserver::~FrameDestructionObserver() |
40 { | 41 { |
41 observeFrame(0); | 42 observeFrame(0); |
42 | |
43 } | 43 } |
| 44 #endif |
44 | 45 |
45 void FrameDestructionObserver::observeFrame(LocalFrame* frame) | 46 void FrameDestructionObserver::observeFrame(LocalFrame* frame) |
46 { | 47 { |
47 if (m_frame) | 48 if (m_frame) |
48 m_frame->removeDestructionObserver(this); | 49 m_frame->removeDestructionObserver(this); |
49 | 50 |
50 m_frame = frame; | 51 m_frame = frame; |
51 | 52 |
52 if (m_frame) | 53 if (m_frame) |
53 m_frame->addDestructionObserver(this); | 54 m_frame->addDestructionObserver(this); |
54 } | 55 } |
55 | 56 |
| 57 #if !ENABLE(OILPAN) |
56 void FrameDestructionObserver::frameDestroyed() | 58 void FrameDestructionObserver::frameDestroyed() |
57 { | 59 { |
58 m_frame = 0; | 60 m_frame = nullptr; |
59 } | 61 } |
| 62 #endif |
60 | 63 |
61 void FrameDestructionObserver::willDetachFrameHost() | 64 void FrameDestructionObserver::willDetachFrameHost() |
62 { | 65 { |
63 // Subclasses should override this function to handle this notification. | 66 // Subclasses should override this function to handle this notification. |
64 } | 67 } |
65 | 68 |
| 69 void FrameDestructionObserver::trace(Visitor* visitor) |
| 70 { |
| 71 visitor->trace(m_frame); |
66 } | 72 } |
| 73 |
| 74 } |
OLD | NEW |