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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2568 new media::MessageLoopFactory(); | 2568 new media::MessageLoopFactory(); |
2569 media::FilterCollection* collection = new media::FilterCollection(); | 2569 media::FilterCollection* collection = new media::FilterCollection(); |
2570 RenderMediaLog* render_media_log = new RenderMediaLog(); | 2570 RenderMediaLog* render_media_log = new RenderMediaLog(); |
2571 | 2571 |
2572 RenderAudioSourceProvider* audio_source_provider = NULL; | 2572 RenderAudioSourceProvider* audio_source_provider = NULL; |
2573 | 2573 |
2574 // Add in any custom filter factories first. | 2574 // Add in any custom filter factories first. |
2575 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2575 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2576 // audio_source_provider is a "provider" to WebKit, and a sink | 2576 // audio_source_provider is a "provider" to WebKit, and a sink |
2577 // from the perspective of the audio renderer. | 2577 // from the perspective of the audio renderer. |
2578 audio_source_provider = new RenderAudioSourceProvider(); | 2578 audio_source_provider = new RenderAudioSourceProvider(routing_id_); |
2579 | 2579 |
2580 // Add the chrome specific audio renderer, using audio_source_provider | 2580 // Add the chrome specific audio renderer, using audio_source_provider |
2581 // as the sink. | 2581 // as the sink. |
2582 media::AudioRendererImpl* audio_renderer = | 2582 media::AudioRendererImpl* audio_renderer = |
2583 new media::AudioRendererImpl(audio_source_provider); | 2583 new media::AudioRendererImpl(audio_source_provider); |
2584 collection->AddAudioRenderer(audio_renderer); | 2584 collection->AddAudioRenderer(audio_renderer); |
2585 } | 2585 } |
2586 | 2586 |
2587 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 2587 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
2588 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 2588 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
(...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6438 } | 6438 } |
6439 #endif | 6439 #endif |
6440 | 6440 |
6441 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6441 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6442 TransportDIB::Handle dib_handle) { | 6442 TransportDIB::Handle dib_handle) { |
6443 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6443 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6444 RenderProcess::current()->ReleaseTransportDIB(dib); | 6444 RenderProcess::current()->ReleaseTransportDIB(dib); |
6445 } | 6445 } |
6446 | 6446 |
6447 } // namespace content | 6447 } // namespace content |
OLD | NEW |