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

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

Issue 645623004: Reland "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 22 matching lines...) Expand all
33 // correct referrer, since it won't have access to the originDocument. Set i t now. 33 // correct referrer, since it won't have access to the originDocument. Set i t now.
34 ResourceRequest request(url); 34 ResourceRequest request(url);
35 Referrer referrer(SecurityPolicy::generateReferrerHeader(originDocument.refe rrerPolicy(), url, originDocument.outgoingReferrer()), originDocument.referrerPo licy()); 35 Referrer referrer(SecurityPolicy::generateReferrerHeader(originDocument.refe rrerPolicy(), url, originDocument.outgoingReferrer()), originDocument.referrerPo licy());
36 request.setHTTPReferrer(referrer); 36 request.setHTTPReferrer(referrer);
37 remoteFrameClient()->navigate(request, lockBackForwardList); 37 remoteFrameClient()->navigate(request, lockBackForwardList);
38 } 38 }
39 39
40 void RemoteFrame::detach() 40 void RemoteFrame::detach()
41 { 41 {
42 detachChildren(); 42 detachChildren();
43 m_host = nullptr; 43 Frame::detach();
44 } 44 }
45 45
46 void RemoteFrame::trace(Visitor* visitor) 46 void RemoteFrame::trace(Visitor* visitor)
47 { 47 {
48 visitor->trace(m_view); 48 visitor->trace(m_view);
49 Frame::trace(visitor); 49 Frame::trace(visitor);
50 } 50 }
51 51
52 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) 52 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view)
53 { 53 {
(...skipping 13 matching lines...) Expand all
67 owner->setWidget(view); 67 owner->setWidget(view);
68 } 68 }
69 } 69 }
70 70
71 RemoteFrameClient* RemoteFrame::remoteFrameClient() const 71 RemoteFrameClient* RemoteFrame::remoteFrameClient() const
72 { 72 {
73 return static_cast<RemoteFrameClient*>(client()); 73 return static_cast<RemoteFrameClient*>(client());
74 } 74 }
75 75
76 } // namespace blink 76 } // 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