Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2389 // from the perspective of the audio renderer. | 2389 // from the perspective of the audio renderer. |
| 2390 audio_source_provider = new RenderAudioSourceProvider(); | 2390 audio_source_provider = new RenderAudioSourceProvider(); |
| 2391 | 2391 |
| 2392 // Add the chrome specific audio renderer, using audio_source_provider | 2392 // Add the chrome specific audio renderer, using audio_source_provider |
| 2393 // as the sink. | 2393 // as the sink. |
| 2394 media::AudioRendererImpl* audio_renderer = | 2394 media::AudioRendererImpl* audio_renderer = |
| 2395 new media::AudioRendererImpl(audio_source_provider); | 2395 new media::AudioRendererImpl(audio_source_provider); |
| 2396 collection->AddAudioRenderer(audio_renderer); | 2396 collection->AddAudioRenderer(audio_renderer); |
| 2397 } | 2397 } |
| 2398 | 2398 |
| 2399 // Accelerated video decode is not enabled by default on Linux. | 2399 bool use_accelerated_video_decode = true; |
| 2400 // crbug.com/137247 | |
| 2401 bool use_accelerated_video_decode = false; | |
| 2402 #if defined(OS_CHROMEOS) | |
| 2403 use_accelerated_video_decode = true; | |
| 2404 #endif | |
| 2405 use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( | 2400 use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( |
| 2406 switches::kDisableAcceleratedVideoDecode); | 2401 switches::kDisableAcceleratedVideoDecode); |
|
Ami GONE FROM CHROMIUM
2012/08/17 04:14:00
My point is that now that everything goes via flag
Zhenyao Mo
2012/08/17 17:16:17
Done.
| |
| 2407 WebGraphicsContext3DCommandBufferImpl* context3d = | 2402 WebGraphicsContext3DCommandBufferImpl* context3d = |
| 2408 use_accelerated_video_decode ? | 2403 use_accelerated_video_decode ? |
| 2409 RenderThreadImpl::current()->GetGpuVDAContext3D() : | 2404 RenderThreadImpl::current()->GetGpuVDAContext3D() : |
| 2410 NULL; | 2405 NULL; |
| 2411 if (context3d) { | 2406 if (context3d) { |
| 2412 scoped_refptr<base::MessageLoopProxy> factories_loop = | 2407 scoped_refptr<base::MessageLoopProxy> factories_loop = |
| 2413 RenderThreadImpl::current()->compositor_thread() ? | 2408 RenderThreadImpl::current()->compositor_thread() ? |
| 2414 RenderThreadImpl::current()->compositor_thread()->GetWebThread() | 2409 RenderThreadImpl::current()->compositor_thread()->GetWebThread() |
| 2415 ->message_loop()->message_loop_proxy() : | 2410 ->message_loop()->message_loop_proxy() : |
| 2416 base::MessageLoopProxy::current(); | 2411 base::MessageLoopProxy::current(); |
| (...skipping 3378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5795 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5790 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5796 return !!RenderThreadImpl::current()->compositor_thread(); | 5791 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5797 } | 5792 } |
| 5798 | 5793 |
| 5799 void RenderViewImpl::OnJavaBridgeInit() { | 5794 void RenderViewImpl::OnJavaBridgeInit() { |
| 5800 DCHECK(!java_bridge_dispatcher_); | 5795 DCHECK(!java_bridge_dispatcher_); |
| 5801 #if defined(ENABLE_JAVA_BRIDGE) | 5796 #if defined(ENABLE_JAVA_BRIDGE) |
| 5802 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5797 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5803 #endif | 5798 #endif |
| 5804 } | 5799 } |
| OLD | NEW |