cc: Added raster source.

cc/resources/picture_pile_unittest.cc

 // Copyright 2013 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.
 
 #include <map>
 #include <utility>
 
 #include "cc/resources/picture_pile.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_rendering_stats_instrumentation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace cc {
 namespace {
 
 class TestPicturePile : public PicturePile {
  public:
+  ~TestPicturePile() override {}
+
   using PicturePile::buffer_pixels;
   using PicturePile::CanRasterSlowTileCheck;
   using PicturePile::Clear;
 
   PictureMap& picture_map() { return picture_map_; }
   const gfx::Rect& recorded_viewport() const { return recorded_viewport_; }
 
   bool CanRasterLayerRect(const gfx::Rect& layer_rect) {
     return CanRaster(1.f, layer_rect);
   }
 
   typedef PicturePile::PictureInfo PictureInfo;
   typedef PicturePile::PictureMapKey PictureMapKey;
   typedef PicturePile::PictureMap PictureMap;
-
- protected:
-  ~TestPicturePile() override {}
 };
 
 class PicturePileTestBase {
  public:
   PicturePileTestBase()
       : background_color_(SK_ColorBLUE),
         min_scale_(0.125),
         frame_number_(0),
         contents_opaque_(false) {}
 
   void InitializeData() {
-    pile_ = make_scoped_refptr(new TestPicturePile());
+    pile_.reset(new TestPicturePile());
     pile_->SetTileGridSize(gfx::Size(1000, 1000));
     pile_->SetMinContentsScale(min_scale_);
     client_ = FakeContentLayerClient();
     SetTilingSize(pile_->tiling().max_texture_size());
   }
 
   void SetTilingSize(const gfx::Size& tiling_size) {
     Region invalidation;
     gfx::Rect viewport_rect(tiling_size);
     UpdateAndExpandInvalidation(&invalidation, tiling_size, viewport_rect);
@@ skipping 21 matching lines @@
   bool UpdateWholePile() {
     Region invalidation = tiling_rect();
     bool result = UpdateAndExpandInvalidation(
         &invalidation, tiling_size(), tiling_rect());
     EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
     return result;
   }
 
   FakeContentLayerClient client_;
   FakeRenderingStatsInstrumentation stats_instrumentation_;
-  scoped_refptr<TestPicturePile> pile_;
+  scoped_ptr<TestPicturePile> pile_;

[enne (OOO), 2014/10/24 22:27:35]

This could probably just be a member too...

[vmpstr, 2014/10/24 23:15:23]

I did that first and then I thought "but that changes behaviour, since we don't
reset it back to the default state". I'll change it and see if the tests are
happy

   SkColor background_color_;
   float min_scale_;
   int frame_number_;
   bool contents_opaque_;
 };
 
 class PicturePileTest : public PicturePileTestBase, public testing::Test {
  public:
   virtual void SetUp() override { InitializeData(); }
 };
@@ skipping 1328 matching lines @@
   client_.add_draw_rect(tiling_rect(), paint);
   client_.add_draw_rect(tiling_rect(), paint);
   client_.add_draw_rect(tiling_rect(), paint);
   Region invalidation5(tiling_rect());
   UpdateAndExpandInvalidation(&invalidation5, tiling_size(), tiling_rect());
   EXPECT_FALSE(pile_->is_solid_color());
 }
 
 }  // namespace
 }  // namespace cc