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

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

Issue 10532058: added gpu_benchmarking_extension boilerplate and hooked it up to a new switch. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed merge conflict Created 8 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
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | no next file » | 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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "content/public/renderer/content_renderer_client.h" 46 #include "content/public/renderer/content_renderer_client.h"
47 #include "content/public/renderer/render_process_observer.h" 47 #include "content/public/renderer/render_process_observer.h"
48 #include "content/public/renderer/render_view_visitor.h" 48 #include "content/public/renderer/render_view_visitor.h"
49 #include "content/renderer/browser_plugin/browser_plugin_channel_manager.h" 49 #include "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
50 #include "content/renderer/browser_plugin/browser_plugin_registry.h" 50 #include "content/renderer/browser_plugin/browser_plugin_registry.h"
51 #include "content/renderer/devtools_agent_filter.h" 51 #include "content/renderer/devtools_agent_filter.h"
52 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" 52 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
53 #include "content/renderer/dom_storage/webstoragearea_impl.h" 53 #include "content/renderer/dom_storage/webstoragearea_impl.h"
54 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 54 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
55 #include "content/renderer/gpu/compositor_thread.h" 55 #include "content/renderer/gpu/compositor_thread.h"
56 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
56 #include "content/renderer/media/audio_input_message_filter.h" 57 #include "content/renderer/media/audio_input_message_filter.h"
57 #include "content/renderer/media/audio_message_filter.h" 58 #include "content/renderer/media/audio_message_filter.h"
58 #include "content/renderer/media/media_stream_center.h" 59 #include "content/renderer/media/media_stream_center.h"
59 #include "content/renderer/media/video_capture_impl_manager.h" 60 #include "content/renderer/media/video_capture_impl_manager.h"
60 #include "content/renderer/media/video_capture_message_filter.h" 61 #include "content/renderer/media/video_capture_message_filter.h"
61 #include "content/renderer/plugin_channel_host.h" 62 #include "content/renderer/plugin_channel_host.h"
62 #include "content/renderer/render_process_impl.h" 63 #include "content/renderer/render_process_impl.h"
63 #include "content/renderer/render_view_impl.h" 64 #include "content/renderer/render_view_impl.h"
64 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 65 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
65 #include "grit/content_resources.h" 66 #include "grit/content_resources.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 audio_message_filter_ = new AudioMessageFilter(); 235 audio_message_filter_ = new AudioMessageFilter();
235 AddFilter(audio_message_filter_.get()); 236 AddFilter(audio_message_filter_.get());
236 237
237 devtools_agent_message_filter_ = new DevToolsAgentFilter(); 238 devtools_agent_message_filter_ = new DevToolsAgentFilter();
238 AddFilter(devtools_agent_message_filter_.get()); 239 AddFilter(devtools_agent_message_filter_.get());
239 240
240 AddFilter(new IndexedDBMessageFilter); 241 AddFilter(new IndexedDBMessageFilter);
241 242
242 content::GetContentClient()->renderer()->RenderThreadStarted(); 243 content::GetContentClient()->renderer()->RenderThreadStarted();
243 244
245 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
246 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking))
247 RegisterExtension(content::GpuBenchmarkingExtension::Get());
248
244 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS) 249 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
245 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
246 WebKit::WebCompositor::setAcceleratedAnimationEnabled( 250 WebKit::WebCompositor::setAcceleratedAnimationEnabled(
247 !command_line.HasSwitch(switches::kDisableThreadedAnimation)); 251 !command_line.HasSwitch(switches::kDisableThreadedAnimation));
248 WebKit::WebCompositor::setPerTilePaintingEnabled( 252 WebKit::WebCompositor::setPerTilePaintingEnabled(
249 command_line.HasSwitch(switches::kEnablePerTilePainting)); 253 command_line.HasSwitch(switches::kEnablePerTilePainting));
250 WebKit::WebCompositor::setPartialSwapEnabled( 254 WebKit::WebCompositor::setPartialSwapEnabled(
251 command_line.HasSwitch(switches::kEnablePartialSwap)); 255 command_line.HasSwitch(switches::kEnablePartialSwap));
252 #endif 256 #endif
253 257
254 // Note that under Linux, the media library will normally already have 258 // Note that under Linux, the media library will normally already have
255 // been initialized by the Zygote before this instance became a Renderer. 259 // been initialized by the Zygote before this instance became a Renderer.
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 1000
997 scoped_refptr<base::MessageLoopProxy> 1001 scoped_refptr<base::MessageLoopProxy>
998 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1002 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
999 DCHECK(message_loop() == MessageLoop::current()); 1003 DCHECK(message_loop() == MessageLoop::current());
1000 if (!file_thread_.get()) { 1004 if (!file_thread_.get()) {
1001 file_thread_.reset(new base::Thread("Renderer::FILE")); 1005 file_thread_.reset(new base::Thread("Renderer::FILE"));
1002 file_thread_->Start(); 1006 file_thread_->Start();
1003 } 1007 }
1004 return file_thread_->message_loop_proxy(); 1008 return file_thread_->message_loop_proxy();
1005 } 1009 }
OLDNEW
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698