| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 8cf559524e05d3ec6781cfacfa776ce2d2952718..55a89e94624281f5dba9a3c175c839233a9c5de3 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -1444,7 +1444,7 @@ RenderThreadImpl::SharedMainThreadContextProvider() {
|
| return shared_main_thread_contexts_;
|
|
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync(
|
| - CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
|
| + CAUSE_FOR_GPU_LAUNCH_RENDERER_SHARED_MAIN_THREAD_CONTEXT));
|
| if (!gpu_channel_host) {
|
| shared_main_thread_contexts_ = nullptr;
|
| return nullptr;
|
| @@ -1791,11 +1791,9 @@ RenderThreadImpl::GetPeerConnectionDependencyFactory() {
|
|
|
| gpu::GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
|
| if (!gpu_channel_)
|
| - return NULL;
|
| -
|
| + return nullptr;
|
| if (gpu_channel_->IsLost())
|
| - return NULL;
|
| -
|
| + return nullptr;
|
| return gpu_channel_.get();
|
| }
|
|
|
| @@ -1941,7 +1939,7 @@ RenderThreadImpl::SharedWorkerContextProvider() {
|
| }
|
|
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync(
|
| - CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
|
| + CAUSE_FOR_GPU_LAUNCH_SHARED_WORKER_THREAD_CONTEXT));
|
| if (!gpu_channel_host) {
|
| shared_worker_context_provider_ = nullptr;
|
| return shared_worker_context_provider_;
|
|
|