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

Side by Side Diff: content/browser/android/content_startup_flags.cc

Issue 344703002: Revert of Remove EnableThreadedCompositing from the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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/browser/android/content_startup_flags.h" 5 #include "content/browser/android/content_startup_flags.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // internal code checks this directly, but it wouldn't normally get set when 49 // internal code checks this directly, but it wouldn't normally get set when
50 // we are implementing an embedded WebView. 50 // we are implementing an embedded WebView.
51 parsed_command_line->AppendSwitch(switches::kSingleProcess); 51 parsed_command_line->AppendSwitch(switches::kSingleProcess);
52 } else { 52 } else {
53 int default_maximum = RenderProcessHost::GetMaxRendererProcessCount(); 53 int default_maximum = RenderProcessHost::GetMaxRendererProcessCount();
54 DCHECK(default_maximum <= static_cast<int>(kMaxRendererProcessCount)); 54 DCHECK(default_maximum <= static_cast<int>(kMaxRendererProcessCount));
55 if (max_render_process_count < default_maximum) 55 if (max_render_process_count < default_maximum)
56 RenderProcessHost::SetMaxRendererProcessCount(max_render_process_count); 56 RenderProcessHost::SetMaxRendererProcessCount(max_render_process_count);
57 } 57 }
58 58
59 parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing);
59 parsed_command_line->AppendSwitch( 60 parsed_command_line->AppendSwitch(
60 switches::kEnableCompositingForFixedPosition); 61 switches::kEnableCompositingForFixedPosition);
61 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); 62 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll);
62 parsed_command_line->AppendSwitch(switches::kEnableBeginFrameScheduling); 63 parsed_command_line->AppendSwitch(switches::kEnableBeginFrameScheduling);
63 64
64 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); 65 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
65 parsed_command_line->AppendSwitch(switches::kEnablePinch); 66 parsed_command_line->AppendSwitch(switches::kEnablePinch);
66 parsed_command_line->AppendSwitch(switches::kEnableOverlayFullscreenVideo); 67 parsed_command_line->AppendSwitch(switches::kEnableOverlayFullscreenVideo);
67 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); 68 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
68 parsed_command_line->AppendSwitch(switches::kEnableOverscrollNotifications); 69 parsed_command_line->AppendSwitch(switches::kEnableOverscrollNotifications);
(...skipping 22 matching lines...) Expand all
91 } 92 }
92 93
93 // Disable profiler timing by default. 94 // Disable profiler timing by default.
94 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { 95 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {
95 parsed_command_line->AppendSwitchASCII( 96 parsed_command_line->AppendSwitchASCII(
96 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); 97 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
97 } 98 }
98 } 99 }
99 100
100 } // namespace content 101 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | content/browser/gpu/compositor_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698