commit c5ed0dd4a10d05b45470feb21d7f5e5d21b375db
author boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 24 16:12:43 2013 +0000
committer Bo Liu <boliu@google.com> Thu Oct 24 09:30:47 2013 -0700
tree 19665bc6b5532c8c2626246b6303f73e607e6314
parent 491c833cfd4760ae9961acf48ed51e5b9fff8d09

Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

Cherry-pick of Chromium crrev.com/r230735

Removed the test due to conflict.

BUG: 11265055

Original description:

The should_update_tile_priorities_ in UpdateTilePriorities my fail and
here's the sequence of events:

* Context loss while layer is invisible, which clears
should_update_tile_priorities_
* CalculateContentsScale is skipped because layer is invisible
* Layer becomes visible in next commit, and active layer SyncTiling
during the commit will fail the check.

Any condition that causes CalculateContentsScale on the layer works as
well.

Change-Id: Ia92de26d27a37c3a6af487d92e6869a495cfbd3e

cc/layers/picture_layer_impl.cc

diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 22f5d7c..124871c 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -602,7 +602,8 @@
   // get updated prior to drawing or activation.  If this tree does not
   // need update draw properties, then its transforms are up to date and
   // we can create tiles for this tiling immediately.
-  if (!layer_tree_impl()->needs_update_draw_properties())
+  if (!layer_tree_impl()->needs_update_draw_properties() &&
+      should_update_tile_priorities_)
     UpdateTilePriorities();
 }