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/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2958 #endif // defined(OS_ANDROID) | 2958 #endif // defined(OS_ANDROID) |
2959 | 2959 |
2960 scoped_refptr<media::AudioRendererSink> sink; | 2960 scoped_refptr<media::AudioRendererSink> sink; |
2961 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2961 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2962 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> | 2962 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> |
2963 CreateInput(routing_id_); | 2963 CreateInput(routing_id_); |
2964 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); | 2964 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); |
2965 } | 2965 } |
2966 | 2966 |
2967 scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories = | 2967 scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories = |
2968 RenderThreadImpl::current()->GetGpuFactories(); | 2968 RenderThreadImpl::current()->GetGpuFactories( |
| 2969 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()); |
2969 | 2970 |
2970 WebMediaPlayerParams params( | 2971 WebMediaPlayerParams params( |
2971 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 2972 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
2972 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2973 base::Bind(&ContentRendererClient::DeferMediaLoad, |
2973 base::Unretained(GetContentClient()->renderer()), | 2974 base::Unretained(GetContentClient()->renderer()), |
2974 static_cast<RenderView*>(this)), | 2975 static_cast<RenderView*>(this)), |
2975 sink, | 2976 sink, |
2976 gpu_factories, | 2977 gpu_factories, |
2977 new RenderMediaLog()); | 2978 new RenderMediaLog()); |
2978 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); | 2979 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); |
(...skipping 3791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6770 WebURL url = icon_urls[i].iconURL(); | 6771 WebURL url = icon_urls[i].iconURL(); |
6771 if (!url.isEmpty()) | 6772 if (!url.isEmpty()) |
6772 urls.push_back(FaviconURL(url, | 6773 urls.push_back(FaviconURL(url, |
6773 ToFaviconType(icon_urls[i].iconType()))); | 6774 ToFaviconType(icon_urls[i].iconType()))); |
6774 } | 6775 } |
6775 SendUpdateFaviconURL(urls); | 6776 SendUpdateFaviconURL(urls); |
6776 } | 6777 } |
6777 | 6778 |
6778 | 6779 |
6779 } // namespace content | 6780 } // namespace content |
OLD | NEW |