Update from https://crrev.com/309415

cc/resources/picture_layer_tiling_set.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_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 #define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 36 matching lines @@
 
   const PictureLayerTilingClient* client() const { return client_; }
 
   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.
-  // 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,
+      scoped_refptr<RasterSource> raster_source,
       const PictureLayerTilingSet* twin_set,
       const Region& layer_invalidation,
-      float minimum_contents_scale);
+      float minimum_contents_scale,
+      float maximum_contents_scale);
 
   PictureLayerTiling* AddTiling(float contents_scale,
-                                const gfx::Size& layer_bounds);
+                                scoped_refptr<RasterSource> raster_source);
   size_t num_tilings() const { return tilings_.size(); }
   int NumHighResTilings() const;
   PictureLayerTiling* tiling_at(size_t idx) { return tilings_[idx]; }
   const PictureLayerTiling* tiling_at(size_t idx) const {
     return tilings_[idx];
   }
 
   PictureLayerTiling* FindTilingWithScale(float scale) const;
   PictureLayerTiling* FindTilingWithResolution(TileResolution resolution) const;
 
   void MarkAllTilingsNonIdeal();
 
   // If a tiling exists whose scale is within |snap_to_existing_tiling_ratio|
   // ratio of |start_scale|, then return that tiling's scale. Otherwise, return
   // |start_scale|. If multiple tilings match the criteria, return the one with
   // the least ratio to |start_scale|.
   float GetSnappedContentsScale(float start_scale,
                                 float snap_to_existing_tiling_ratio) const;
 
   // Returns the maximum contents scale of all tilings, or 0 if no tilings
   // exist.
   float GetMaximumContentsScale() const;
 
   // Removes all tilings with a contents scale < |minimum_scale|.
   void RemoveTilingsBelowScale(float minimum_scale);
 
+  // Removes all tilings with a contents scale > |maximum_scale|.
+  void RemoveTilingsAboveScale(float maximum_scale);
+
   // Remove all tilings.
   void RemoveAllTilings();
 
   // Remove all tiles; keep all tilings.
   void RemoveAllTiles();
 
   // Update the rects and priorities for tiles based on the given information.
   bool UpdateTilePriorities(const gfx::Rect& required_rect_in_layer_space,
                             float ideal_contents_scale,
                             double current_frame_time_in_seconds,
@@ skipping 69 matching lines @@
   const int skewport_extrapolation_limit_in_content_pixels_;
   PictureLayerTilingClient* client_;
 
   friend class Iterator;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_