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

Side by Side Diff: Source/core/frame/FrameDestructionObserver.cpp

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/FrameDestructionObserver.h ('k') | Source/core/frame/LocalDOMWindow.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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 { 47 {
48 if (m_frame) 48 if (m_frame)
49 m_frame->removeDestructionObserver(this); 49 m_frame->removeDestructionObserver(this);
50 50
51 m_frame = frame; 51 m_frame = frame;
52 52
53 if (m_frame) 53 if (m_frame)
54 m_frame->addDestructionObserver(this); 54 m_frame->addDestructionObserver(this);
55 } 55 }
56 56
57 #if !ENABLE(OILPAN)
57 void FrameDestructionObserver::frameDestroyed() 58 void FrameDestructionObserver::frameDestroyed()
58 { 59 {
59 m_frame = nullptr; 60 m_frame = nullptr;
60 } 61 }
62 #endif
61 63
62 void FrameDestructionObserver::willDetachFrameHost() 64 void FrameDestructionObserver::willDetachFrameHost()
63 { 65 {
64 // Subclasses should override this function to handle this notification. 66 // Subclasses should override this function to handle this notification.
65 } 67 }
66 68
67 void FrameDestructionObserver::trace(Visitor* visitor) 69 void FrameDestructionObserver::trace(Visitor* visitor)
68 { 70 {
69 visitor->trace(m_frame); 71 visitor->trace(m_frame);
70 } 72 }
71 73
72 } 74 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameDestructionObserver.h ('k') | Source/core/frame/LocalDOMWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698