| Index: 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 f58f3c2d7add8598fe445712494c94050ceaebcd..cb39e90a37679963744a509ee167651cf61305de 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -2202,10 +2202,10 @@ scoped_ptr<base::Value> LayerTreeHostImpl::AsValue() const {
|
| }
|
|
|
| scoped_ptr<base::Value> LayerTreeHostImpl::ActivationStateAsValue() const {
|
| - DCHECK(pending_tree_ && tile_manager_);
|
| scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
|
| state->Set("lthi", TracedValue::CreateIDRef(this).release());
|
| - state->Set("tile_manager", tile_manager_->BasicStateAsValue().release());
|
| + if (tile_manager_)
|
| + state->Set("tile_manager", tile_manager_->BasicStateAsValue().release());
|
| return state.PassAs<base::Value>();
|
| }
|
|
|
|
|