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

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

Issue 551973005: Streamline frame detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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.cpp ('k') | Source/core/loader/EmptyClients.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/frame/RemoteFrame.h" 6 #include "core/frame/RemoteFrame.h"
7 7
8 #include "core/frame/RemoteFrameClient.h" 8 #include "core/frame/RemoteFrameClient.h"
9 #include "core/frame/RemoteFrameView.h" 9 #include "core/frame/RemoteFrameView.h"
10 #include "core/html/HTMLFrameOwnerElement.h" 10 #include "core/html/HTMLFrameOwnerElement.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 void RemoteFrame::navigate(Document&, const KURL& url, const Referrer& referrer, bool lockBackForwardList) 29 void RemoteFrame::navigate(Document&, const KURL& url, const Referrer& referrer, bool lockBackForwardList)
30 { 30 {
31 remoteFrameClient()->navigate(ResourceRequest(url, referrer), lockBackForwar dList); 31 remoteFrameClient()->navigate(ResourceRequest(url, referrer), lockBackForwar dList);
32 } 32 }
33 33
34 void RemoteFrame::detach() 34 void RemoteFrame::detach()
35 { 35 {
36 detachChildren(); 36 detachChildren();
37 m_host = nullptr; 37 Frame::detach();
38 } 38 }
39 39
40 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) 40 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view)
41 { 41 {
42 m_view = view; 42 m_view = view;
43 } 43 }
44 44
45 void RemoteFrame::createView() 45 void RemoteFrame::createView()
46 { 46 {
47 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); 47 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this);
48 setView(view); 48 setView(view);
49 49
50 if (ownerRenderer()) { 50 if (ownerRenderer()) {
51 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); 51 HTMLFrameOwnerElement* owner = deprecatedLocalOwner();
52 ASSERT(owner); 52 ASSERT(owner);
53 owner->setWidget(view); 53 owner->setWidget(view);
54 } 54 }
55 } 55 }
56 56
57 RemoteFrameClient* RemoteFrame::remoteFrameClient() const 57 RemoteFrameClient* RemoteFrame::remoteFrameClient() const
58 { 58 {
59 return static_cast<RemoteFrameClient*>(client()); 59 return static_cast<RemoteFrameClient*>(client());
60 } 60 }
61 61
62 } // namespace blink 62 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698