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

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: 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 | Annotate | Revision Log
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 setView(nullptr); 118 setView(nullptr);
119 loader().clear(); 119 loader().clear();
120 setDOMWindow(nullptr); 120 setDOMWindow(nullptr);
121 121
122 // FIXME: What to do here... some of this is redundant with ~Frame. 122 // FIXME: What to do here... some of this is redundant with ~Frame.
123 HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.e nd(); 123 HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.e nd();
124 for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObserver s.begin(); it != stop; ++it) 124 for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObserver s.begin(); it != stop; ++it)
125 (*it)->frameDestroyed(); 125 (*it)->frameDestroyed();
126 } 126 }
127 127
128 void LocalFrame::navigate(Document& originDocument, const KURL& url, const Refer rer& referrer, bool lockBackForwardList)
129 {
130 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), referrer, lockBackForwardList);
131 }
132
128 void LocalFrame::detach() 133 void LocalFrame::detach()
129 { 134 {
130 // A lot of the following steps can result in the current frame being 135 // A lot of the following steps can result in the current frame being
131 // detached, so protect a reference to it. 136 // detached, so protect a reference to it.
132 RefPtr<LocalFrame> protect(this); 137 RefPtr<LocalFrame> protect(this);
133 m_loader.stopAllLoaders(); 138 m_loader.stopAllLoaders();
134 m_loader.closeURL(); 139 m_loader.closeURL();
135 detachChildren(); 140 detachChildren();
136 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren() 141 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren()
137 // will trigger the unload event handlers of any child frames, and those eve nt 142 // will trigger the unload event handlers of any child frames, and those eve nt
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 684
680 return curFrame; 685 return curFrame;
681 } 686 }
682 687
683 void LocalFrame::setPagePopupOwner(Element& owner) 688 void LocalFrame::setPagePopupOwner(Element& owner)
684 { 689 {
685 m_pagePopupOwner = &owner; 690 m_pagePopupOwner = &owner;
686 } 691 }
687 692
688 } // namespace blink 693 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698