cc: Don't swap PictureLayerTilingSet on activate.

cc/resources/picture_layer_tiling_set.h

Index: cc/resources/picture_layer_tiling_set.h
diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h
index f0d0fd7890702ec8a0b4b149fa5216d2068ea004..b91a061311361b412199c0c256ee5c776c8e061b 100644
--- a/cc/resources/picture_layer_tiling_set.h
+++ b/cc/resources/picture_layer_tiling_set.h
@@ -42,27 +42,41 @@ class CC_EXPORT PictureLayerTilingSet {
 
   ~PictureLayerTilingSet();
 
-  void SetClient(PictureLayerTilingClient* client);
   const PictureLayerTilingClient* client() const { return client_; }
 
-  void RemoveTilesInRegion(const Region& region);
   void CleanUpTilings(float min_acceptable_high_res_scale,
                       float max_acceptable_high_res_scale,
                       const std::vector<PictureLayerTiling*>& needed_tilings,
                       bool should_have_low_res,
                       PictureLayerTilingSet* twin_set,
                       PictureLayerTilingSet* recycled_twin_set);
-
+  void RemoveNonIdealTilings();
   // Make this set of tilings match the same set of content scales from |other|.
   // Delete any tilings that don't meet |minimum_contents_scale|.  Recreate
   // any tiles that intersect |layer_invalidation|.  Update the size of all
   // tilings to |new_layer_bounds|.
   // Returns true if we had at least one high res tiling synced.
-  bool SyncTilings(const PictureLayerTilingSet& other,
-                   const gfx::Size& new_layer_bounds,
-                   const Region& layer_invalidation,
-                   float minimum_contents_scale,
-                   RasterSource* raster_source);
+  // TODO(danakj): Remove this !!!
+  bool SyncTilingsForTesting(const PictureLayerTilingSet& other,
+                             const gfx::Size& new_layer_bounds,
+                             const Region& layer_invalidation,
+                             float minimum_contents_scale,
+                             RasterSource* raster_source);
+
+  void UpdateTilingsToCurrentRasterSource(
+      RasterSource* raster_source,
+      // TODO(danakj): DONT NEED LAYER BOUNDSS WE HAVE THE RASTER SOURCE

[enne (OOO), 2014/12/08 21:02:38]

BOUNDSS typo.  Is there a reason to punt this TODO?

[danakj, 2014/12/08 22:27:08]

Ya... I tried to do this a couple times, but it's a pretty annoying change for
unit tests, so I would like to do it separately. I should not capslock though
*^^*

+      const gfx::Size& layer_bounds,
+      const Region& layer_invalidation,
+      float minimum_contents_scale);
+
+  void UpdateTilingsFromPending(
+      RasterSource* raster_source,
+      const PictureLayerTilingSet& other,
+      // TODO(danakj): DONT NEED LAYER BOUNDSS WE HAVE THE RASTER SOURCE
+      const gfx::Size& layer_bounds,
+      const Region& layer_invalidation,
+      float minimum_contents_scale);
 
   PictureLayerTiling* AddTiling(float contents_scale,
                                 const gfx::Size& layer_bounds);
@@ -89,6 +103,9 @@ class CC_EXPORT PictureLayerTilingSet {
   // exist.
   float GetMaximumContentsScale() const;
 
+  // Removes all tilings with a contents scale < |minimum_scale|.
+  void RemoveTilingsBelowScale(float minimum_scale);
+
   // Remove all tilings.
   void RemoveAllTilings();