Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2301)

Unified Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 100473010: Adding RenderWidgetHostViewChildFrame for OOPIF view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: constructor rated explicit Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 5f88fe142f983c74d932b0af5751c0780b168056..eb670487440de9b038f4ab295c33046d7a3b69c1 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, &param))
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,
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin.h ('k') | content/renderer/browser_plugin/browser_plugin_compositing_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698