summaryrefslogtreecommitdiffstats
path: root/content/browser/android
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 20:25:22 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 20:25:22 +0000
commit818e60461364a62609a7065826cd1dc546c1358c (patch)
tree9d1c91535e321c32f8ce9fb338e1f8fc25b97b68 /content/browser/android
parentaf1b8472b98ce13ac0a3acaa9675a739a17b368b (diff)
downloadchromium_src-818e60461364a62609a7065826cd1dc546c1358c.zip
chromium_src-818e60461364a62609a7065826cd1dc546c1358c.tar.gz
chromium_src-818e60461364a62609a7065826cd1dc546c1358c.tar.bz2
Enable compositor frame message.
The cause of the flaky tests this was causing is now better-understood and we can re-enable this (the flaky tests are still disabled). Note that this flag is also enabled by default on phones from Java, so we should turn it on here to get the behavior everywhere and stop needing to support the old path. NOTRY=true BUG=161945 Review URL: https://chromiumcodereview.appspot.com/12210132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
-rw-r--r--content/browser/android/content_startup_flags.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index fb4e7b6..df83eb6 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -69,9 +69,8 @@ void SetContentCommandLineFlags(int max_render_process_count) {
parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
parsed_command_line->AppendSwitch(switches::kEnableViewport);
- // FIXME(aelias): Commented out due to flaky tests.
-// parsed_command_line->AppendSwitch(
-// cc::switches::kEnableCompositorFrameMessage);
+ parsed_command_line->AppendSwitch(
+ cc::switches::kEnableCompositorFrameMessage);
}
} // namespace content