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

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

Issue 573353002: Plumbing toward transitioning remote frame back to a local frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: forward declarations, drop a spurious parameter Created 6 years, 2 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/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 visitor->trace(m_spellChecker); 150 visitor->trace(m_spellChecker);
151 visitor->trace(m_selection); 151 visitor->trace(m_selection);
152 visitor->trace(m_eventHandler); 152 visitor->trace(m_eventHandler);
153 visitor->trace(m_console); 153 visitor->trace(m_console);
154 visitor->trace(m_inputMethodController); 154 visitor->trace(m_inputMethodController);
155 HeapSupplementable<LocalFrame>::trace(visitor); 155 HeapSupplementable<LocalFrame>::trace(visitor);
156 #endif 156 #endif
157 Frame::trace(visitor); 157 Frame::trace(visitor);
158 } 158 }
159 159
160 void LocalFrame::navigate(Document& originDocument, const KURL& url, const Refer rer& referrer, bool lockBackForwardList)
161 {
162 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), referrer, lockBackForwardList);
163 }
164
160 void LocalFrame::detach() 165 void LocalFrame::detach()
161 { 166 {
162 // A lot of the following steps can result in the current frame being 167 // A lot of the following steps can result in the current frame being
163 // detached, so protect a reference to it. 168 // detached, so protect a reference to it.
164 RefPtrWillBeRawPtr<LocalFrame> protect(this); 169 RefPtrWillBeRawPtr<LocalFrame> protect(this);
165 m_loader.stopAllLoaders(); 170 m_loader.stopAllLoaders();
166 m_loader.closeURL(); 171 m_loader.closeURL();
167 detachChildren(); 172 detachChildren();
168 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren() 173 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren()
169 // will trigger the unload event handlers of any child frames, and those eve nt 174 // will trigger the unload event handlers of any child frames, and those eve nt
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 735
731 return curFrame; 736 return curFrame;
732 } 737 }
733 738
734 void LocalFrame::setPagePopupOwner(Element& owner) 739 void LocalFrame::setPagePopupOwner(Element& owner)
735 { 740 {
736 m_pagePopupOwner = &owner; 741 m_pagePopupOwner = &owner;
737 } 742 }
738 743
739 } // namespace blink 744 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698