| 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/FrameOwner.h" | 8 #include "core/frame/FrameOwner.h" |
| 9 #include "core/frame/RemoteFrame.h" | 9 #include "core/frame/RemoteFrame.h" |
| 10 #include "core/page/Page.h" | 10 #include "core/page/Page.h" |
| (...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 ASSERT_NOT_REACHED(); | 777 ASSERT_NOT_REACHED(); |
| 778 return false; | 778 return false; |
| 779 } | 779 } |
| 780 | 780 |
| 781 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const | 781 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const |
| 782 { | 782 { |
| 783 ASSERT_NOT_REACHED(); | 783 ASSERT_NOT_REACHED(); |
| 784 return WebString(); | 784 return WebString(); |
| 785 } | 785 } |
| 786 | 786 |
| 787 void WebRemoteFrameImpl::requestManifest(WebManifestRequest&) const |
| 788 { |
| 789 ASSERT_NOT_REACHED(); |
| 790 } |
| 791 |
| 787 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebFr
ameClient* client) | 792 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebFr
ameClient* client) |
| 788 { | 793 { |
| 789 WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client)
); | 794 WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client)
); |
| 790 HashMap<WebFrame*, OwnPtr<FrameOwner> >::AddResult result = | 795 HashMap<WebFrame*, OwnPtr<FrameOwner> >::AddResult result = |
| 791 m_ownersForChildren.add(child, adoptPtr(new RemoteBridgeFrameOwner(child
))); | 796 m_ownersForChildren.add(child, adoptPtr(new RemoteBridgeFrameOwner(child
))); |
| 792 appendChild(child); | 797 appendChild(child); |
| 793 // FIXME: currently this calls LocalFrame::init() on the created LocalFrame,
which may | 798 // FIXME: currently this calls LocalFrame::init() on the created LocalFrame,
which may |
| 794 // result in the browser observing two navigations to about:blank (one from
the initial | 799 // result in the browser observing two navigations to about:blank (one from
the initial |
| 795 // frame creation, and one from swapping it into the remote process). FrameL
oader might | 800 // frame creation, and one from swapping it into the remote process). FrameL
oader might |
| 796 // need a special initialization function for this case to avoid that duplic
ate navigation. | 801 // need a special initialization function for this case to avoid that duplic
ate navigation. |
| (...skipping 27 matching lines...) Expand all Loading... |
| 824 | 829 |
| 825 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) | 830 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) |
| 826 { | 831 { |
| 827 if (!frame.client()) | 832 if (!frame.client()) |
| 828 return 0; | 833 return 0; |
| 829 return static_cast<RemoteFrameClient*>(frame.client())->webFrame(); | 834 return static_cast<RemoteFrameClient*>(frame.client())->webFrame(); |
| 830 } | 835 } |
| 831 | 836 |
| 832 } // namespace blink | 837 } // namespace blink |
| 833 | 838 |
| OLD | NEW |