summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 08:47:50 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 08:47:50 +0000
commit6a50af1cd8821c47fac5815ab6fee6f6a11e242f (patch)
tree9224bfaefec58ad0682e67ecaa9bc9c22fe821f9 /cc
parent9d109a93e27d6f25c27fac20a47fc1bfb53748e4 (diff)
downloadchromium_src-6a50af1cd8821c47fac5815ab6fee6f6a11e242f.zip
chromium_src-6a50af1cd8821c47fac5815ab6fee6f6a11e242f.tar.gz
chromium_src-6a50af1cd8821c47fac5815ab6fee6f6a11e242f.tar.bz2
Add support for LatencyInfo to software compositor.
It reports the LatencyInfo to the RenderWidgetHostImpl when the browser compositor swaps to the screen. Also, the LatencyInfo is now added to the CompositorFrameMetadata in all cases, not just when there's a RootScrollLayer. BUG=155367 R=nduca@chromium.org, piman@chromium.org, skaslev@chromium.org Review URL: https://codereview.chromium.org/16566005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/trees/layer_tree_host_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 2670bf8..6cf43ea 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1097,6 +1097,7 @@ CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() const {
metadata.root_layer_size = active_tree_->ScrollableSize();
metadata.min_page_scale_factor = active_tree_->min_page_scale_factor();
metadata.max_page_scale_factor = active_tree_->max_page_scale_factor();
+ metadata.latency_info = active_tree_->GetLatencyInfo();
if (top_controls_manager_) {
metadata.location_bar_offset =
gfx::Vector2dF(0.f, top_controls_manager_->controls_top_offset());
@@ -1109,7 +1110,6 @@ CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() const {
return metadata;
metadata.root_scroll_offset = RootScrollLayer()->TotalScrollOffset();
- metadata.latency_info = active_tree_->GetLatencyInfo();
return metadata;
}