diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 18:16:22 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 18:18:52 +0000 |
| commit | aeeedad4f8d90b2af1b2299b70ed35cd4877af64 (patch) | |
| tree | 34fb17c53043f67c187d6321587a5257cd442f95 /content/shell | |
| parent | 3626bc39d629245a782c61ba0bc668583778e392 (diff) | |
| download | chromium_src-aeeedad4f8d90b2af1b2299b70ed35cd4877af64.zip chromium_src-aeeedad4f8d90b2af1b2299b70ed35cd4877af64.tar.gz chromium_src-aeeedad4f8d90b2af1b2299b70ed35cd4877af64.tar.bz2 | |
Make SingleThreadProxy a SchedulerClient
All compositors that use SingleThreadProxy are left calling composite
synchronously and now pass a flag to indicate that this is their
intention. This patch doesn't remove synchronous composite, but now
makes it mutually exclusive with scheduling.
Only cc unittests are exercising this code at this point, although it
also unifies a lot of the code for CompositeImmediately with the
scheduled path.
BUG=329552, 287250
Review URL: https://codereview.chromium.org/134623005
Cr-Commit-Position: refs/heads/master@{#291451}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/renderer/test_runner/web_test_proxy.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc index 7e36976..18086de 100644 --- a/content/shell/renderer/test_runner/web_test_proxy.cc +++ b/content/shell/renderer/test_runner/web_test_proxy.cc @@ -7,9 +7,11 @@ #include <cctype> #include "base/callback_helpers.h" +#include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "content/public/common/content_switches.h" #include "content/shell/renderer/test_runner/TestPlugin.h" #include "content/shell/renderer/test_runner/WebTestDelegate.h" #include "content/shell/renderer/test_runner/WebTestInterfaces.h" @@ -313,6 +315,10 @@ WebTestProxyBase::WebTestProxyBase() web_widget_(NULL), spellcheck_(new SpellCheckClient(this)), chooser_count_(0) { + // TODO(enne): using the scheduler introduces additional composite steps + // that create flakiness. This should go away eventually. + base::CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kDisableSingleThreadProxyScheduler); Reset(); } |