| 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 5981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5992 } else { | 5992 } else { |
| 5993 scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider = | 5993 scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider = |
| 5994 RenderThreadImpl::current()->SharedMainThreadContextProvider(); | 5994 RenderThreadImpl::current()->SharedMainThreadContextProvider(); |
| 5995 | 5995 |
| 5996 if (!context_provider.get()) { | 5996 if (!context_provider.get()) { |
| 5997 LOG(ERROR) << "Failed to get context3d for media player"; | 5997 LOG(ERROR) << "Failed to get context3d for media player"; |
| 5998 return NULL; | 5998 return NULL; |
| 5999 } | 5999 } |
| 6000 | 6000 |
| 6001 stream_texture_factory.reset(new StreamTextureFactoryImpl( | 6001 stream_texture_factory.reset(new StreamTextureFactoryImpl( |
| 6002 context_provider->WebContext3D(), gpu_channel_host, routing_id_)); | 6002 context_provider, gpu_channel_host, routing_id_)); |
| 6003 } | 6003 } |
| 6004 | 6004 |
| 6005 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android( | 6005 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android( |
| 6006 new WebMediaPlayerAndroid( | 6006 new WebMediaPlayerAndroid( |
| 6007 frame, | 6007 frame, |
| 6008 client, | 6008 client, |
| 6009 AsWeakPtr(), | 6009 AsWeakPtr(), |
| 6010 media_player_manager_, | 6010 media_player_manager_, |
| 6011 stream_texture_factory.release(), | 6011 stream_texture_factory.release(), |
| 6012 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 6012 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6264 for (size_t i = 0; i < icon_urls.size(); i++) { | 6264 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6265 WebURL url = icon_urls[i].iconURL(); | 6265 WebURL url = icon_urls[i].iconURL(); |
| 6266 if (!url.isEmpty()) | 6266 if (!url.isEmpty()) |
| 6267 urls.push_back(FaviconURL(url, | 6267 urls.push_back(FaviconURL(url, |
| 6268 ToFaviconType(icon_urls[i].iconType()))); | 6268 ToFaviconType(icon_urls[i].iconType()))); |
| 6269 } | 6269 } |
| 6270 SendUpdateFaviconURL(urls); | 6270 SendUpdateFaviconURL(urls); |
| 6271 } | 6271 } |
| 6272 | 6272 |
| 6273 } // namespace content | 6273 } // namespace content |
| OLD | NEW |