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

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

Issue 594083002: Make StorageArea cleanly observe its cached frame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make FrameDestructionObserver::observeFrame() protected again 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
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/storage/StorageArea.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 for (size_t i = 0; i < childFrames.size(); ++i) 301 for (size_t i = 0; i < childFrames.size(); ++i)
302 childFrames[i]->didChangeVisibilityState(); 302 childFrames[i]->didChangeVisibilityState();
303 } 303 }
304 304
305 void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer) 305 void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer)
306 { 306 {
307 m_destructionObservers.add(observer); 307 m_destructionObservers.add(observer);
308 } 308 }
309 309
310 #if !ENABLE(OILPAN)
311 void LocalFrame::removeDestructionObserver(FrameDestructionObserver* observer) 310 void LocalFrame::removeDestructionObserver(FrameDestructionObserver* observer)
312 { 311 {
313 m_destructionObservers.remove(observer); 312 m_destructionObservers.remove(observer);
314 } 313 }
315 #endif
316 314
317 void LocalFrame::willDetachFrameHost() 315 void LocalFrame::willDetachFrameHost()
318 { 316 {
319 // We should never be detatching the page during a Layout. 317 // We should never be detatching the page during a Layout.
320 RELEASE_ASSERT(!m_view || !m_view->isInPerformLayout()); 318 RELEASE_ASSERT(!m_view || !m_view->isInPerformLayout());
321 319
322 Frame* parent = tree().parent(); 320 Frame* parent = tree().parent();
323 if (parent && parent->isLocalFrame()) 321 if (parent && parent->isLocalFrame())
324 toLocalFrame(parent)->loader().checkLoadComplete(); 322 toLocalFrame(parent)->loader().checkLoadComplete();
325 323
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 730
733 return curFrame; 731 return curFrame;
734 } 732 }
735 733
736 void LocalFrame::setPagePopupOwner(Element& owner) 734 void LocalFrame::setPagePopupOwner(Element& owner)
737 { 735 {
738 m_pagePopupOwner = &owner; 736 m_pagePopupOwner = &owner;
739 } 737 }
740 738
741 } // namespace blink 739 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/storage/StorageArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698