| 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 2406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2417 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>(); | 2417 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>(); |
| 2418 if (context3d) { | 2418 if (context3d) { |
| 2419 MessageLoop* factories_loop = | 2419 MessageLoop* factories_loop = |
| 2420 RenderThreadImpl::current()->compositor_thread() ? | 2420 RenderThreadImpl::current()->compositor_thread() ? |
| 2421 RenderThreadImpl::current()->compositor_thread()->GetWebThread() | 2421 RenderThreadImpl::current()->compositor_thread()->GetWebThread() |
| 2422 ->message_loop() : | 2422 ->message_loop() : |
| 2423 MessageLoop::current(); | 2423 MessageLoop::current(); |
| 2424 GpuChannelHost* gpu_channel_host = | 2424 GpuChannelHost* gpu_channel_host = |
| 2425 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2425 RenderThreadImpl::current()->EstablishGpuChannelSync( |
| 2426 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2426 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
| 2427 collection->AddVideoDecoder(new media::GpuVideoDecoder( | 2427 collection->GetVideoDecoders().push_back(new media::GpuVideoDecoder( |
| 2428 message_loop_factory->GetMessageLoop("GpuVideoDecoder"), | 2428 message_loop_factory->GetMessageLoop("GpuVideoDecoder"), |
| 2429 factories_loop, | 2429 factories_loop, |
| 2430 new RendererGpuVideoDecoderFactories( | 2430 new RendererGpuVideoDecoderFactories( |
| 2431 gpu_channel_host, factories_loop, context3d))); | 2431 gpu_channel_host, factories_loop, context3d))); |
| 2432 } | 2432 } |
| 2433 | 2433 |
| 2434 WebMediaPlayer* media_player = | 2434 WebMediaPlayer* media_player = |
| 2435 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( | 2435 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| 2436 this, frame, client, AsWeakPtr(), collection, audio_source_provider, | 2436 this, frame, client, AsWeakPtr(), collection, audio_source_provider, |
| 2437 audio_source_provider, message_loop_factory, media_stream_impl_, | 2437 audio_source_provider, message_loop_factory, media_stream_impl_, |
| (...skipping 3336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5774 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5774 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5775 return !!RenderThreadImpl::current()->compositor_thread(); | 5775 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5776 } | 5776 } |
| 5777 | 5777 |
| 5778 void RenderViewImpl::OnJavaBridgeInit() { | 5778 void RenderViewImpl::OnJavaBridgeInit() { |
| 5779 DCHECK(!java_bridge_dispatcher_); | 5779 DCHECK(!java_bridge_dispatcher_); |
| 5780 #if defined(ENABLE_JAVA_BRIDGE) | 5780 #if defined(ENABLE_JAVA_BRIDGE) |
| 5781 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5781 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5782 #endif | 5782 #endif |
| 5783 } | 5783 } |
| OLD | NEW |