Update from https://crrev.com/315085

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 <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/tiling_data.h"
-#include "cc/resources/recording_source.h"
+#include "cc/resources/picture.h"
 
 namespace cc {
 class PicturePileImpl;
 
 class CC_EXPORT PicturePile : public RecordingSource {
  public:
   PicturePile(float min_contents_scale, const gfx::Size& tile_grid_size);
   ~PicturePile() override;
 
   // RecordingSource overrides.
-  bool UpdateAndExpandInvalidation(
-      ContentLayerClient* painter,
-      Region* invalidation,
-      bool can_use_lcd_text,
-      const gfx::Size& layer_size,
-      const gfx::Rect& visible_layer_rect,
-      int frame_number,
-      Picture::RecordingMode recording_mode) override;
+  bool UpdateAndExpandInvalidation(ContentLayerClient* painter,
+                                   Region* invalidation,
+                                   bool can_use_lcd_text,
+                                   const gfx::Size& layer_size,
+                                   const gfx::Rect& visible_layer_rect,
+                                   int frame_number,
+                                   RecordingMode recording_mode) override;
   scoped_refptr<RasterSource> CreateRasterSource() const override;
   gfx::Size GetSize() const final;
   void SetEmptyBounds() override;
   void SetSlowdownRasterScaleFactor(int factor) override;
   bool IsSuitableForGpuRasterization() const override;
   void SetUnsuitableForGpuRasterizationForTesting() override;
   gfx::Size GetTileGridSizeForTesting() const override;
 
  protected:
   class CC_EXPORT PictureInfo {
@@ skipping 55 matching lines @@
   // positive.
   bool has_any_recordings_;
   bool is_solid_color_;
   SkColor solid_color_;
   int pixel_record_distance_;
 
  private:
   friend class PicturePileImpl;
 
   void CreatePictures(ContentLayerClient* painter,
-                      Picture::RecordingMode recording_mode,
+                      RecordingMode recording_mode,
                       const std::vector<gfx::Rect>& record_rects);
   void GetInvalidTileRects(const gfx::Rect& interest_rect,
                            Region* invalidation,
                            const gfx::Rect& visible_layer_rect,
                            int frame_number,
                            std::vector<gfx::Rect>* invalid_tiles);
   bool ApplyInvalidationAndResize(const gfx::Rect& interest_rect,
                                   Region* invalidation,
                                   const gfx::Size& layer_size,
                                   int frame_number,
                                   bool can_use_lcd_text_changed);
   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_