Update from https://crrev.com/311145

cc/layers/picture_layer_impl.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_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "cc/resources/picture_layer_tiling_set.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/resources/tiling_set_eviction_queue.h"
-#include "cc/resources/tiling_set_raster_queue.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 
 struct AppendQuadsData;
 class MicroBenchmarkImpl;
 class Tile;
 
 class CC_EXPORT PictureLayerImpl
@@ skipping 11 matching lines @@
 
   static scoped_ptr<PictureLayerImpl> Create(LayerTreeImpl* tree_impl,
                                              int id,
                                              bool is_mask) {
     return make_scoped_ptr(new PictureLayerImpl(tree_impl, id, is_mask));
   }
   ~PictureLayerImpl() override;
 
   bool is_mask() const { return is_mask_; }
 
-  scoped_ptr<TilingSetEvictionQueue> CreateEvictionQueue(
-      TreePriority tree_priority);
-  scoped_ptr<TilingSetRasterQueue> CreateRasterQueue(bool prioritize_low_res);
-
   // LayerImpl overrides.
   const char* LayerTypeAsString() const override;
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
   void PushPropertiesTo(LayerImpl* layer) override;
   void AppendQuads(RenderPass* render_pass,
                    const Occlusion& occlusion_in_content_space,
                    AppendQuadsData* append_quads_data) override;
   bool UpdateTiles(const Occlusion& occlusion_in_content_space,
                    bool resourceless_software_draw) override;
   void NotifyTileStateChanged(const Tile* tile) override;
@@ skipping 23 matching lines @@
                              gfx::Size* resource_size) const override;
 
   void SetNearestNeighbor(bool nearest_neighbor);
 
   size_t GPUMemoryUsageInBytes() const override;
 
   void RunMicroBenchmark(MicroBenchmarkImpl* benchmark) override;
 
   bool CanHaveTilings() const;
 
+  PictureLayerTilingSet* picture_layer_tiling_set() { return tilings_.get(); }
+
   // Functions used by tile manager.
   PictureLayerImpl* GetPendingOrActiveTwinLayer() const;
   bool IsOnActiveOrPendingTree() const;
   // Virtual for testing.
   virtual bool HasValidTilePriorities() const;
   bool AllTilesRequiredForActivationAreReadyToDraw() const;
   bool AllTilesRequiredForDrawAreReadyToDraw() const;
 
   // Used for benchmarking
   RasterSource* GetRasterSource() const { return raster_source_.get(); }
@@ skipping 68 matching lines @@
   // from regular draws. Save a copy of the required draw properties of the last
   // frame that has a valid viewport for prioritizing tiles.
   gfx::Rect visible_rect_for_tile_priority_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_