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 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2367 media::FilterCollection* collection = new media::FilterCollection(); | 2367 media::FilterCollection* collection = new media::FilterCollection(); |
2368 RenderMediaLog* render_media_log = new RenderMediaLog(); | 2368 RenderMediaLog* render_media_log = new RenderMediaLog(); |
2369 | 2369 |
2370 RenderAudioSourceProvider* audio_source_provider = NULL; | 2370 RenderAudioSourceProvider* audio_source_provider = NULL; |
2371 | 2371 |
2372 // Add in any custom filter factories first. | 2372 // Add in any custom filter factories first. |
2373 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 2373 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
2374 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2374 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2375 // audio_source_provider is a "provider" to WebKit, and a sink | 2375 // audio_source_provider is a "provider" to WebKit, and a sink |
2376 // from the perspective of the audio renderer. | 2376 // from the perspective of the audio renderer. |
2377 audio_source_provider = new RenderAudioSourceProvider(); | 2377 audio_source_provider = new RenderAudioSourceProvider(this); |
2378 | 2378 |
2379 // Add the chrome specific audio renderer, using audio_source_provider | 2379 // Add the chrome specific audio renderer, using audio_source_provider |
2380 // as the sink. | 2380 // as the sink. |
2381 media::AudioRendererImpl* audio_renderer = | 2381 media::AudioRendererImpl* audio_renderer = |
2382 new media::AudioRendererImpl(audio_source_provider); | 2382 new media::AudioRendererImpl(audio_source_provider); |
2383 collection->AddAudioRenderer(audio_renderer); | 2383 collection->AddAudioRenderer(audio_renderer); |
2384 } | 2384 } |
2385 | 2385 |
2386 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = | 2386 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = |
2387 !CommandLine::ForCurrentProcess()->HasSwitch( | 2387 !CommandLine::ForCurrentProcess()->HasSwitch( |
(...skipping 3329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5717 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5717 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5718 return !!RenderThreadImpl::current()->compositor_thread(); | 5718 return !!RenderThreadImpl::current()->compositor_thread(); |
5719 } | 5719 } |
5720 | 5720 |
5721 void RenderViewImpl::OnJavaBridgeInit() { | 5721 void RenderViewImpl::OnJavaBridgeInit() { |
5722 DCHECK(!java_bridge_dispatcher_); | 5722 DCHECK(!java_bridge_dispatcher_); |
5723 #if defined(ENABLE_JAVA_BRIDGE) | 5723 #if defined(ENABLE_JAVA_BRIDGE) |
5724 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5724 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5725 #endif | 5725 #endif |
5726 } | 5726 } |
OLD | NEW |