summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-04 01:46:51 +0000
committerernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-04 01:46:51 +0000
commit29b133568d4439e0ab64d26d23eca33ef1b24b2a (patch)
tree9d66b4a406acc55c0f61e7a5d72fd5816512e181 /cc
parenta47c28bf03f42e9e9d25babd36d3a9428ea49447 (diff)
downloadchromium_src-29b133568d4439e0ab64d26d23eca33ef1b24b2a.zip
chromium_src-29b133568d4439e0ab64d26d23eca33ef1b24b2a.tar.gz
chromium_src-29b133568d4439e0ab64d26d23eca33ef1b24b2a.tar.bz2
cc: Update source_frame_number before tiles get created
- A recent change to compositor broke the rasterize_and_record_benchmark, because tiles were created before the LayerTreeImpl's source_frame_number was updated. - Switching the order of these operations fixes the problem. BUG=226489 R=enne@chromium.org Review URL: https://chromiumcodereview.appspot.com/18233022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/trees/layer_tree_host.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 8d93426..27ece47 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -288,6 +288,8 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
sync_tree = host_impl->active_tree();
}
+ sync_tree->set_source_frame_number(commit_number());
+
if (needs_full_tree_sync_)
sync_tree->SetRootLayer(TreeSynchronizer::SynchronizeTrees(
root_layer(), sync_tree->DetachLayerTree(), sync_tree));
@@ -307,7 +309,6 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
sync_tree->set_hud_layer(NULL);
}
- sync_tree->set_source_frame_number(commit_number());
sync_tree->set_background_color(background_color_);
sync_tree->set_has_transparent_background(has_transparent_background_);