| 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 2933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2944 #endif // defined(OS_ANDROID) | 2944 #endif // defined(OS_ANDROID) |
| 2945 | 2945 |
| 2946 scoped_refptr<media::AudioRendererSink> sink; | 2946 scoped_refptr<media::AudioRendererSink> sink; |
| 2947 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2947 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
| 2948 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> | 2948 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> |
| 2949 CreateInput(routing_id_); | 2949 CreateInput(routing_id_); |
| 2950 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); | 2950 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); |
| 2951 } | 2951 } |
| 2952 | 2952 |
| 2953 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories = | 2953 scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories = |
| 2954 RenderThreadImpl::current()->GetGpuFactories(); | 2954 RenderThreadImpl::current()->GetGpuFactories( |
| 2955 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()); |
| 2955 | 2956 |
| 2956 WebMediaPlayerParams params( | 2957 WebMediaPlayerParams params( |
| 2957 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 2958 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
| 2958 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2959 base::Bind(&ContentRendererClient::DeferMediaLoad, |
| 2959 base::Unretained(GetContentClient()->renderer()), | 2960 base::Unretained(GetContentClient()->renderer()), |
| 2960 static_cast<RenderView*>(this)), | 2961 static_cast<RenderView*>(this)), |
| 2961 sink, | 2962 sink, |
| 2962 gpu_factories, | 2963 gpu_factories, |
| 2963 new RenderMediaLog()); | 2964 new RenderMediaLog()); |
| 2964 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); | 2965 return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params); |
| (...skipping 3782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6747 WebURL url = icon_urls[i].iconURL(); | 6748 WebURL url = icon_urls[i].iconURL(); |
| 6748 if (!url.isEmpty()) | 6749 if (!url.isEmpty()) |
| 6749 urls.push_back(FaviconURL(url, | 6750 urls.push_back(FaviconURL(url, |
| 6750 ToFaviconType(icon_urls[i].iconType()))); | 6751 ToFaviconType(icon_urls[i].iconType()))); |
| 6751 } | 6752 } |
| 6752 SendUpdateFaviconURL(urls); | 6753 SendUpdateFaviconURL(urls); |
| 6753 } | 6754 } |
| 6754 | 6755 |
| 6755 | 6756 |
| 6756 } // namespace content | 6757 } // namespace content |
| OLD | NEW |