summaryrefslogtreecommitdiffstats
path: root/cc/scheduler/commit_earlyout_reason.h
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-01-30 09:50:07 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-30 17:52:20 +0000
commit06b3f03355d6fb783273eb4fd26e91830be2ce44 (patch)
tree6bfa3e91d625b24c7f5e2d48ff160d94d9884caa /cc/scheduler/commit_earlyout_reason.h
parentda763e4f5e87a1b4de0e158ef4c2246139f68fd6 (diff)
downloadchromium_src-06b3f03355d6fb783273eb4fd26e91830be2ce44.zip
chromium_src-06b3f03355d6fb783273eb4fd26e91830be2ce44.tar.gz
chromium_src-06b3f03355d6fb783273eb4fd26e91830be2ce44.tar.bz2
Revert of cc: Control defer_commits logic by Scheduler (patchset #12 id:250001 of https://codereview.chromium.org/337693005/)
Reason for revert: seems to flakily not stop commits https://code.google.com/p/chromium/issues/detail?id=453787 Original issue's description: > cc: Control defer_commits logic by Scheduler > > So far, EarlyOut_DeferCommits is controlled by Proxy. > Because Scheduler doesn't know about this deferring, it triggers next > BeginMainFrame when main thread want to defer a commit. > This CL moves the EarlyOut_DeferCommits logic from Proxy to > Scheduler so Scheduler can stop next BeginMainFrame until defer commit is off. > > R=brianderson@chromium.org, danakj@chromium.org, skyostil@chromium.org > BUG=382572 > TEST=cc_unittests > > Committed: https://crrev.com/1625b74468e4dd55f54ba209f8e91d05493875b9 > Cr-Commit-Position: refs/heads/master@{#313816} TBR=brianderson@chromium.org,skyostil@chromium.org,enne@chromium.org,mithro@mithis.com,simonhong@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=382572 Review URL: https://codereview.chromium.org/870183004 Cr-Commit-Position: refs/heads/master@{#313939}
Diffstat (limited to 'cc/scheduler/commit_earlyout_reason.h')
-rw-r--r--cc/scheduler/commit_earlyout_reason.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/cc/scheduler/commit_earlyout_reason.h b/cc/scheduler/commit_earlyout_reason.h
index 14aaeb3..b45e96f 100644
--- a/cc/scheduler/commit_earlyout_reason.h
+++ b/cc/scheduler/commit_earlyout_reason.h
@@ -12,7 +12,6 @@ namespace cc {
enum class CommitEarlyOutReason {
ABORTED_OUTPUT_SURFACE_LOST,
ABORTED_NOT_VISIBLE,
- ABORTED_DEFERRED_COMMIT,
FINISHED_NO_UPDATES,
};
@@ -22,8 +21,6 @@ inline const char* CommitEarlyOutReasonToString(CommitEarlyOutReason reason) {
return "CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST";
case CommitEarlyOutReason::ABORTED_NOT_VISIBLE:
return "CommitEarlyOutReason::ABORTED_NOT_VISIBLE";
- case CommitEarlyOutReason::ABORTED_DEFERRED_COMMIT:
- return "CommitEarlyOutReason::ABORTED_DEFERRED_COMMIT";
case CommitEarlyOutReason::FINISHED_NO_UPDATES:
return "CommitEarlyOutReason::FINISHED_NO_UPDATES";
}