commit 3c71a2ada6364b6e0ae6346de714cbd5d87c1a16
author Ben Murdoch <benm@google.com> Thu Aug 28 15:51:16 2014 +0100
committer Ben Murdoch <benm@google.com> Thu Aug 28 17:16:00 2014 +0100
tree 1e4a96234997a10ed1ae40a29847df3cad43c7ed
parent 74a4665b900509de0964c0987fc6a66326b0273f

Cherry pick "Include tile manager state in lthi state dump"

Include tile manager state in lthi state dump

R=vmpstr,enne
BUG=401209

Review URL: https://codereview.chromium.org/463403002

Cr-Commit-Position: refs/heads/master@{#289451}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289451
0039d316-1c4b-4281-b951-d872f2087c98

Chromium revision: 0eded9ea3c713e1ce61b4f26c7a202c55f0302fe
Bug: 17315710

Change-Id: I5d47079abb36678a16d1fb245e4caa25c20c9067

cc/trees/layer_tree_host_impl.cc

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 420c311..9992904 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -3027,8 +3027,10 @@
       state->Set("activation_state", ActivationStateAsValue().release());
   state->Set("device_viewport_size",
              MathUtil::AsValue(device_viewport_size_).release());
-  if (tile_manager_)
+  if (tile_manager_) {
     state->Set("tiles", tile_manager_->AllTilesAsValue().release());
+    state->Set("tile_manager_basic_state", tile_manager_->BasicStateAsValue().release());
+  }
   state->Set("active_tree", active_tree_->AsValue().release());
   if (pending_tree_)
     state->Set("pending_tree", pending_tree_->AsValue().release());