Update from https://crrev.com/305340

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>
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
 namespace debug {
 class TracedValue;
 }
@@ skipping 19 matching lines @@
 
   static scoped_ptr<PictureLayerTilingSet> Create(
       PictureLayerTilingClient* client);
 
   ~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);
 
   // 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,
@@ skipping 20 matching lines @@
   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;
 
   // Remove all tilings.
   void RemoveAllTilings();
 
-  // Remove one tiling.
-  void Remove(PictureLayerTiling* tiling);
-  void RemoveTilingWithScale(float scale);
-
   // 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,
                             const Occlusion& occlusion_in_layer_space,
                             bool can_require_tiles_for_activation);
 
@@ skipping 45 matching lines @@
   };
 
   void AsValueInto(base::debug::TracedValue* array) const;
   size_t GPUMemoryUsageInBytes() const;
 
   TilingRange GetTilingRange(TilingRangeType type) const;
 
  private:
   explicit PictureLayerTilingSet(PictureLayerTilingClient* client);
 
+  // Remove one tiling.
+  void Remove(PictureLayerTiling* tiling);
+
   PictureLayerTilingClient* client_;
   ScopedPtrVector<PictureLayerTiling> tilings_;
 
   friend class Iterator;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_