cc: Remove PicturePileBase

cc/resources/picture_pile_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_RESOURCES_PICTURE_PILE_IMPL_H_
 #define CC_RESOURCES_PICTURE_PILE_IMPL_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
-#include "cc/resources/picture_pile_base.h"
+#include "cc/resources/picture_pile.h"
 #include "cc/resources/raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 
-// TODO(vmpstr): Clean up PicturePileBase and make it a member.
 class CC_EXPORT PicturePileImpl : public RasterSource {
  public:
   static scoped_refptr<PicturePileImpl> Create();
-  static scoped_refptr<PicturePileImpl> CreateFromOther(
-      const PicturePileBase* other);
+  static scoped_refptr<PicturePileImpl> CreateFromPicturePile(
+      const PicturePile* other);
 
   // RasterSource overrides. See RasterSource header for full description.
   // When slow-down-raster-scale-factor is set to a value greater than 1, the
   // reported rasterize time (in stats_instrumentation) is the minimum measured
   // value over all runs.
   void PlaybackToCanvas(SkCanvas* canvas,
                         const gfx::Rect& canvas_rect,
                         float contents_scale) const override;
   void PlaybackToSharedCanvas(SkCanvas* canvas,
                               const gfx::Rect& canvas_rect,
@@ skipping 41 matching lines @@
     gfx::Rect layer_rect_;
     TilingData::Iterator tile_iterator_;
     Picture::PixelRefIterator pixel_ref_iterator_;
     std::set<const void*> processed_pictures_;
   };
 
  protected:
   friend class PicturePile;
   friend class PixelRefIterator;
 
-  // TODO(vmpstr): Change this when pictures are split from invalidation info,
-  // and when PicturePileBase goes away.
-  using PictureMapKey = PicturePileBase::PictureMapKey;
-  using PictureMap = PicturePileBase::PictureMap;
-  using PictureInfo = PicturePileBase::PictureInfo;
+  // TODO(vmpstr): Change this when pictures are split from invalidation info.
+  using PictureMapKey = PicturePile::PictureMapKey;
+  using PictureMap = PicturePile::PictureMap;
+  using PictureInfo = PicturePile::PictureInfo;
 
   PicturePileImpl();
-  explicit PicturePileImpl(const PicturePileBase* other);
+  explicit PicturePileImpl(const PicturePile* other);
   ~PicturePileImpl() override;
 
   int buffer_pixels() const { return tiling_.border_texels(); }
 
   PictureMap picture_map_;
   TilingData tiling_;
   SkColor background_color_;
   bool contents_opaque_;
   bool contents_fill_bounds_completely_;
   bool is_solid_color_;
@@ skipping 33 matching lines @@
   gfx::Rect PaddedRect(const PictureMapKey& key) const;
 
   bool should_attempt_to_use_distance_field_text_;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePileImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_PILE_IMPL_H_