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 cd7c68b32a42bec85d1f868f4d0c1c153e577cf3..8eb64224d3499e6d09389511e40bb308337369cd 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -92,6 +92,7 @@ class CC_EXPORT PictureLayerImpl
   virtual void AppendQuads(QuadSink* quad_sink,
                            AppendQuadsData* append_quads_data) OVERRIDE;
   virtual void UpdateTilePriorities() OVERRIDE;
+  virtual void NotifyTileInitialized(const Tile* tile) OVERRIDE;
   virtual void DidBecomeActive() OVERRIDE;
   virtual void DidBeginTracing() OVERRIDE;
   virtual void ReleaseResources() OVERRIDE;
@@ -138,6 +139,9 @@ class CC_EXPORT PictureLayerImpl
   PictureLayerImpl* GetTwinLayer() { return twin_layer_; }
   WhichTree GetTree() const;
   bool IsOnActiveOrPendingTree() const;
+  size_t RequiredForActivationTileNeedsRasterCount() const {

[reveman, 2014/04/25 20:44:08]

TilesRequiredForActivationThatNeedsRasterCount?

[vmpstr, 2014/04/25 22:09:52]

Done.

+    return required_for_activation_tile_needs_raster_count_;
+  }
 
  protected:
   friend class LayerRasterTileIterator;
@@ -162,13 +166,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_)
@@ -220,6 +224,8 @@ class CC_EXPORT PictureLayerImpl
   gfx::Size viewport_size_for_tile_priority_;
   gfx::Transform screen_space_transform_for_tile_priority_;
 
+  size_t required_for_activation_tile_needs_raster_count_;
+
   friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };