diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 17:05:11 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 17:05:11 +0000 |
| commit | 586871b039414476e9127d888a1b6ca3a02d3722 (patch) | |
| tree | 48656558bb2ebe925a24400662535386839022eb /cc/base | |
| parent | 9788b787b14b333dc93d6d13d4c881046a58db63 (diff) | |
| download | chromium_src-586871b039414476e9127d888a1b6ca3a02d3722.zip chromium_src-586871b039414476e9127d888a1b6ca3a02d3722.tar.gz chromium_src-586871b039414476e9127d888a1b6ca3a02d3722.tar.bz2 | |
Deliver IPC messages together with SwapCompositorFrame
This makes it possible to send IPC messages in such a way
that they're delivered together with the SwapCompositorFrame
corresponding to the next commit.
BUG=364612
Review URL: https://codereview.chromium.org/240163005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/base')
| -rw-r--r-- | cc/base/latency_info_swap_promise.cc | 4 | ||||
| -rw-r--r-- | cc/base/swap_promise.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cc/base/latency_info_swap_promise.cc b/cc/base/latency_info_swap_promise.cc index cc2f1c1..c846436 100644 --- a/cc/base/latency_info_swap_promise.cc +++ b/cc/base/latency_info_swap_promise.cc @@ -15,8 +15,8 @@ namespace { return ui::INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT; case cc::SwapPromise::COMMIT_FAILS: return ui::INPUT_EVENT_LATENCY_TERMINATED_COMMIT_FAILED_COMPONENT; - case cc::SwapPromise::SWAP_PROMISE_LIST_OVERFLOW: - return ui::LATENCY_INFO_LIST_TERMINATED_OVERFLOW_COMPONENT; + case cc::SwapPromise::COMMIT_NO_UPDATE: + return ui::INPUT_EVENT_LATENCY_TERMINATED_COMMIT_NO_UPDATE_COMPONENT; } NOTREACHED() << "Unhandled DidNotSwapReason."; return ui::INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT; diff --git a/cc/base/swap_promise.h b/cc/base/swap_promise.h index 36a5b13..00614cf 100644 --- a/cc/base/swap_promise.h +++ b/cc/base/swap_promise.h @@ -9,8 +9,6 @@ namespace cc { -const unsigned int kMaxQueuedSwapPromiseNumber = 100; - // When a change to the compositor's state/invalidation/whatever happens, a // Swap Promise can be inserted into LayerTreeHost/LayerTreeImpl, to track // whether the compositor's reply to the new state/invaliadtion/whatever is @@ -35,7 +33,7 @@ class CC_EXPORT SwapPromise { DID_NOT_SWAP_UNKNOWN, SWAP_FAILS, COMMIT_FAILS, - SWAP_PROMISE_LIST_OVERFLOW, + COMMIT_NO_UPDATE, }; SwapPromise() {} |