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

cc/resources/picture_pile.h

Index: cc/resources/picture_pile.h
diff --git a/cc/resources/picture_pile.h b/cc/resources/picture_pile.h
index ffd9b52ddb2d53c43d9cf0b2896515a678034a22..e252e979030776712d169824a446fe22832ac316 100644
--- a/cc/resources/picture_pile.h
+++ b/cc/resources/picture_pile.h
@@ -6,7 +6,9 @@
 #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"
@@ -23,21 +25,17 @@ class CC_EXPORT PicturePile : public RecordingSource {
   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 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 SetTileGridSize(const gfx::Size& tile_grid_size) override;
   void SetUnsuitableForGpuRasterizationForTesting() override;
   SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
 
@@ -95,15 +93,10 @@ class CC_EXPORT PicturePile : public RecordingSource {
   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_;