diff options
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_impl.h | 2 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_mac.cc | 4 | ||||
| -rw-r--r-- | content/common/plugin_messages.h | 2 | ||||
| -rw-r--r-- | content/common/view_messages.h | 2 | ||||
| -rw-r--r-- | content/plugin/webplugin_proxy.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/webplugin_delegate_proxy.cc | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 9480602..5942911 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -489,7 +489,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, int32 height, TransportDIB::Handle transport_dib); void OnAcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window, - uint64 surface_id); + uint64 surface_handle); #endif #if defined(TOOLKIT_USES_GTK) void OnMsgCreatePluginContainer(gfx::PluginWindowHandle id); diff --git a/content/browser/renderer_host/render_widget_host_mac.cc b/content/browser/renderer_host/render_widget_host_mac.cc index 7ecbb93..34b7f69 100644 --- a/content/browser/renderer_host/render_widget_host_mac.cc +++ b/content/browser/renderer_host/render_widget_host_mac.cc @@ -63,14 +63,14 @@ void RenderWidgetHostImpl::OnAcceleratedSurfaceSetTransportDIB( } void RenderWidgetHostImpl::OnAcceleratedSurfaceBuffersSwapped( - gfx::PluginWindowHandle window, uint64 surface_id) { + gfx::PluginWindowHandle window, uint64 surface_handle) { if (view_) { // This code path could be updated to implement flow control for // updating of accelerated plugins as well. However, if we add support // for composited plugins then this is not necessary. GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params; params.window = window; - params.surface_id = surface_id; + params.surface_handle = surface_handle; view_->AcceleratedSurfaceBuffersSwapped(params, 0); } } diff --git a/content/common/plugin_messages.h b/content/common/plugin_messages.h index bffd992..689ac6e 100644 --- a/content/common/plugin_messages.h +++ b/content/common/plugin_messages.h @@ -440,7 +440,7 @@ IPC_MESSAGE_ROUTED1(PluginHostMsg_FreeTransportDIB, // the various plug-ins' contents. IPC_MESSAGE_ROUTED2(PluginHostMsg_AcceleratedSurfaceBuffersSwapped, gfx::PluginWindowHandle /* window */, - uint64 /* surface_id */) + uint64 /* surface_handle */) //---------------------------------------------------------------------- // New Core Animation plugin implementation rendering via compositor. diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 239c6c8..1681b14 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -1862,7 +1862,7 @@ IPC_MESSAGE_ROUTED4(ViewHostMsg_AcceleratedSurfaceSetIOSurface, // contents. IPC_MESSAGE_ROUTED2(ViewHostMsg_AcceleratedSurfaceBuffersSwapped, gfx::PluginWindowHandle /* window */, - uint64 /* surface_id */) + uint64 /* surface_handle */) #endif // Opens a file asynchronously. The response returns a file descriptor diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 0b88233..919f847 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -685,9 +685,9 @@ WebPluginAcceleratedSurface* WebPluginProxy::GetAcceleratedSurface( } void WebPluginProxy::AcceleratedFrameBuffersDidSwap( - gfx::PluginWindowHandle window, uint64 surface_id) { + gfx::PluginWindowHandle window, uint64 surface_handle) { Send(new PluginHostMsg_AcceleratedSurfaceBuffersSwapped( - route_id_, window, surface_id)); + route_id_, window, surface_handle)); } void WebPluginProxy::SetAcceleratedSurface( diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b1cd5f1..a1097c3 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -4913,9 +4913,9 @@ void RenderViewImpl::AcceleratedSurfaceFreeTransportDIB( } void RenderViewImpl::AcceleratedSurfaceBuffersSwapped( - gfx::PluginWindowHandle window, uint64 surface_id) { + gfx::PluginWindowHandle window, uint64 surface_handle) { Send(new ViewHostMsg_AcceleratedSurfaceBuffersSwapped( - routing_id(), window, surface_id)); + routing_id(), window, surface_handle)); } #endif diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index ca04b66..3f34dce 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -1408,9 +1408,9 @@ void WebPluginDelegateProxy::OnAcceleratedSurfaceFreeTransportDIB( } void WebPluginDelegateProxy::OnAcceleratedSurfaceBuffersSwapped( - gfx::PluginWindowHandle window, uint64 surface_id) { + gfx::PluginWindowHandle window, uint64 surface_handle) { if (render_view_) - render_view_->AcceleratedSurfaceBuffersSwapped(window, surface_id); + render_view_->AcceleratedSurfaceBuffersSwapped(window, surface_handle); } void WebPluginDelegateProxy::OnAcceleratedPluginEnabledRendering() { |