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

Side by Side Diff: Source/core/frame/LocalDOMWindow.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/FrameDestructionObserver.cpp ('k') | Source/core/frame/LocalDOMWindow.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) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 public: 235 public:
236 static PassOwnPtrWillBeRawPtr<WindowFrameObserver> create(LocalDOMWindow *, LocalFrame&); 236 static PassOwnPtrWillBeRawPtr<WindowFrameObserver> create(LocalDOMWindow *, LocalFrame&);
237 237
238 virtual void trace(Visitor*) override; 238 virtual void trace(Visitor*) override;
239 239
240 private: 240 private:
241 WindowFrameObserver(LocalDOMWindow*, LocalFrame&); 241 WindowFrameObserver(LocalDOMWindow*, LocalFrame&);
242 242
243 // FrameDestructionObserver overrides: 243 // FrameDestructionObserver overrides:
244 void willDetachFrameHost() override; 244 void willDetachFrameHost() override;
245 void frameDestroyed() override;
246 245
247 RawPtrWillBeMember<LocalDOMWindow> m_window; 246 RawPtrWillBeMember<LocalDOMWindow> m_window;
248 }; 247 };
249 friend WTF::OwnedPtrDeleter<WindowFrameObserver>; 248 friend WTF::OwnedPtrDeleter<WindowFrameObserver>;
250 249
251 explicit LocalDOMWindow(LocalFrame&); 250 explicit LocalDOMWindow(LocalFrame&);
252 251
253 Page* page(); 252 Page* page();
254 253
255 void clearDocument(); 254 void clearDocument();
256 void willDestroyDocumentInFrame(); 255 void willDestroyDocumentInFrame();
257 256
258 // FIXME: Oilpan: the need for this internal method will fall 257 // FIXME: Oilpan: the need for this internal method will fall
259 // away when EventTargets are no longer using refcounts and 258 // away when EventTargets are no longer using refcounts and
260 // window properties are also on the heap. Inline the minimal 259 // window properties are also on the heap. Inline the minimal
261 // do-not-broadcast handling then and remove the enum + 260 // do-not-broadcast handling then and remove the enum +
262 // removeAllEventListenersInternal(). 261 // removeAllEventListenersInternal().
263 enum BroadcastListenerRemoval { 262 enum BroadcastListenerRemoval {
264 DoNotBroadcastListenerRemoval, 263 DoNotBroadcastListenerRemoval,
265 DoBroadcastListenerRemoval 264 DoBroadcastListenerRemoval
266 }; 265 };
267 266
268 void willDetachFrameHost(); 267 void willDetachFrameHost();
269 void frameDestroyed();
270 void removeAllEventListenersInternal(BroadcastListenerRemoval); 268 void removeAllEventListenersInternal(BroadcastListenerRemoval);
271 269
272 OwnPtrWillBeMember<WindowFrameObserver> m_frameObserver; 270 OwnPtrWillBeMember<WindowFrameObserver> m_frameObserver;
273 RefPtrWillBeMember<Document> m_document; 271 RefPtrWillBeMember<Document> m_document;
274 272
275 bool m_shouldPrintWhenFinishedLoading; 273 bool m_shouldPrintWhenFinishedLoading;
276 #if ENABLE(ASSERT) 274 #if ENABLE(ASSERT)
277 bool m_hasBeenReset; 275 bool m_hasBeenReset;
278 #endif 276 #endif
279 277
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 } 313 }
316 314
317 inline String LocalDOMWindow::defaultStatus() const 315 inline String LocalDOMWindow::defaultStatus() const
318 { 316 {
319 return m_defaultStatus; 317 return m_defaultStatus;
320 } 318 }
321 319
322 } // namespace blink 320 } // namespace blink
323 321
324 #endif // LocalDOMWindow_h 322 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameDestructionObserver.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698