diff options
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.cc | 2 | ||||
| -rw-r--r-- | content/renderer/child_frame_compositing_helper.cc | 8 | ||||
| -rw-r--r-- | content/renderer/child_frame_compositing_helper.h | 2 | ||||
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 3d20a6e..974c3b0 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -437,7 +437,7 @@ void BrowserPlugin::OnBuffersSwapped( EnableCompositing(true); compositing_helper_->OnBuffersSwapped(params.size, - params.mailbox, + params.mailbox_name, params.gpu_route_id, params.gpu_host_id, GetDeviceScaleFactor()); diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc index cc3bc50..15cf383 100644 --- a/content/renderer/child_frame_compositing_helper.cc +++ b/content/renderer/child_frame_compositing_helper.cc @@ -246,10 +246,12 @@ void ChildFrameCompositingHelper::MailboxReleased(SwapBuffersInfo mailbox, ack_pending_ = false; switch (mailbox.type) { case TEXTURE_IMAGE_TRANSPORT: { + std::string mailbox_name(reinterpret_cast<const char*>(mailbox.name.name), + sizeof(mailbox.name.name)); FrameHostMsg_BuffersSwappedACK_Params params; params.gpu_host_id = mailbox.host_id; params.gpu_route_id = mailbox.route_id; - params.mailbox = mailbox.name; + params.mailbox_name = mailbox_name; params.sync_point = sync_point; SendBuffersSwappedACKToBrowser(params); break; @@ -376,12 +378,12 @@ void ChildFrameCompositingHelper::OnBuffersSwappedPrivate( void ChildFrameCompositingHelper::OnBuffersSwapped( const gfx::Size& size, - const gpu::Mailbox& mailbox, + const std::string& mailbox_name, int gpu_route_id, int gpu_host_id, float device_scale_factor) { SwapBuffersInfo swap_info; - swap_info.name = mailbox; + swap_info.name.SetName(reinterpret_cast<const int8*>(mailbox_name.data())); swap_info.type = TEXTURE_IMAGE_TRANSPORT; swap_info.size = size; swap_info.route_id = gpu_route_id; diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h index 1ec0585..686d9a2 100644 --- a/content/renderer/child_frame_compositing_helper.h +++ b/content/renderer/child_frame_compositing_helper.h @@ -69,7 +69,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper void EnableCompositing(bool); void OnContainerDestroy(); void OnBuffersSwapped(const gfx::Size& size, - const gpu::Mailbox& mailbox, + const std::string& mailbox_name, int gpu_route_id, int gpu_host_id, float device_scale_factor); diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index af5e0d5..1b13f68 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -487,7 +487,7 @@ void RenderFrameImpl::OnBuffersSwapped( } compositing_helper_->OnBuffersSwapped( params.size, - params.mailbox, + params.mailbox_name, params.gpu_route_id, params.gpu_host_id, render_view_->GetWebView()->deviceScaleFactor()); |