cc: Remove the base RasterSource

cc/playback/display_list_raster_source_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 "base/memory/scoped_ptr.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 23 matching lines @@
                                              solid_paint);
   recording_source->Rerecord();
 
   scoped_refptr<DisplayListRasterSource> raster =
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           recording_source.get(), false);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 300; y += 100) {
     for (int x = 0; x <= 300; x += 100) {
-      RasterSource::SolidColorAnalysis analysis;
+      DisplayListRasterSource::SolidColorAnalysis analysis;
       gfx::Rect rect(x, y, 100, 100);
       raster->PerformSolidColorAnalysis(rect, 1.0, &analysis);
       EXPECT_TRUE(analysis.is_solid_color) << rect.ToString();
       EXPECT_EQ(solid_color, analysis.solid_color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
   recording_source->Rerecord();
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source.get(), false);
 
-  RasterSource::SolidColorAnalysis analysis;
+  DisplayListRasterSource::SolidColorAnalysis analysis;
   raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 100, 100), 1.0, &analysis);
   EXPECT_FALSE(analysis.is_solid_color);
 
   raster->PerformSolidColorAnalysis(gfx::Rect(100, 0, 100, 100), 1.0,
                                     &analysis);
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(solid_color, analysis.solid_color);
 
   // Boundaries should be clipped.
   analysis.is_solid_color = false;
@@ skipping 33 matching lines @@
                                              solid_paint);
   recording_source->Rerecord();
 
   scoped_refptr<DisplayListRasterSource> raster =
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           recording_source.get(), false);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 30; y += 10) {
     for (int x = 0; x <= 30; x += 10) {
-      RasterSource::SolidColorAnalysis analysis;
+      DisplayListRasterSource::SolidColorAnalysis analysis;
       gfx::Rect rect(x, y, 10, 10);
       raster->PerformSolidColorAnalysis(rect, 0.1f, &analysis);
       EXPECT_TRUE(analysis.is_solid_color) << rect.ToString();
       EXPECT_EQ(analysis.solid_color, solid_color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
   recording_source->Rerecord();
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source.get(), false);
 
-  RasterSource::SolidColorAnalysis analysis;
+  DisplayListRasterSource::SolidColorAnalysis analysis;
   raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 10, 10), 0.1f, &analysis);
   EXPECT_FALSE(analysis.is_solid_color);
 
   raster->PerformSolidColorAnalysis(gfx::Rect(10, 0, 10, 10), 0.1f, &analysis);
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(analysis.solid_color, solid_color);
 
   // Boundaries should be clipped.
   analysis.is_solid_color = false;
   raster->PerformSolidColorAnalysis(gfx::Rect(35, 0, 10, 10), 0.1f, &analysis);
@@ skipping 14 matching lines @@
 TEST(DisplayListRasterSourceTest, AnalyzeIsSolidEmpty) {
   gfx::Size layer_bounds(400, 400);
 
   scoped_ptr<FakeDisplayListRecordingSource> recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
   recording_source->Rerecord();
 
   scoped_refptr<DisplayListRasterSource> raster =
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           recording_source.get(), false);
-  RasterSource::SolidColorAnalysis analysis;
+  DisplayListRasterSource::SolidColorAnalysis analysis;
   EXPECT_FALSE(analysis.is_solid_color);
 
   raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 400, 400), 1.f, &analysis);
 
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(analysis.solid_color, SkColorSetARGB(0, 0, 0, 0));
 }
 
 TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
   gfx::Size layer_bounds(512, 512);
@@ skipping 171 matching lines @@
     }
   }
 
   // Re-record everything as black.
   SkPaint black_paint;
   black_paint.setColor(SK_ColorBLACK);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              black_paint);
   recording_source->Rerecord();
 
-  // Make a new RasterSource from the new recording.
+  // Make a new DisplayListRasterSource from the new recording.
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source.get(), false);
 
   // We're going to playback from "everything is black" into a smaller area,
   // that touches the edge pixels of the recording.
   playback_rect.Inset(1, 2, 0, 1);
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
                            contents_scale);
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
@@ skipping 81 matching lines @@
   recording_source_light->SetRequiresClear(true);
   recording_source_light->SetClearCanvasWithDebugColor(false);
 
   // Record everything as a slightly lighter white.
   const unsigned alpha_light = 18u;
   white_paint.setAlpha(alpha_light);
   recording_source_light->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                                    white_paint);
   recording_source_light->Rerecord();
 
-  // Make a new RasterSource from the new recording.
+  // Make a new DisplayListRasterSource from the new recording.
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source_light.get(), false);
 
   // We're going to playback from alpha(18) white rectangle into a smaller area
   // of the recording resulting in a smaller lighter white rectangle over a
   // darker white background rectangle.
   playback_rect =
       gfx::Rect(gfx::ScaleToCeiledSize(partial_bounds, contents_scale));
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
                            contents_scale);
@@ skipping 57 matching lines @@
   scoped_refptr<DisplayListRasterSource> raster =
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           recording_source.get(), false);
   size_t total_memory_usage = raster->GetPictureMemoryUsage();
   EXPECT_GE(total_memory_usage, kReportedMemoryUsageInBytes);
   EXPECT_LT(total_memory_usage, 2 * kReportedMemoryUsageInBytes);
 }
 
 }  // namespace
 }  // namespace cc