| Index: content/browser/gpu/gpu_process_host_ui_shim.cc
|
| diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| index a7c5b20bd8d8c2127622a58d2b07a9f2393802ce..d1c87767d9c78e87b145e48457cbf062431896d1 100644
|
| --- a/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| @@ -249,18 +249,16 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
|
| content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
|
| params.surface_id);
|
| base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
|
| - CAContextID ca_context_id = params.ca_context_id;
|
| -
|
| DCHECK((params.ca_context_id == 0) ^
|
| (params.io_surface.get() == MACH_PORT_NULL));
|
| if (params.io_surface.get()) {
|
| io_surface.reset(IOSurfaceLookupFromMachPort(params.io_surface));
|
| }
|
|
|
| - ui::AcceleratedWidgetMacGotFrame(native_widget, ca_context_id, io_surface,
|
| - params.size, params.scale_factor,
|
| - &ack_params.vsync_timebase,
|
| - &ack_params.vsync_interval);
|
| + ui::AcceleratedWidgetMacGotFrame(
|
| + native_widget, params.ca_context_id, io_surface, params.use_detached,
|
| + params.detached_ca_context_id, params.size, params.scale_factor,
|
| + &ack_params.vsync_timebase, &ack_params.vsync_interval);
|
| } else {
|
| TRACE_EVENT0("browser", "Skipping recycled surface frame");
|
| }
|
|
|