| 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 2592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2603 new media::MessageLoopFactory(); | 2603 new media::MessageLoopFactory(); |
| 2604 media::FilterCollection* collection = new media::FilterCollection(); | 2604 media::FilterCollection* collection = new media::FilterCollection(); |
| 2605 RenderMediaLog* render_media_log = new RenderMediaLog(); | 2605 RenderMediaLog* render_media_log = new RenderMediaLog(); |
| 2606 | 2606 |
| 2607 RenderAudioSourceProvider* audio_source_provider = NULL; | 2607 RenderAudioSourceProvider* audio_source_provider = NULL; |
| 2608 | 2608 |
| 2609 // Add in any custom filter factories first. | 2609 // Add in any custom filter factories first. |
| 2610 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2610 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
| 2611 // audio_source_provider is a "provider" to WebKit, and a sink | 2611 // audio_source_provider is a "provider" to WebKit, and a sink |
| 2612 // from the perspective of the audio renderer. | 2612 // from the perspective of the audio renderer. |
| 2613 audio_source_provider = new RenderAudioSourceProvider(); | 2613 audio_source_provider = new RenderAudioSourceProvider(routing_id_); |
| 2614 | 2614 |
| 2615 // Add the chrome specific audio renderer, using audio_source_provider | 2615 // Add the chrome specific audio renderer, using audio_source_provider |
| 2616 // as the sink. | 2616 // as the sink. |
| 2617 media::AudioRendererImpl* audio_renderer = | 2617 media::AudioRendererImpl* audio_renderer = |
| 2618 new media::AudioRendererImpl(audio_source_provider); | 2618 new media::AudioRendererImpl(audio_source_provider); |
| 2619 collection->AddAudioRenderer(audio_renderer); | 2619 collection->AddAudioRenderer(audio_renderer); |
| 2620 } | 2620 } |
| 2621 | 2621 |
| 2622 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; | 2622 WebGraphicsContext3DCommandBufferImpl* context3d = NULL; |
| 2623 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 2623 if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
| (...skipping 3729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6353 | 6353 |
| 6354 updating_frame_tree_ = true; | 6354 updating_frame_tree_ = true; |
| 6355 active_frame_id_map_.clear(); | 6355 active_frame_id_map_.clear(); |
| 6356 | 6356 |
| 6357 target_process_id_ = process_id; | 6357 target_process_id_ = process_id; |
| 6358 target_routing_id_ = route_id; | 6358 target_routing_id_ = route_id; |
| 6359 CreateFrameTree(webview()->mainFrame(), frames); | 6359 CreateFrameTree(webview()->mainFrame(), frames); |
| 6360 | 6360 |
| 6361 updating_frame_tree_ = false; | 6361 updating_frame_tree_ = false; |
| 6362 } | 6362 } |
| OLD | NEW |