| 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 2733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2744 if (!factories_loop) | 2744 if (!factories_loop) |
| 2745 factories_loop = base::MessageLoopProxy::current(); | 2745 factories_loop = base::MessageLoopProxy::current(); |
| 2746 GpuChannelHost* gpu_channel_host = | 2746 GpuChannelHost* gpu_channel_host = |
| 2747 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2747 RenderThreadImpl::current()->EstablishGpuChannelSync( |
| 2748 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2748 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
| 2749 gpu_factories = new RendererGpuVideoDecoderFactories( | 2749 gpu_factories = new RendererGpuVideoDecoderFactories( |
| 2750 gpu_channel_host, factories_loop, context3d); | 2750 gpu_channel_host, factories_loop, context3d); |
| 2751 } | 2751 } |
| 2752 | 2752 |
| 2753 webkit_media::WebMediaPlayerParams params( | 2753 webkit_media::WebMediaPlayerParams params( |
| 2754 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
| 2754 sink, gpu_factories, new RenderMediaLog()); | 2755 sink, gpu_factories, new RenderMediaLog()); |
| 2755 WebMediaPlayer* media_player = | 2756 WebMediaPlayer* media_player = |
| 2756 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( | 2757 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| 2757 this, frame, client, AsWeakPtr(), params); | 2758 this, frame, client, AsWeakPtr(), params); |
| 2758 if (!media_player) { | 2759 if (!media_player) { |
| 2759 media_player = new webkit_media::WebMediaPlayerImpl( | 2760 media_player = new webkit_media::WebMediaPlayerImpl( |
| 2760 frame, client, AsWeakPtr(), params); | 2761 frame, client, AsWeakPtr(), params); |
| 2761 } | 2762 } |
| 2762 return media_player; | 2763 return media_player; |
| 2763 } | 2764 } |
| (...skipping 3762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6526 WebURL url = icon_urls[i].iconURL(); | 6527 WebURL url = icon_urls[i].iconURL(); |
| 6527 if (!url.isEmpty()) | 6528 if (!url.isEmpty()) |
| 6528 urls.push_back(FaviconURL(url, | 6529 urls.push_back(FaviconURL(url, |
| 6529 ToFaviconType(icon_urls[i].iconType()))); | 6530 ToFaviconType(icon_urls[i].iconType()))); |
| 6530 } | 6531 } |
| 6531 SendUpdateFaviconURL(urls); | 6532 SendUpdateFaviconURL(urls); |
| 6532 } | 6533 } |
| 6533 | 6534 |
| 6534 | 6535 |
| 6535 } // namespace content | 6536 } // namespace content |
| OLD | NEW |