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 2939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2950 #endif // defined(OS_ANDROID) | 2950 #endif // defined(OS_ANDROID) |
2951 | 2951 |
2952 scoped_refptr<media::AudioRendererSink> sink; | 2952 scoped_refptr<media::AudioRendererSink> sink; |
2953 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2953 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2954 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> | 2954 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> |
2955 CreateInput(routing_id_); | 2955 CreateInput(routing_id_); |
2956 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); | 2956 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); |
2957 } | 2957 } |
2958 | 2958 |
2959 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories = | 2959 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories = |
2960 RenderThreadImpl::current()->GetGpuFactories(); | 2960 RenderThreadImpl::current()->GetGpuFactories( |
| 2961 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()); |
2961 | 2962 |
2962 WebMediaPlayerParams params( | 2963 WebMediaPlayerParams params( |
2963 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 2964 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
2964 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2965 base::Bind(&ContentRendererClient::DeferMediaLoad, |
2965 base::Unretained(GetContentClient()->renderer()), | 2966 base::Unretained(GetContentClient()->renderer()), |
2966 static_cast<RenderView*>(this)), | 2967 static_cast<RenderView*>(this)), |
2967 sink, | 2968 sink, |
2968 gpu_factories, | 2969 gpu_factories, |
2969 new RenderMediaLog()); | 2970 new RenderMediaLog()); |
2970 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); | 2971 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); |
(...skipping 3847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6818 WebURL url = icon_urls[i].iconURL(); | 6819 WebURL url = icon_urls[i].iconURL(); |
6819 if (!url.isEmpty()) | 6820 if (!url.isEmpty()) |
6820 urls.push_back(FaviconURL(url, | 6821 urls.push_back(FaviconURL(url, |
6821 ToFaviconType(icon_urls[i].iconType()))); | 6822 ToFaviconType(icon_urls[i].iconType()))); |
6822 } | 6823 } |
6823 SendUpdateFaviconURL(urls); | 6824 SendUpdateFaviconURL(urls); |
6824 } | 6825 } |
6825 | 6826 |
6826 | 6827 |
6827 } // namespace content | 6828 } // namespace content |
OLD | NEW |