| 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 2549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2560 new media::MessageLoopFactory(); | 2560 new media::MessageLoopFactory(); |
| 2561 media::FilterCollection* collection = new media::FilterCollection(); | 2561 media::FilterCollection* collection = new media::FilterCollection(); |
| 2562 RenderMediaLog* render_media_log = new RenderMediaLog(); | 2562 RenderMediaLog* render_media_log = new RenderMediaLog(); |
| 2563 | 2563 |
| 2564 RenderAudioSourceProvider* audio_source_provider = NULL; | 2564 RenderAudioSourceProvider* audio_source_provider = NULL; |
| 2565 | 2565 |
| 2566 // Add in any custom filter factories first. | 2566 // Add in any custom filter factories first. |
| 2567 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2567 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
| 2568 // audio_source_provider is a "provider" to WebKit, and a sink | 2568 // audio_source_provider is a "provider" to WebKit, and a sink |
| 2569 // from the perspective of the audio renderer. | 2569 // from the perspective of the audio renderer. |
| 2570 audio_source_provider = new RenderAudioSourceProvider(); | 2570 audio_source_provider = new RenderAudioSourceProvider(routing_id_); |
| 2571 | 2571 |
| 2572 // Add the chrome specific audio renderer, using audio_source_provider | 2572 // Add the chrome specific audio renderer, using audio_source_provider |
| 2573 // as the sink. | 2573 // as the sink. |
| 2574 media::AudioRendererImpl* audio_renderer = | 2574 media::AudioRendererImpl* audio_renderer = |
| 2575 new media::AudioRendererImpl(audio_source_provider); | 2575 new media::AudioRendererImpl(audio_source_provider); |
| 2576 collection->AddAudioRenderer(audio_renderer); | 2576 collection->AddAudioRenderer(audio_renderer); |
| 2577 } | 2577 } |
| 2578 | 2578 |
| 2579 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 2579 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
| 2580 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 2580 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
| (...skipping 3859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6440 } | 6440 } |
| 6441 #endif | 6441 #endif |
| 6442 | 6442 |
| 6443 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6443 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
| 6444 TransportDIB::Handle dib_handle) { | 6444 TransportDIB::Handle dib_handle) { |
| 6445 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6445 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6446 RenderProcess::current()->ReleaseTransportDIB(dib); | 6446 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6447 } | 6447 } |
| 6448 | 6448 |
| 6449 } // namespace content | 6449 } // namespace content |
| OLD | NEW |