Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 10834019: Don't crash when a context can't be created for HW video decode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 } else { 765 } else {
766 gpu_vda_context3d_.reset(); 766 gpu_vda_context3d_.reset();
767 } 767 }
768 } 768 }
769 if (!gpu_vda_context3d_.get()) { 769 if (!gpu_vda_context3d_.get()) {
770 gpu_vda_context3d_.reset( 770 gpu_vda_context3d_.reset(
771 WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( 771 WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
772 this, WebKit::WebGraphicsContext3D::Attributes(), 772 this, WebKit::WebGraphicsContext3D::Attributes(),
773 GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D"))); 773 GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D")));
774 } 774 }
775 if (!gpu_vda_context3d_.get())
776 return base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>();
775 return gpu_vda_context3d_->AsWeakPtr(); 777 return gpu_vda_context3d_->AsWeakPtr();
776 } 778 }
777 779
778 content::AudioRendererMixerManager* 780 content::AudioRendererMixerManager*
779 RenderThreadImpl::GetAudioRendererMixerManager() { 781 RenderThreadImpl::GetAudioRendererMixerManager() {
780 if (!audio_renderer_mixer_manager_.get()) { 782 if (!audio_renderer_mixer_manager_.get()) {
781 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager( 783 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager(
782 audio_hardware::GetOutputSampleRate(), 784 audio_hardware::GetOutputSampleRate(),
783 audio_hardware::GetOutputBufferSize())); 785 audio_hardware::GetOutputBufferSize()));
784 } 786 }
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 1064
1063 scoped_refptr<base::MessageLoopProxy> 1065 scoped_refptr<base::MessageLoopProxy>
1064 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1066 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
1065 DCHECK(message_loop() == MessageLoop::current()); 1067 DCHECK(message_loop() == MessageLoop::current());
1066 if (!file_thread_.get()) { 1068 if (!file_thread_.get()) {
1067 file_thread_.reset(new base::Thread("Renderer::FILE")); 1069 file_thread_.reset(new base::Thread("Renderer::FILE"));
1068 file_thread_->Start(); 1070 file_thread_->Start();
1069 } 1071 }
1070 return file_thread_->message_loop_proxy(); 1072 return file_thread_->message_loop_proxy();
1071 } 1073 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698