Chromium Code Reviews| Index: Source/core/frame/RemoteFrame.cpp |
| diff --git a/Source/core/frame/RemoteFrame.cpp b/Source/core/frame/RemoteFrame.cpp |
| index 1b0e04e5b191d34055b23181db1a5b72f3ec9ea7..7660a99c66e680d2487d89b49eaac48a58c63bc3 100644 |
| --- a/Source/core/frame/RemoteFrame.cpp |
| +++ b/Source/core/frame/RemoteFrame.cpp |
| @@ -5,6 +5,7 @@ |
| #include "config.h" |
| #include "core/frame/RemoteFrame.h" |
| +#include "core/dom/RemoteSecurityContext.h" |
| #include "core/frame/RemoteFrameClient.h" |
| #include "core/frame/RemoteFrameView.h" |
| #include "core/html/HTMLFrameOwnerElement.h" |
| @@ -19,7 +20,9 @@ inline RemoteFrame::RemoteFrame(RemoteFrameClient* client, FrameHost* host, Fram |
| PassRefPtrWillBeRawPtr<RemoteFrame> RemoteFrame::create(RemoteFrameClient* client, FrameHost* host, FrameOwner* owner) |
| { |
| - return adoptRefWillBeNoop(new RemoteFrame(client, host, owner)); |
| + RefPtrWillBeRawPtr<RemoteFrame> frame = adoptRefWillBeNoop(new RemoteFrame(client, host, owner)); |
| + frame->m_securityContext = RemoteSecurityContext::create(); |
|
dcheng
2014/11/12 21:55:50
Should we move this into the constructor?
alexmos
2014/11/18 18:35:17
Yes, this will be cleaner. Not sure if the the in
|
| + return frame.release(); |
| } |
| RemoteFrame::~RemoteFrame() |
| @@ -55,6 +58,11 @@ void RemoteFrame::forwardInputEvent(Event* event) |
| remoteFrameClient()->forwardInputEvent(event); |
| } |
| +RemoteSecurityContext* RemoteFrame::securityContext() const |
| +{ |
| + return m_securityContext.get(); |
| +} |
| + |
| void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) |
| { |
| // Oilpan: as RemoteFrameView performs no finalization actions, |