cc: Change required_for_activation bookkeeping.

cc/layers/picture_layer_impl.h

Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index bf242518e7db0247c7fcd075a312e9c7ded64f68..f01d835029b93927648db26626e0dec6ff855db4 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -140,6 +140,14 @@ class CC_EXPORT PictureLayerImpl
   WhichTree GetTree() const;
   bool IsOnActiveOrPendingTree() const;
 
+  // Return the count of tiles on this layer that meet both of the following
+  // conditions:
+  // 1. The tile is required for activation.
+  // 2. The tile needs initialization (ie, it's not ready to draw).
+  size_t UninitializedTilesRequiredForActivationCount() const {
+    return uninitialized_tiles_required_for_activation_count_;
+  }
+
  protected:
   friend class LayerRasterTileIterator;
 
@@ -163,13 +171,13 @@ class CC_EXPORT PictureLayerImpl
   float SnappedContentsScale(float new_contents_scale);
   void UpdateLCDTextStatus(bool new_status);
   void ResetRasterScale();
-  void MarkVisibleResourcesAsRequired() const;
+  void MarkVisibleResourcesAsRequired();
   bool MarkVisibleTilesAsRequired(
       PictureLayerTiling* tiling,
       const PictureLayerTiling* optional_twin_tiling,
       float contents_scale,
       const gfx::Rect& rect,
-      const Region& missing_region) const;
+      const Region& missing_region);
 
   void DoPostCommitInitializationIfNeeded() {
     if (needs_post_commit_initialization_)
@@ -221,6 +229,8 @@ class CC_EXPORT PictureLayerImpl
   gfx::Size viewport_size_for_tile_priority_;
   gfx::Transform screen_space_transform_for_tile_priority_;
 
+  size_t uninitialized_tiles_required_for_activation_count_;

[enne (OOO), 2014/04/29 23:01:35]

size_t -> int

+
   friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };