Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: content/common/gpu/client/command_buffer_proxy_impl.cc

Issue 100443006: Remove some LatencyInfo merging code path (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix android/mac build Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/command_buffer_proxy_impl.cc
diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc
index 768b427039343a30643dc432bc8e297294c05cf9..70e070f1a4984387ed056944586c0329006c59b1 100644
--- a/content/common/gpu/client/command_buffer_proxy_impl.cc
+++ b/content/common/gpu/client/command_buffer_proxy_impl.cc
@@ -212,10 +212,16 @@ void CommandBufferProxyImpl::Flush(int32 put_offset) {
}
void CommandBufferProxyImpl::SetLatencyInfo(
- const ui::LatencyInfo& latency_info) {
+ const std::vector<ui::LatencyInfo>& latency_info) {
if (last_state_.error != gpu::error::kNoError)
return;
- Send(new GpuCommandBufferMsg_SetLatencyInfo(route_id_, latency_info));
+ // TODO(miletus) : Pass the std::vector<ui::LatencyInfo> latency_info
+ // directly without merging once GpuCommandBufferMsg_SetLatencyInfo
+ // is converted to contain std::vector<ui::LatencyInfo>.
+ ui::LatencyInfo merged_latency;
+ for (size_t i = 0; i < latency_info.size(); i++)
+ merged_latency.MergeWith(latency_info[i]);
+ Send(new GpuCommandBufferMsg_SetLatencyInfo(route_id_, merged_latency));
}
gpu::CommandBuffer::State CommandBufferProxyImpl::FlushSync(
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698