| Index: services/ui/surfaces/surfaces_context_provider.cc
|
| diff --git a/services/ui/surfaces/surfaces_context_provider.cc b/services/ui/surfaces/surfaces_context_provider.cc
|
| index e07ee591b365c503e56412d1f5334e3d116225fb..c2957b8ca473b813277f3cd89fbcc643234352c9 100644
|
| --- a/services/ui/surfaces/surfaces_context_provider.cc
|
| +++ b/services/ui/surfaces/surfaces_context_provider.cc
|
| @@ -29,7 +29,9 @@ namespace ui {
|
| SurfacesContextProvider::SurfacesContextProvider(
|
| gfx::AcceleratedWidget widget,
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel)
|
| - : delegate_(nullptr), widget_(widget) {
|
| + : delegate_(nullptr),
|
| + widget_(widget),
|
| + task_runner_(base::ThreadTaskRunnerHandle::Get()) {
|
| gpu::CommandBufferProxyImpl* shared_command_buffer = nullptr;
|
| gpu::GpuStreamId stream_id = gpu::GpuStreamId::GPU_STREAM_DEFAULT;
|
| gpu::GpuStreamPriority stream_priority = gpu::GpuStreamPriority::NORMAL;
|
| @@ -42,11 +44,9 @@ SurfacesContextProvider::SurfacesContextProvider(
|
| attributes.bind_generates_resource = false;
|
| attributes.lose_context_when_out_of_memory = true;
|
| GURL active_url;
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner =
|
| - base::ThreadTaskRunnerHandle::Get();
|
| command_buffer_proxy_impl_ = gpu::CommandBufferProxyImpl::Create(
|
| std::move(gpu_channel), widget, shared_command_buffer, stream_id,
|
| - stream_priority, attributes, active_url, task_runner);
|
| + stream_priority, attributes, active_url, task_runner_);
|
| CHECK(command_buffer_proxy_impl_);
|
| command_buffer_proxy_impl_->SetSwapBuffersCompletionCallback(
|
| base::Bind(&SurfacesContextProvider::OnGpuSwapBuffersCompleted,
|
| @@ -94,7 +94,7 @@ bool SurfacesContextProvider::BindToCurrentThread() {
|
| bind_generates_resource, lose_context_when_out_of_memory,
|
| support_client_side_arrays, gpu_control));
|
| cache_controller_.reset(
|
| - new cc::ContextCacheController(implementation_.get()));
|
| + new cc::ContextCacheController(implementation_.get(), task_runner_));
|
| return implementation_->Initialize(
|
| default_limits.start_transfer_buffer_size,
|
| default_limits.min_transfer_buffer_size,
|
|
|