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

Side by Side Diff: Source/web/WebFrame.cpp

Issue 520213002: Make SecurityContext available in RemoteFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 1 month 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/RemoteFrame.cpp ('k') | Source/web/WebRemoteFrameImpl.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 "public/web/WebFrame.h" 6 #include "public/web/WebFrame.h"
7 7
8 #include "core/frame/FrameHost.h" 8 #include "core/frame/FrameHost.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/RemoteFrame.h" 10 #include "core/frame/RemoteFrame.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 92
93 return true; 93 return true;
94 } 94 }
95 95
96 void WebFrame::detach() 96 void WebFrame::detach()
97 { 97 {
98 toCoreFrame(this)->detach(); 98 toCoreFrame(this)->detach();
99 } 99 }
100 100
101 WebSecurityOrigin WebFrame::securityOrigin() const
102 {
103 return WebSecurityOrigin(toCoreFrame(this)->securityContext()->securityOrigi n());
104 }
105
101 WebFrame* WebFrame::opener() const 106 WebFrame* WebFrame::opener() const
102 { 107 {
103 return m_opener; 108 return m_opener;
104 } 109 }
105 110
106 void WebFrame::setOpener(WebFrame* opener) 111 void WebFrame::setOpener(WebFrame* opener)
107 { 112 {
108 if (m_opener) 113 if (m_opener)
109 m_opener->m_openedFrameTracker->remove(this); 114 m_opener->m_openedFrameTracker->remove(this);
110 if (opener) 115 if (opener)
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 } 278 }
274 279
275 void WebFrame::clearWeakFrames(Visitor* visitor) 280 void WebFrame::clearWeakFrames(Visitor* visitor)
276 { 281 {
277 if (!isFrameAlive(visitor, m_opener)) 282 if (!isFrameAlive(visitor, m_opener))
278 m_opener = nullptr; 283 m_opener = nullptr;
279 } 284 }
280 #endif 285 #endif
281 286
282 } // namespace blink 287 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/RemoteFrame.cpp ('k') | Source/web/WebRemoteFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698