| Index: content/browser/renderer_host/render_widget_host_view_mac.mm
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| index 3300a410880c083f6b021cc73f49c10477f050a0..46a5c4f670390a265a410f800f434017951a4488 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -884,13 +884,17 @@ void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped(
|
| [view drawView];
|
| }
|
|
|
| - if (params.renderer_id != 0 || params.route_id != 0) {
|
| - AcknowledgeSwapBuffers(params.renderer_id,
|
| - params.route_id,
|
| - gpu_host_id);
|
| + if (params.route_id != 0) {
|
| + RenderWidgetHost::AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
|
| }
|
| }
|
|
|
| +void RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer(
|
| + const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
|
| + int gpu_host_id) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| void RenderWidgetHostViewMac::UpdateRootGpuViewVisibility(
|
| bool show_gpu_widget) {
|
| // Plugins are destroyed on page navigate. The compositor layer on the other
|
| @@ -920,26 +924,6 @@ void RenderWidgetHostViewMac::HandleDelayedGpuViewHiding() {
|
| }
|
| }
|
|
|
| -void RenderWidgetHostViewMac::AcknowledgeSwapBuffers(
|
| - int renderer_id,
|
| - int32 route_id,
|
| - int gpu_host_id) {
|
| - TRACE_EVENT0("gpu", "RenderWidgetHostViewMac::AcknowledgeSwapBuffers");
|
| - // Called on the display link thread. Hand actual work off to the IO thread,
|
| - // because |GpuProcessHost::Get()| can only be called there.
|
| - // Currently, this is never called for plugins.
|
| - if (render_widget_host_) {
|
| - DCHECK_EQ(render_widget_host_->process()->GetID(), renderer_id);
|
| - // |render_widget_host_->routing_id()| and |route_id| are usually not
|
| - // equal: The former identifies the channel from the RWH in the browser
|
| - // process to the corresponding render widget in the renderer process, while
|
| - // the latter identifies the channel from the GpuCommandBufferStub in the
|
| - // GPU process to the corresponding command buffer client in the renderer.
|
| -
|
| - render_widget_host_->AcknowledgeSwapBuffers(route_id, gpu_host_id);
|
| - }
|
| -}
|
| -
|
| void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() {
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| bool activated = GetRenderWidgetHost()->is_accelerated_compositing_active();
|
|
|