Commit 9eb6ff04 authored by danakj@chromium.org's avatar danakj@chromium.org

Remove the --ui-max-frames-pending flag.

ChromeOS always sets this value to 1. Other Aura platforms don't use
the cc scheduler yet so they don't care about this value. Once they
do, they'll want to use 1 as well. So set it to 1 always.

R=piman@chromium.org, piman
BUG=344094

Review URL: https://codereview.chromium.org/168073002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252091 0039d316-1c4b-4281-b951-d872f2087c98
parent 7b816c06
...@@ -134,7 +134,6 @@ std::string DeriveCommandLine(const GURL& start_url, ...@@ -134,7 +134,6 @@ std::string DeriveCommandLine(const GURL& start_url,
::switches::kUIDisableDeadlineScheduling, ::switches::kUIDisableDeadlineScheduling,
::switches::kUIDisableThreadedCompositing, ::switches::kUIDisableThreadedCompositing,
::switches::kUIEnableDeadlineScheduling, ::switches::kUIEnableDeadlineScheduling,
::switches::kUIMaxFramesPending,
::switches::kUIPrioritizeInGpuProcess, ::switches::kUIPrioritizeInGpuProcess,
#if defined(USE_CRAS) #if defined(USE_CRAS)
::switches::kUseCras, ::switches::kUseCras,
......
...@@ -47,16 +47,7 @@ BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() { ...@@ -47,16 +47,7 @@ BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
} }
void BrowserCompositorOutputSurface::Initialize() { void BrowserCompositorOutputSurface::Initialize() {
CommandLine* command_line = CommandLine::ForCurrentProcess(); capabilities_.max_frames_pending = 1;
if (command_line->HasSwitch(switches::kUIMaxFramesPending)) {
std::string string_value = command_line->GetSwitchValueASCII(
switches::kUIMaxFramesPending);
int int_value;
if (base::StringToInt(string_value, &int_value))
capabilities_.max_frames_pending = int_value;
else
LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
}
capabilities_.adjust_deadline_for_parent = false; capabilities_.adjust_deadline_for_parent = false;
DetachFromThread(); DetachFromThread();
......
...@@ -18,8 +18,6 @@ const char kUIEnableDeadlineScheduling[] = "ui-enable-deadline-scheduling"; ...@@ -18,8 +18,6 @@ const char kUIEnableDeadlineScheduling[] = "ui-enable-deadline-scheduling";
const char kUIEnableSoftwareCompositing[] = "ui-enable-software-compositing"; const char kUIEnableSoftwareCompositing[] = "ui-enable-software-compositing";
const char kUIMaxFramesPending[] = "ui-max-frames-pending";
const char kUIShowPaintRects[] = "ui-show-paint-rects"; const char kUIShowPaintRects[] = "ui-show-paint-rects";
bool IsUIDeadlineSchedulingEnabled() { bool IsUIDeadlineSchedulingEnabled() {
......
...@@ -14,7 +14,6 @@ COMPOSITOR_EXPORT extern const char kUIDisableDeadlineScheduling[]; ...@@ -14,7 +14,6 @@ COMPOSITOR_EXPORT extern const char kUIDisableDeadlineScheduling[];
COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[]; COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[];
COMPOSITOR_EXPORT extern const char kUIEnableDeadlineScheduling[]; COMPOSITOR_EXPORT extern const char kUIEnableDeadlineScheduling[];
COMPOSITOR_EXPORT extern const char kUIEnableSoftwareCompositing[]; COMPOSITOR_EXPORT extern const char kUIEnableSoftwareCompositing[];
COMPOSITOR_EXPORT extern const char kUIMaxFramesPending[];
COMPOSITOR_EXPORT extern const char kUIShowPaintRects[]; COMPOSITOR_EXPORT extern const char kUIShowPaintRects[];
COMPOSITOR_EXPORT bool IsUIDeadlineSchedulingEnabled(); COMPOSITOR_EXPORT bool IsUIDeadlineSchedulingEnabled();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment