| 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 2991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3002 return CreateAndroidWebMediaPlayer(frame, url, client); | 3002 return CreateAndroidWebMediaPlayer(frame, url, client); |
| 3003 #else | 3003 #else |
| 3004 scoped_refptr<media::AudioRendererSink> sink; | 3004 scoped_refptr<media::AudioRendererSink> sink; |
| 3005 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) { | 3005 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) { |
| 3006 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> | 3006 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> |
| 3007 CreateInput(routing_id_); | 3007 CreateInput(routing_id_); |
| 3008 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); | 3008 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); |
| 3009 } | 3009 } |
| 3010 | 3010 |
| 3011 WebMediaPlayerParams params( | 3011 WebMediaPlayerParams params( |
| 3012 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | |
| 3013 base::Bind(&ContentRendererClient::DeferMediaLoad, | 3012 base::Bind(&ContentRendererClient::DeferMediaLoad, |
| 3014 base::Unretained(GetContentClient()->renderer()), | 3013 base::Unretained(GetContentClient()->renderer()), |
| 3015 static_cast<RenderFrame*>(render_frame)), | 3014 static_cast<RenderFrame*>(render_frame)), |
| 3016 sink, | 3015 sink); |
| 3017 RenderThreadImpl::current()->GetGpuFactories(), | |
| 3018 new RenderMediaLog()); | |
| 3019 return new WebMediaPlayerImpl(this, frame, client, AsWeakPtr(), params); | 3016 return new WebMediaPlayerImpl(this, frame, client, AsWeakPtr(), params); |
| 3020 #endif // defined(OS_ANDROID) | 3017 #endif // defined(OS_ANDROID) |
| 3021 } | 3018 } |
| 3022 | 3019 |
| 3023 WebCookieJar* RenderViewImpl::cookieJar(WebFrame* frame) { | 3020 WebCookieJar* RenderViewImpl::cookieJar(WebFrame* frame) { |
| 3024 return &cookie_jar_; | 3021 return &cookie_jar_; |
| 3025 } | 3022 } |
| 3026 | 3023 |
| 3027 void RenderViewImpl::didAccessInitialDocument(WebFrame* frame) { | 3024 void RenderViewImpl::didAccessInitialDocument(WebFrame* frame) { |
| 3028 // Notify the browser process that it is no longer safe to show the pending | 3025 // Notify the browser process that it is no longer safe to show the pending |
| (...skipping 3407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6436 for (size_t i = 0; i < icon_urls.size(); i++) { | 6433 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6437 WebURL url = icon_urls[i].iconURL(); | 6434 WebURL url = icon_urls[i].iconURL(); |
| 6438 if (!url.isEmpty()) | 6435 if (!url.isEmpty()) |
| 6439 urls.push_back(FaviconURL(url, | 6436 urls.push_back(FaviconURL(url, |
| 6440 ToFaviconType(icon_urls[i].iconType()))); | 6437 ToFaviconType(icon_urls[i].iconType()))); |
| 6441 } | 6438 } |
| 6442 SendUpdateFaviconURL(urls); | 6439 SendUpdateFaviconURL(urls); |
| 6443 } | 6440 } |
| 6444 | 6441 |
| 6445 } // namespace content | 6442 } // namespace content |
| OLD | NEW |