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

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

Issue 242103007: NOT FOR REVIEW - prioritize fonts Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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/renderer_high_priority_task_queue.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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/debugger.h" 7 #include "base/debug/debugger.h"
8 #include "base/debug/stack_trace.h" 8 #include "base/debug/stack_trace.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
14 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
15 #include "base/metrics/statistics_recorder.h" 16 #include "base/metrics/statistics_recorder.h"
16 #include "base/metrics/stats_counters.h" 17 #include "base/metrics/stats_counters.h"
17 #include "base/path_service.h" 18 #include "base/path_service.h"
18 #include "base/pending_task.h" 19 #include "base/pending_task.h"
19 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
20 #include "base/threading/platform_thread.h" 21 #include "base/threading/platform_thread.h"
21 #include "base/time/time.h" 22 #include "base/time/time.h"
22 #include "base/timer/hi_res_timer_manager.h" 23 #include "base/timer/hi_res_timer_manager.h"
23 #include "content/child/child_process.h" 24 #include "content/child/child_process.h"
24 #include "content/child/content_child_helpers.h" 25 #include "content/child/content_child_helpers.h"
25 #include "content/common/content_constants_internal.h" 26 #include "content/common/content_constants_internal.h"
26 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
27 #include "content/public/common/main_function_params.h" 28 #include "content/public/common/main_function_params.h"
28 #include "content/public/renderer/content_renderer_client.h" 29 #include "content/public/renderer/content_renderer_client.h"
29 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 30 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
30 #include "content/renderer/pepper/pepper_plugin_registry.h" 31 #include "content/renderer/pepper/pepper_plugin_registry.h"
31 #include "content/renderer/render_process_impl.h" 32 #include "content/renderer/render_process_impl.h"
32 #include "content/renderer/render_thread_impl.h" 33 #include "content/renderer/render_thread_impl.h"
33 #include "content/renderer/renderer_main_platform_delegate.h" 34 #include "content/renderer/renderer_main_platform_delegate.h"
35
36 #include "content/renderer/renderer_high_priority_task_queue.h"
37
34 #include "ui/base/ui_base_switches.h" 38 #include "ui/base/ui_base_switches.h"
35 39
36 #if defined(OS_ANDROID) 40 #if defined(OS_ANDROID)
37 #include "base/android/sys_utils.h" 41 #include "base/android/sys_utils.h"
38 #include "third_party/skia/include/core/SkGraphics.h" 42 #include "third_party/skia/include/core/SkGraphics.h"
39 #endif // OS_ANDROID 43 #endif // OS_ANDROID
40 44
41 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
42 #include <Carbon/Carbon.h> 46 #include <Carbon/Carbon.h>
43 #include <signal.h> 47 #include <signal.h>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 163
160 RendererMessageLoopObserver task_observer; 164 RendererMessageLoopObserver task_observer;
161 #if defined(OS_MACOSX) 165 #if defined(OS_MACOSX)
162 // As long as scrollbars on Mac are painted with Cocoa, the message pump 166 // As long as scrollbars on Mac are painted with Cocoa, the message pump
163 // needs to be backed by a Foundation-level loop to process NSTimers. See 167 // needs to be backed by a Foundation-level loop to process NSTimers. See
164 // http://crbug.com/306348#c24 for details. 168 // http://crbug.com/306348#c24 for details.
165 scoped_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop()); 169 scoped_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
166 base::MessageLoop main_message_loop(pump.Pass()); 170 base::MessageLoop main_message_loop(pump.Pass());
167 #else 171 #else
168 // The main message loop of the renderer services doesn't have IO or UI tasks. 172 // The main message loop of the renderer services doesn't have IO or UI tasks.
169 base::MessageLoop main_message_loop; 173 content::MessageLoopRendererMainThread main_message_loop;
170 #endif 174 #endif
171 main_message_loop.AddTaskObserver(&task_observer); 175 main_message_loop.AddTaskObserver(&task_observer);
172 176
173 scoped_ptr<MemoryObserver> memory_observer; 177 scoped_ptr<MemoryObserver> memory_observer;
174 if (parsed_command_line.HasSwitch(switches::kMemoryMetrics)) { 178 if (parsed_command_line.HasSwitch(switches::kMemoryMetrics)) {
175 memory_observer.reset(new MemoryObserver()); 179 memory_observer.reset(new MemoryObserver());
176 main_message_loop.AddTaskObserver(memory_observer.get()); 180 main_message_loop.AddTaskObserver(memory_observer.get());
177 } 181 }
178 182
179 base::PlatformThread::SetName("CrRendererMain"); 183 base::PlatformThread::SetName("CrRendererMain");
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 base::MessageLoop::current()->Run(); 256 base::MessageLoop::current()->Run();
253 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 257 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
254 } 258 }
255 } 259 }
256 platform.PlatformUninitialize(); 260 platform.PlatformUninitialize();
257 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 261 TRACE_EVENT_END_ETW("RendererMain", 0, "");
258 return 0; 262 return 0;
259 } 263 }
260 264
261 } // namespace content 265 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_high_priority_task_queue.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698