diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 17:57:32 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 17:57:32 +0000 |
| commit | dfbded2d19eea373728491177ddfab62f79b6bce (patch) | |
| tree | e74919f3d6124e47f7aa670c1c8386042226d910 /cc/trees/thread_proxy.cc | |
| parent | a02439a8031557d1201383ff170aef4869996cbd (diff) | |
| download | chromium_src-dfbded2d19eea373728491177ddfab62f79b6bce.zip chromium_src-dfbded2d19eea373728491177ddfab62f79b6bce.tar.gz chromium_src-dfbded2d19eea373728491177ddfab62f79b6bce.tar.bz2 | |
Revert 280493 "Make SingleThreadProxy a SchedulerClient"
Reason for revert:
Check if this CL breaks TouchActionBrowserTest.TouchActionNone test http://goo.gl/pwdNwL
Also it was reported that this CL causing a number of crashes on the blink bots, e.g.,
http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel
> Make SingleThreadProxy a SchedulerClient
>
> This makes ui::Compositor no longer in charge of
> scheduling commits and draws, deferring it to cc::Scheduler.
>
> BUG=329552, 287250
>
> Review URL: https://codereview.chromium.org/134623005
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/359103004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/thread_proxy.cc')
| -rw-r--r-- | cc/trees/thread_proxy.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc index 3dbf0d6..e16adb9 100644 --- a/cc/trees/thread_proxy.cc +++ b/cc/trees/thread_proxy.cc @@ -454,10 +454,9 @@ void ThreadProxy::SetNextCommitWaitsForActivation() { void ThreadProxy::SetDeferCommits(bool defer_commits) { DCHECK(IsMainThread()); - if (main().defer_commits == defer_commits) - return; - + DCHECK_NE(main().defer_commits, defer_commits); main().defer_commits = defer_commits; + if (main().defer_commits) TRACE_EVENT_ASYNC_BEGIN0("cc", "ThreadProxy::SetDeferCommits", this); else |