diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 03:30:12 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 03:30:12 +0000 |
| commit | 82307f6b304d5049d360db170b256bd4afe5eec9 (patch) | |
| tree | 01112e9779660819c126ac3f133949dff8d50365 /content/renderer/render_thread_impl.cc | |
| parent | 354de9e4ee84df3b177f6c57752a1a16daedb84e (diff) | |
| download | chromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.zip chromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.tar.gz chromium_src-82307f6b304d5049d360db170b256bd4afe5eec9.tar.bz2 | |
Start using RenderFrameProxyHost objects.
Instantiate RenderFrameProxyHost objects for remote frames when using
--site-per-process.
BUG=357747, 399709, 399775, 400594
TBR=kenrb, creis, kalman
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287557
Review URL: https://codereview.chromium.org/444503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.cc')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index e652d22..d0db6f8 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -47,6 +47,7 @@ #include "content/common/content_constants_internal.h" #include "content/common/database_messages.h" #include "content/common/dom_storage/dom_storage_messages.h" +#include "content/common/frame_messages.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/client/gpu_memory_buffer_impl.h" @@ -90,6 +91,7 @@ #include "content/renderer/media/webrtc_identity_service.h" #include "content/renderer/net_info_helper.h" #include "content/renderer/p2p/socket_dispatcher.h" +#include "content/renderer/render_frame_proxy.h" #include "content/renderer/render_process_impl.h" #include "content/renderer/render_view_impl.h" #include "content/renderer/renderer_webkitplatformsupport_impl.h" @@ -1306,13 +1308,6 @@ void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { notify_webkit_of_modal_loop_ = false; } -void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, - const std::string& host, - double zoom_level) { - RenderViewZoomer zoomer(scheme, host, zoom_level); - RenderView::ForEach(&zoomer); -} - bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { ObserverListBase<RenderProcessObserver>::Iterator it(observers_); RenderProcessObserver* observer; @@ -1330,6 +1325,8 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderThreadImpl, msg) + IPC_MESSAGE_HANDLER(FrameMsg_NewFrame, OnCreateNewFrame) + IPC_MESSAGE_HANDLER(FrameMsg_NewFrameProxy, OnCreateNewFrameProxy) IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForCurrentURL, OnSetZoomLevelForCurrentURL) // TODO(port): removed from render_messages_internal.h; @@ -1352,6 +1349,24 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { return handled; } +void RenderThreadImpl::OnCreateNewFrame(int routing_id, int parent_routing_id) { + RenderFrameImpl::CreateFrame(routing_id, parent_routing_id); +} + +void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, + int parent_routing_id, + int render_view_routing_id) { + RenderFrameProxy::CreateFrameProxy( + routing_id, parent_routing_id, render_view_routing_id); +} + +void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, + const std::string& host, + double zoom_level) { + RenderViewZoomer zoomer(scheme, host, zoom_level); + RenderView::ForEach(&zoomer); +} + void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { EnsureWebKitInitialized(); // When bringing in render_view, also bring in webkit's glue and jsbindings. @@ -1486,7 +1501,6 @@ void RenderThreadImpl::OnUpdateTimezone() { NotifyTimezoneChange(); } - #if defined(OS_ANDROID) void RenderThreadImpl::OnSetWebKitSharedTimersSuspended(bool suspend) { if (suspend_webkit_shared_timer_) { |