diff options
author | kenrb@chromium.org <kenrb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:21:55 +0000 |
---|---|---|
committer | kenrb@chromium.org <kenrb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:21:55 +0000 |
commit | 95d3182359968c2ede57e70e05b80d93ccdf2bf5 (patch) | |
tree | 896a720387bb30a39756d151575049a13a8e652a /content/renderer/browser_plugin/browser_plugin.cc | |
parent | 9e9ae7296cfed7bfc612b0e3eeef7ad0c936b1ba (diff) | |
download | chromium_src-95d3182359968c2ede57e70e05b80d93ccdf2bf5.zip chromium_src-95d3182359968c2ede57e70e05b80d93ccdf2bf5.tar.gz chromium_src-95d3182359968c2ede57e70e05b80d93ccdf2bf5.tar.bz2 |
Adding RenderWidgetHostViewChildFrame for OOPIF view.
RenderWidgetHostViewChildFrame becomes the view class for child frames being
rendered in a different process from their parent. CrossProcessFrameConnector
is a supporting class for that, encapsulating state specific to the
parent/child frame relationship.
RenderWidgetHostViewGuest is made a subclass of RenderWidgetHostViewChildFrame
in order to keep them synchronized. Gradually we will move all functionality
from RWHVGuest to RWHVChildFrame and then get rid of RWHVGuest altogether.
TBR=sadrul
BUG=325803
Review URL: https://codereview.chromium.org/100473010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/browser_plugin/browser_plugin.cc')
-rw-r--r-- | content/renderer/browser_plugin/browser_plugin.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 5f88fe1..eb67048 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -432,15 +432,14 @@ void BrowserPlugin::OnAttachACK( } void BrowserPlugin::OnBuffersSwapped( - int guest_instance_id, - const BrowserPluginMsg_BuffersSwapped_Params& params) { - DCHECK(guest_instance_id == guest_instance_id_); + int instance_id, + const FrameMsg_BuffersSwapped_Params& params) { EnableCompositing(true); compositing_helper_->OnBuffersSwapped(params.size, params.mailbox_name, - params.route_id, - params.host_id, + params.gpu_route_id, + params.gpu_host_id, GetDeviceScaleFactor()); } @@ -449,13 +448,13 @@ void BrowserPlugin::OnCompositorFrameSwapped(const IPC::Message& message) { if (!BrowserPluginMsg_CompositorFrameSwapped::Read(&message, ¶m)) return; scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); - param.b.AssignTo(frame.get()); + param.b.frame.AssignTo(frame.get()); EnableCompositing(true); compositing_helper_->OnCompositorFrameSwapped(frame.Pass(), - param.c /* route_id */, - param.d /* output_surface_id */, - param.e /* host_id */); + param.b.producing_route_id, + param.b.output_surface_id, + param.b.producing_host_id); } void BrowserPlugin::OnCopyFromCompositingSurface(int guest_instance_id, |