Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 void WebRemoteFrameImpl::setReplicatedOrigin(const WebURL& origin, bool isUnique ) const | |
|
alexmos
2014/11/11 23:44:25
I don't like that this is taking the isUnique flag
dcheng
2014/11/12 21:55:50
We would probably do the conversion in content. Th
alexmos
2014/11/18 18:35:18
Thanks, I talked to Charlie also and ended up doin
| |
| 853 { | |
| 854 ASSERT(frame()); | |
| 855 | |
| 856 WebSecurityOrigin securityOrigin; | |
| 857 if (isUnique) | |
| 858 securityOrigin = WebSecurityOrigin::createUnique(); | |
| 859 else | |
| 860 securityOrigin = WebSecurityOrigin::create(origin); | |
| 861 frame()->securityContext()->setReplicatedOrigin(securityOrigin); | |
| 862 } | |
| 863 | |
| 852 } // namespace blink | 864 } // namespace blink |
| OLD | NEW |