Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 15993018: Reland: Use a shared thread for media operations (round 3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/shell/renderer/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2894 matching lines...) Expand 10 before | Expand all | Expand 10 after
2905 if (!factories_loop.get()) 2905 if (!factories_loop.get())
2906 factories_loop = base::MessageLoopProxy::current(); 2906 factories_loop = base::MessageLoopProxy::current();
2907 GpuChannelHost* gpu_channel_host = 2907 GpuChannelHost* gpu_channel_host =
2908 RenderThreadImpl::current()->EstablishGpuChannelSync( 2908 RenderThreadImpl::current()->EstablishGpuChannelSync(
2909 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); 2909 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2910 gpu_factories = new RendererGpuVideoDecoderFactories( 2910 gpu_factories = new RendererGpuVideoDecoderFactories(
2911 gpu_channel_host, factories_loop, context3d); 2911 gpu_channel_host, factories_loop, context3d);
2912 } 2912 }
2913 2913
2914 webkit_media::WebMediaPlayerParams params( 2914 webkit_media::WebMediaPlayerParams params(
2915 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
2915 sink, gpu_factories, new RenderMediaLog()); 2916 sink, gpu_factories, new RenderMediaLog());
2916 WebMediaPlayer* media_player = 2917 WebMediaPlayer* media_player =
2917 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2918 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2918 this, frame, client, AsWeakPtr(), params); 2919 this, frame, client, AsWeakPtr(), params);
2919 if (!media_player) { 2920 if (!media_player) {
2920 media_player = new webkit_media::WebMediaPlayerImpl( 2921 media_player = new webkit_media::WebMediaPlayerImpl(
2921 frame, client, AsWeakPtr(), params); 2922 frame, client, AsWeakPtr(), params);
2922 } 2923 }
2923 return media_player; 2924 return media_player;
2924 } 2925 }
(...skipping 3795 matching lines...) Expand 10 before | Expand all | Expand 10 after
6720 WebURL url = icon_urls[i].iconURL(); 6721 WebURL url = icon_urls[i].iconURL();
6721 if (!url.isEmpty()) 6722 if (!url.isEmpty())
6722 urls.push_back(FaviconURL(url, 6723 urls.push_back(FaviconURL(url,
6723 ToFaviconType(icon_urls[i].iconType()))); 6724 ToFaviconType(icon_urls[i].iconType())));
6724 } 6725 }
6725 SendUpdateFaviconURL(urls); 6726 SendUpdateFaviconURL(urls);
6726 } 6727 }
6727 6728
6728 6729
6729 } // namespace content 6730 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/shell/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698