diff options
| author | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 22:56:50 +0000 |
|---|---|---|
| committer | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 22:56:50 +0000 |
| commit | b76029b635be92539c461a084c801b95d53beedf (patch) | |
| tree | 5ee99a79709728a2223d878f3e064d6a18566ae6 /cc/base | |
| parent | bf46313710fa79090e01a2c933dc1411e124e6a3 (diff) | |
| download | chromium_src-b76029b635be92539c461a084c801b95d53beedf.zip chromium_src-b76029b635be92539c461a084c801b95d53beedf.tar.gz chromium_src-b76029b635be92539c461a084c801b95d53beedf.tar.bz2 | |
Remove some LatencyInfo merging code path
This CL removes a few code paths that do LatencyInfo merging:
1. compositor -> output surface through CompositorFrameMetadata
2. gpu -> browser compositor through
GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params and
GpuHostMsg_AcceleratedSurfacePostSubBuffer_Param
A follow up CL will remove GPU side LatencyInfo merging (mainly in image
transport surface) so that we remove LatencyInfo merging entirely from
the code path renderer cc -> gpu -> browser cc -> gpu.
BUG=246034
TEST=unittests pass.
Review URL: https://codereview.chromium.org/100443006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/base')
| -rw-r--r-- | cc/base/latency_info_swap_promise.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cc/base/latency_info_swap_promise.cc b/cc/base/latency_info_swap_promise.cc index 41c0e997..cc2f1c1 100644 --- a/cc/base/latency_info_swap_promise.cc +++ b/cc/base/latency_info_swap_promise.cc @@ -34,9 +34,7 @@ LatencyInfoSwapPromise::~LatencyInfoSwapPromise() { void LatencyInfoSwapPromise::DidSwap(CompositorFrameMetadata* metadata) { DCHECK(!latency_.terminated); - // TODO(miletus): Append the |latency_| into metadata's LatencyInfo list - // once we remove LatencyInfo merge in GPU side. - metadata->latency_info.MergeWith(latency_); + metadata->latency_info.push_back(latency_); } void LatencyInfoSwapPromise::DidNotSwap(DidNotSwapReason reason) { |