| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index bcda1f2ad737531600992ea3e0bfaa399bda0064..ca66ee3c5c3942bfa2628652d0a2a1c9e66b80b2 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -1112,9 +1112,9 @@ RenderThreadImpl::GetGpuFactories() {
|
| scoped_refptr<base::MessageLoopProxy> media_loop_proxy =
|
| GetMediaThreadMessageLoopProxy();
|
| if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) {
|
| - if (!gpu_va_context_provider_ ||
|
| + if (!gpu_va_context_provider_.get() ||
|
| gpu_va_context_provider_->DestroyedOnMainThread()) {
|
| - if (!gpu_channel_host) {
|
| + if (!gpu_channel_host.get()) {
|
| gpu_channel_host = EstablishGpuChannelSync(
|
| CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE);
|
| }
|
| @@ -1132,9 +1132,9 @@ RenderThreadImpl::GetGpuFactories() {
|
| "GPU-VideoAccelerator-Offscreen");
|
| }
|
| }
|
| - if (gpu_va_context_provider_) {
|
| + if (gpu_va_context_provider_.get()) {
|
| gpu_factories = RendererGpuVideoAcceleratorFactories::Create(
|
| - gpu_channel_host, media_loop_proxy, gpu_va_context_provider_);
|
| + gpu_channel_host.get(), media_loop_proxy, gpu_va_context_provider_);
|
| }
|
| return gpu_factories;
|
| }
|
| @@ -1159,7 +1159,7 @@ RenderThreadImpl::CreateOffscreenContext3d() {
|
| scoped_refptr<webkit::gpu::ContextProviderWebContext>
|
| RenderThreadImpl::SharedMainThreadContextProvider() {
|
| DCHECK(IsMainThread());
|
| - if (!shared_main_thread_contexts_ ||
|
| + if (!shared_main_thread_contexts_.get() ||
|
| shared_main_thread_contexts_->DestroyedOnMainThread()) {
|
| shared_main_thread_contexts_ = NULL;
|
| #if defined(OS_ANDROID)
|
| @@ -1169,11 +1169,11 @@ RenderThreadImpl::SharedMainThreadContextProvider() {
|
| GetOffscreenAttribs(), "Offscreen-MainThread");
|
| }
|
| #endif
|
| - if (!shared_main_thread_contexts_) {
|
| + if (!shared_main_thread_contexts_.get()) {
|
| shared_main_thread_contexts_ = ContextProviderCommandBuffer::Create(
|
| CreateOffscreenContext3d(), "Offscreen-MainThread");
|
| }
|
| - if (shared_main_thread_contexts_ &&
|
| + if (shared_main_thread_contexts_.get() &&
|
| !shared_main_thread_contexts_->BindToCurrentThread())
|
| shared_main_thread_contexts_ = NULL;
|
| }
|
|
|