Revert of cc: Change required_for_activation bookkeeping.

cc/layers/picture_layer_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 122 matching lines @@
 
   void SetUseGpuRasterization(bool use_gpu);
   bool ShouldUseGpuRasterization() const { return use_gpu_rasterization_; }
 
   // Functions used by tile manager.
   void DidUnregisterLayer();
   PictureLayerImpl* GetTwinLayer() { return twin_layer_; }
   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).
-  int UninitializedTilesRequiredForActivationCount() const {
-    return uninitialized_tiles_required_for_activation_count_;
-  }
-
  protected:
   friend class LayerRasterTileIterator;
 
   PictureLayerImpl(LayerTreeImpl* tree_impl, int id);
   PictureLayerTiling* AddTiling(float contents_scale);
   void RemoveTiling(float contents_scale);
   void RemoveAllTilings();
   void SyncFromActiveLayer(const PictureLayerImpl* other);
   void ManageTilings(bool animating_transform_to_screen,
                      float maximum_animation_contents_scale);
   bool ShouldHaveLowResTiling() const {
     return should_use_low_res_tiling_ && !ShouldUseGpuRasterization();
   }
   virtual bool ShouldAdjustRasterScale(
       bool animating_transform_to_screen) const;
   virtual void RecalculateRasterScales(bool animating_transform_to_screen,
                                        float maximum_animation_contents_scale);
   void CleanUpTilingsOnActiveLayer(
       std::vector<PictureLayerTiling*> used_tilings);
   float MinimumContentsScale() const;
   float SnappedContentsScale(float new_contents_scale);
   void UpdateLCDTextStatus(bool new_status);
   void ResetRasterScale();
-  void MarkVisibleResourcesAsRequired();
+  void MarkVisibleResourcesAsRequired() const;
   bool MarkVisibleTilesAsRequired(
       PictureLayerTiling* tiling,
       const PictureLayerTiling* optional_twin_tiling,
       float contents_scale,
       const gfx::Rect& rect,
-      const Region& missing_region);
+      const Region& missing_region) const;
 
   void DoPostCommitInitializationIfNeeded() {
     if (needs_post_commit_initialization_)
       DoPostCommitInitialization();
   }
   void DoPostCommitInitialization();
 
   bool CanHaveTilings() const;
   bool CanHaveTilingWithScale(float contents_scale) const;
   void SanityCheckTilingState() const;
@@ skipping 31 matching lines @@
   bool use_gpu_rasterization_;
 
   bool layer_needs_to_register_itself_;
 
   // Save a copy of the visible rect and viewport size of the last frame that
   // has a valid viewport for prioritizing tiles.
   gfx::Rect visible_rect_for_tile_priority_;
   gfx::Size viewport_size_for_tile_priority_;
   gfx::Transform screen_space_transform_for_tile_priority_;
 
-  int uninitialized_tiles_required_for_activation_count_;
-
   friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_