Update from chromium https://crrev.com/304586

cc/resources/picture_pile.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_PILE_H_
 #define CC_RESOURCES_PICTURE_PILE_H_
 
 #include <bitset>
+#include <utility>
 
+#include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/tiling_data.h"
 #include "cc/resources/recording_source.h"
 
 namespace cc {
 class PicturePileImpl;
 
 class CC_EXPORT PicturePile : public RecordingSource {
  public:
   PicturePile();
   ~PicturePile() override;
 
   // RecordingSource overrides.
   bool UpdateAndExpandInvalidation(
       ContentLayerClient* painter,
       Region* invalidation,
-      SkColor background_color,
-      bool contents_opaque,
-      bool contents_fill_bounds_completely,
       const gfx::Size& layer_size,
       const gfx::Rect& visible_layer_rect,
       int frame_number,
       Picture::RecordingMode recording_mode) override;
+  scoped_refptr<RasterSource> CreateRasterSource() const override;
   gfx::Size GetSize() const final;
   void SetEmptyBounds() override;
   void SetMinContentsScale(float min_contents_scale) override;
+  void SetSlowdownRasterScaleFactor(int factor) override;
+  bool IsSuitableForGpuRasterization() const override;
   void SetTileGridSize(const gfx::Size& tile_grid_size) override;
-  void SetSlowdownRasterScaleFactor(int factor) override;
-  void SetIsMask(bool is_mask) override;
-  bool IsSuitableForGpuRasterization() const override;
-  scoped_refptr<RasterSource> CreateRasterSource() const override;
   void SetUnsuitableForGpuRasterizationForTesting() override;
   SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
 
   static void ComputeTileGridInfo(const gfx::Size& tile_grid_size,
                                   SkTileGridFactory::TileGridInfo* info);
 
  protected:
   class CC_EXPORT PictureInfo {
    public:
     enum { INVALIDATION_FRAMES_TRACKED = 32 };
@@ skipping 37 matching lines @@
   // indices to picture infos.
   PictureMap picture_map_;
   TilingData tiling_;
 
   // If non-empty, all pictures tiles inside this rect are recorded. There may
   // be recordings outside this rect, but everything inside the rect is
   // recorded.
   gfx::Rect recorded_viewport_;
   float min_contents_scale_;
   SkTileGridFactory::TileGridInfo tile_grid_info_;
-  SkColor background_color_;
   int slow_down_raster_scale_factor_for_debug_;
-  bool contents_opaque_;
-  bool contents_fill_bounds_completely_;
-  bool clear_canvas_with_debug_color_;
   // A hint about whether there are any recordings. This may be a false
   // positive.
   bool has_any_recordings_;
-  bool is_mask_;
   bool is_solid_color_;
   SkColor solid_color_;
   int pixel_record_distance_;
 
  private:
   friend class PicturePileImpl;
 
   void DetermineIfSolidColor();
   void SetBufferPixels(int buffer_pixels);
 
   bool is_suitable_for_gpu_rasterization_;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_PILE_H_