cc: Do solid color analysis before scheduling tiles.

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 <stddef.h>
 
 #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"
@@ skipping 11 matching lines @@
   gfx::Size layer_bounds(400, 400);
 
   scoped_ptr<FakeDisplayListRecordingSource> recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
   SkPaint solid_paint;
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
+  SkColor color = SK_ColorTRANSPARENT;
   SkPaint non_solid_paint;
+  bool is_solid_color = false;
   non_solid_paint.setColor(non_solid_color);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              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) {
-      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();
+      is_solid_color = raster->PerformSolidColorAnalysis(rect, 1.0, &color);
+      EXPECT_TRUE(is_solid_color) << rect.ToString();
+      EXPECT_EQ(solid_color, 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);
 
-  DisplayListRasterSource::SolidColorAnalysis analysis;
-  raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 100, 100), 1.0, &analysis);
-  EXPECT_FALSE(analysis.is_solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 100, 100), 1.0, &color);
+  EXPECT_FALSE(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);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color = raster->PerformSolidColorAnalysis(
+      gfx::Rect(100, 0, 100, 100), 1.0, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(solid_color, color);
 
   // Boundaries should be clipped.
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(350, 0, 100, 100), 1.0,
-                                    &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(solid_color, analysis.solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color = raster->PerformSolidColorAnalysis(
+      gfx::Rect(350, 0, 100, 100), 1.0, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(solid_color, color);
 
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(0, 350, 100, 100), 1.0,
-                                    &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(solid_color, analysis.solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color = raster->PerformSolidColorAnalysis(
+      gfx::Rect(0, 350, 100, 100), 1.0, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(solid_color, color);
 
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(350, 350, 100, 100), 1.0,
-                                    &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(solid_color, analysis.solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color = raster->PerformSolidColorAnalysis(
+      gfx::Rect(350, 350, 100, 100), 1.0, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(solid_color, color);
 }
 
 TEST(DisplayListRasterSourceTest, AnalyzeIsSolidScaled) {
   gfx::Size layer_bounds(400, 400);
 
   scoped_ptr<FakeDisplayListRecordingSource> recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
+  SkColor color = SK_ColorTRANSPARENT;
   SkPaint solid_paint;
+  bool is_solid_color = false;
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
   SkPaint non_solid_paint;
   non_solid_paint.setColor(non_solid_color);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 400, 400),
                                              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) {
-      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();
+      is_solid_color = raster->PerformSolidColorAnalysis(rect, 0.1f, &color);
+      EXPECT_TRUE(is_solid_color) << rect.ToString();
+      EXPECT_EQ(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);
 
-  DisplayListRasterSource::SolidColorAnalysis analysis;
-  raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 10, 10), 0.1f, &analysis);
-  EXPECT_FALSE(analysis.is_solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 10, 10), 0.1f, &color);
+  EXPECT_FALSE(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);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(10, 0, 10, 10), 0.1f, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(color, solid_color);
 
   // Boundaries should be clipped.
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(35, 0, 10, 10), 0.1f, &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(analysis.solid_color, solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(35, 0, 10, 10), 0.1f, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(color, solid_color);
 
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(0, 35, 10, 10), 0.1f, &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(analysis.solid_color, solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 35, 10, 10), 0.1f, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(color, solid_color);
 
-  analysis.is_solid_color = false;
-  raster->PerformSolidColorAnalysis(gfx::Rect(35, 35, 10, 10), 0.1f, &analysis);
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(analysis.solid_color, solid_color);
+  color = SK_ColorTRANSPARENT;
+  is_solid_color = raster->PerformSolidColorAnalysis(gfx::Rect(35, 35, 10, 10),
+                                                     0.1f, &color);
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(color, solid_color);
 }
 
 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);
-  DisplayListRasterSource::SolidColorAnalysis analysis;
-  EXPECT_FALSE(analysis.is_solid_color);
 
-  raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 400, 400), 1.f, &analysis);
+  SkColor color = SK_ColorTRANSPARENT;
+  bool is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 400, 400), 1.f, &color);
 
-  EXPECT_TRUE(analysis.is_solid_color);
-  EXPECT_EQ(analysis.solid_color, SkColorSetARGB(0, 0, 0, 0));
+  EXPECT_TRUE(is_solid_color);
+  EXPECT_EQ(color, SkColorSetARGB(0, 0, 0, 0));
 }
 
 TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
   gfx::Size layer_bounds(512, 512);
 
   scoped_ptr<FakeDisplayListRecordingSource> recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
   skia::RefPtr<SkImage> discardable_image[2][2];
   discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
@@ skipping 347 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