summaryrefslogtreecommitdiff
path: root/chromium/components/viz/service/display
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-05 17:27:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-18 08:33:46 +0000
commit9f4560b1027ae06fdb497023cdcaf91b8511fa74 (patch)
treef9789c1b2941956c5cc104cf03c6b6cc93759152 /chromium/components/viz/service/display
parentd17ea114e5ef69ad5d5d7413280a13e6428098aa (diff)
downloadqtwebengine-chromium-9f4560b1027ae06fdb497023cdcaf91b8511fa74.tar.gz
BASELINE: Update Chromium to 67.0.3396.76
Change-Id: I9a14af4efb092ab203e9364f0779fca781909a38 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/components/viz/service/display')
-rw-r--r--chromium/components/viz/service/display/surface_aggregator.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/components/viz/service/display/surface_aggregator.cc b/chromium/components/viz/service/display/surface_aggregator.cc
index e7890382bcc..5c41b6d48b8 100644
--- a/chromium/components/viz/service/display/surface_aggregator.cc
+++ b/chromium/components/viz/service/display/surface_aggregator.cc
@@ -1230,6 +1230,10 @@ CompositorFrame SurfaceAggregator::Aggregate(
Surface* surface = manager_->GetSurfaceForId(it.first);
if (surface)
surface->TakeLatencyInfo(&frame.metadata.latency_info);
+ if (!ui::LatencyInfo::Verify(frame.metadata.latency_info,
+ "SurfaceAggregator::Aggregate")) {
+ break;
+ }
}
// TODO(jamesr): Aggregate all resource references into the returned frame's