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

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

Issue 520213002: Make SecurityContext available in RemoteFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review feedback from Daniel, expose securityOrigin() from WebFrame 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
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 "web/WebRemoteFrameImpl.h" 6 #include "web/WebRemoteFrameImpl.h"
7 7
8 #include "core/frame/FrameView.h" 8 #include "core/frame/FrameView.h"
9 #include "core/frame/RemoteFrame.h" 9 #include "core/frame/RemoteFrame.h"
10 #include "core/frame/Settings.h" 10 #include "core/frame/Settings.h"
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 842
843 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const 843 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
844 { 844 {
845 ASSERT(source); 845 ASSERT(source);
846 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); 846 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source);
847 client()->initializeChildFrame( 847 client()->initializeChildFrame(
848 localFrameImpl->frame()->view()->frameRect(), 848 localFrameImpl->frame()->view()->frameRect(),
849 localFrameImpl->frame()->view()->visibleContentScaleFactor()); 849 localFrameImpl->frame()->view()->visibleContentScaleFactor());
850 } 850 }
851 851
852 WebSecurityOrigin WebRemoteFrameImpl::securityOrigin() const
853 {
854 return WebSecurityOrigin(frame()->securityContext()->securityOrigin());
855 }
856
857 void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) co nst
858 {
859 ASSERT(frame());
860 frame()->securityContext()->setReplicatedOrigin(origin);
861 }
862
852 } // namespace blink 863 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698