cc: Do solid color analysis before scheduling tiles.

cc/tiles/tile_manager.cc

 // 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.
 
 #include "cc/tiles/tile_manager.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 63 matching lines @@
         reply_(reply) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     TRACE_EVENT1("cc", "RasterizerTaskImpl::RunOnWorkerThread",
                  "source_prepare_tiles_id", source_prepare_tiles_id_);
 
     DCHECK(raster_source_.get());
     DCHECK(raster_buffer_);
 
-    if (analyze_picture_) {
-      Analyze(raster_source_.get());
-      if (analysis_.is_solid_color)
-        return;
-    }
-
     Raster(raster_source_.get());
   }
 
   // Overridden from TileTask:
   void ScheduleOnOriginThread(TileTaskClient* client) override {
     DCHECK(!raster_buffer_);
     raster_buffer_ = client->AcquireBufferForRaster(
         resource_, resource_content_id_, previous_content_id_);
   }
   void CompleteOnOriginThread(TileTaskClient* client) override {
@@ skipping 615 matching lines @@
       CreateTaskSetFinishedTask(&TileManager::DidFinishRunningAllTileTasks);
 
   // Build a new task queue containing all task currently needed. Tasks
   // are added in order of priority, highest priority task first.
   for (auto& prioritized_tile : tiles_that_need_to_be_rasterized) {
     Tile* tile = prioritized_tile.tile();
 
     DCHECK(tile->draw_info().requires_resource());
     DCHECK(!tile->draw_info().resource_);
 
+    SkColor color = SK_ColorTRANSPARENT;
+    bool is_solid_color = prioritized_tile.raster_source()->IsSolidColorTile(

[vmpstr, 2015/12/17 18:55:47]

This is an OK spot to do this. When I was thinking about it, I wanted to put it
in AssignGpuMemory, since if it's solid color we can schedule an extra tile for
raster. At this point, we can only reduce the list of tiles, we can't fill the
available spots with new tiles.

[sohanjg, 2015/12/18 12:50:00]

Done.

+        tile->content_rect(), tile->contents_scale(), &color);
+    if (is_solid_color) {
+      tile->draw_info().set_solid_color(color);
+      continue;
+    }
+
     if (!tile->raster_task_) {
       tile->raster_task_ = CreateRasterTask(prioritized_tile);
     }
 
     RasterTask* task = tile->raster_task_.get();
     DCHECK(!task->HasCompleted());
 
     if (!tile->raster_task_.get())
       tile->raster_task_ = CreateRasterTask(prioritized_tile);
 
@@ skipping 116 matching lines @@
 }
 
 void TileManager::UpdateTileDrawInfo(
     Tile* tile,
     Resource* resource,
     const DisplayListRasterSource::SolidColorAnalysis& analysis) {
   TileDrawInfo& draw_info = tile->draw_info();
 
   ++flush_stats_.completed_count;
 
-  if (analysis.is_solid_color) {
-    draw_info.set_solid_color(analysis.solid_color);
+  if (draw_info.mode() == TileDrawInfo::SOLID_COLOR_MODE) {

[vmpstr, 2015/12/17 18:55:47]

This shouldn't be possible anymore, right? UpdateTileDrawInfo shouldn't take
analysis anymore.

[sohanjg, 2015/12/18 12:50:00]

Acknowledged.

     if (resource) {
       // TODO(ericrk): If more partial raster work is done in the future, it may
       // be worth returning the resource to the pool with its previous ID (not
       // currently tracked). crrev.com/1370333002/#ps40001 has a possible method
       // of achieving this.
       resource_pool_->ReleaseResource(resource, 0 /* content_id */);
     }
   } else {
     DCHECK(resource);
     draw_info.set_use_resource();
@@ skipping 291 matching lines @@
 void TileManager::Signals::reset() {
   ready_to_activate = false;
   did_notify_ready_to_activate = false;
   ready_to_draw = false;
   did_notify_ready_to_draw = false;
   all_tile_tasks_completed = false;
   did_notify_all_tile_tasks_completed = false;
 }
 
 }  // namespace cc