| 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 2608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2619 new media::MessageLoopFactory(); | 2619 new media::MessageLoopFactory(); |
| 2620 media::FilterCollection* collection = new media::FilterCollection(); | 2620 media::FilterCollection* collection = new media::FilterCollection(); |
| 2621 RenderMediaLog* render_media_log = new RenderMediaLog(); | 2621 RenderMediaLog* render_media_log = new RenderMediaLog(); |
| 2622 | 2622 |
| 2623 RenderAudioSourceProvider* audio_source_provider = NULL; | 2623 RenderAudioSourceProvider* audio_source_provider = NULL; |
| 2624 | 2624 |
| 2625 // Add in any custom filter factories first. | 2625 // Add in any custom filter factories first. |
| 2626 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2626 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
| 2627 // audio_source_provider is a "provider" to WebKit, and a sink | 2627 // audio_source_provider is a "provider" to WebKit, and a sink |
| 2628 // from the perspective of the audio renderer. | 2628 // from the perspective of the audio renderer. |
| 2629 audio_source_provider = new RenderAudioSourceProvider(); | 2629 audio_source_provider = new RenderAudioSourceProvider(routing_id_); |
| 2630 | 2630 |
| 2631 // Add the chrome specific audio renderer, using audio_source_provider | 2631 // Add the chrome specific audio renderer, using audio_source_provider |
| 2632 // as the sink. | 2632 // as the sink. |
| 2633 media::AudioRendererImpl* audio_renderer = | 2633 media::AudioRendererImpl* audio_renderer = |
| 2634 new media::AudioRendererImpl(audio_source_provider); | 2634 new media::AudioRendererImpl(audio_source_provider); |
| 2635 collection->AddAudioRenderer(audio_renderer); | 2635 collection->AddAudioRenderer(audio_renderer); |
| 2636 } | 2636 } |
| 2637 | 2637 |
| 2638 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 2638 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
| 2639 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 2639 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
| (...skipping 3804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6444 transport_dib->id())); | 6444 transport_dib->id())); |
| 6445 | 6445 |
| 6446 return true; | 6446 return true; |
| 6447 } | 6447 } |
| 6448 | 6448 |
| 6449 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6449 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
| 6450 TransportDIB::Handle dib_handle) { | 6450 TransportDIB::Handle dib_handle) { |
| 6451 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6451 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6452 RenderProcess::current()->ReleaseTransportDIB(dib); | 6452 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6453 } | 6453 } |
| OLD | NEW |