| 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 2855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2866 if (!factories_loop.get()) | 2866 if (!factories_loop.get()) |
| 2867 factories_loop = base::MessageLoopProxy::current(); | 2867 factories_loop = base::MessageLoopProxy::current(); |
| 2868 GpuChannelHost* gpu_channel_host = | 2868 GpuChannelHost* gpu_channel_host = |
| 2869 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2869 RenderThreadImpl::current()->EstablishGpuChannelSync( |
| 2870 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2870 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
| 2871 gpu_factories = new RendererGpuVideoDecoderFactories( | 2871 gpu_factories = new RendererGpuVideoDecoderFactories( |
| 2872 gpu_channel_host, factories_loop, context3d); | 2872 gpu_channel_host, factories_loop, context3d); |
| 2873 } | 2873 } |
| 2874 | 2874 |
| 2875 webkit_media::WebMediaPlayerParams params( | 2875 webkit_media::WebMediaPlayerParams params( |
| 2876 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
| 2876 sink, gpu_factories, new RenderMediaLog()); | 2877 sink, gpu_factories, new RenderMediaLog()); |
| 2877 WebMediaPlayer* media_player = | 2878 WebMediaPlayer* media_player = |
| 2878 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( | 2879 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| 2879 this, frame, client, AsWeakPtr(), params); | 2880 this, frame, client, AsWeakPtr(), params); |
| 2880 if (!media_player) { | 2881 if (!media_player) { |
| 2881 media_player = new webkit_media::WebMediaPlayerImpl( | 2882 media_player = new webkit_media::WebMediaPlayerImpl( |
| 2882 frame, client, AsWeakPtr(), params); | 2883 frame, client, AsWeakPtr(), params); |
| 2883 } | 2884 } |
| 2884 return media_player; | 2885 return media_player; |
| 2885 } | 2886 } |
| (...skipping 3795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6681 WebURL url = icon_urls[i].iconURL(); | 6682 WebURL url = icon_urls[i].iconURL(); |
| 6682 if (!url.isEmpty()) | 6683 if (!url.isEmpty()) |
| 6683 urls.push_back(FaviconURL(url, | 6684 urls.push_back(FaviconURL(url, |
| 6684 ToFaviconType(icon_urls[i].iconType()))); | 6685 ToFaviconType(icon_urls[i].iconType()))); |
| 6685 } | 6686 } |
| 6686 SendUpdateFaviconURL(urls); | 6687 SendUpdateFaviconURL(urls); |
| 6687 } | 6688 } |
| 6688 | 6689 |
| 6689 | 6690 |
| 6690 } // namespace content | 6691 } // namespace content |
| OLD | NEW |