commit 1e0f8d69ddd5b4c0223033d84305869e3a399563
author enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 09 07:41:35 2013
committer enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 09 07:41:35 2013
tree 387dd5f743f33c075a754f360bb61083dea1150a
parent 9513c15e4e50ff15ca09e1f407bee6f949db0f95

cc: Preserve currently scrolling layer during tree activation

BUG=168421


Review URL: https://chromiumcodereview.appspot.com/11826017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175729 0039d316-1c4b-4281-b951-d872f2087c98

cc/layer_tree_host_impl.cc

diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index e07ca93..44b305e 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -1025,6 +1025,8 @@
 void LayerTreeHostImpl::activatePendingTree()
 {
     CHECK(m_pendingTree);
+
+    m_activeTree->PushPersistedState(m_pendingTree.get());
     m_activeTree.swap(m_pendingTree);
     // TODO(enne): consider recycling this tree to prevent layer churn
     m_pendingTree.reset();