cc: GPU rasterize tiles synchronously in PrepareToDraw.

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index c9d76c622095c56b0f7f92d7190d879eeba15aef..ee1e5ba398730018930329220de33c4c44da1336 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -49,6 +49,7 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/bitmap_tile_task_worker_pool.h"
 #include "cc/resources/eviction_tile_priority_queue.h"
+#include "cc/resources/gpu_rasterizer.h"
 #include "cc/resources/gpu_tile_task_worker_pool.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/one_copy_tile_task_worker_pool.h"
@@ -57,6 +58,7 @@
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/resource_pool.h"
+#include "cc/resources/software_rasterizer.h"
 #include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/resources/tile_task_worker_pool.h"
 #include "cc/resources/ui_resource_bitmap.h"
@@ -382,6 +384,13 @@ void LayerTreeHostImpl::Animate(base::TimeTicks monotonic_time) {
   AnimateTopControls(monotonic_time);
 }
 
+void LayerTreeHostImpl::PrepareTilesBeforeDraw() {
+  if (!tile_manager_)
+    return;
+
+  tile_manager_->PrepareTilesBeforeDraw(global_tile_state_);
+}
+
 void LayerTreeHostImpl::PrepareTiles() {
   if (!tile_manager_)
     return;
@@ -1065,6 +1074,8 @@ DrawResult LayerTreeHostImpl::PrepareToDraw(FrameData* frame) {
   bool ok = active_tree_->UpdateDrawProperties();
   DCHECK(ok) << "UpdateDrawProperties failed during draw";
 
+  PrepareTilesBeforeDraw();
+
   frame->render_surface_layer_list = &active_tree_->RenderSurfaceLayerList();
   frame->render_passes.clear();
   frame->render_passes_by_id.clear();
@@ -1858,6 +1869,7 @@ void LayerTreeHostImpl::SetVisible(bool visible) {
 
   // Evict tiles immediately if invisible since this tab may never get another
   // draw or timer tick.
+  // TODO(vmiura): Make sure we do evict tiles in all modes.
   if (!visible_)
     PrepareTiles();
 
@@ -1952,8 +1964,8 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
   DCHECK(output_surface_);
   DCHECK(resource_provider_);
 
-  CreateResourceAndTileTaskWorkerPool(&tile_task_worker_pool_, &resource_pool_,
-                                      &staging_resource_pool_);
+  CreateResourceAndTileTaskWorkerPool(&tile_task_worker_pool_, &rasterizer_,
+                                      &resource_pool_, &staging_resource_pool_);
   DCHECK(tile_task_worker_pool_);
   DCHECK(resource_pool_);
 
@@ -1964,15 +1976,17 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
   size_t scheduled_raster_task_limit =
       IsSynchronousSingleThreaded() ? std::numeric_limits<size_t>::max()
                                     : settings_.scheduled_raster_task_limit;
-  tile_manager_ = TileManager::Create(
-      this, task_runner, resource_pool_.get(),
-      tile_task_worker_pool_->AsTileTaskRunner(), scheduled_raster_task_limit);
+  tile_manager_ =
+      TileManager::Create(this, task_runner, resource_pool_.get(),
+                          tile_task_worker_pool_->AsTileTaskRunner(),
+                          rasterizer_.get(), scheduled_raster_task_limit);
 
   UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
 }
 
 void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
     scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
+    scoped_ptr<Rasterizer>* rasterizer,
     scoped_ptr<ResourcePool>* resource_pool,
     scoped_ptr<ResourcePool>* staging_resource_pool) {
   base::SingleThreadTaskRunner* task_runner =
@@ -1990,6 +2004,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
     *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
         task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
         resource_provider_.get());
+
+    *rasterizer = SoftwareRasterizer::Create();
     return;
   }
 
@@ -2000,8 +2016,13 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
                              resource_provider_->best_texture_format());
 
     *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
-        task_runner, context_provider, resource_provider_.get(),
-        settings_.use_distance_field_text);
+        task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider,
+        resource_provider_.get(), settings_.use_distance_field_text);
+
+    *rasterizer =
+        GpuRasterizer::Create(context_provider, resource_provider_.get(),
+                              settings_.use_distance_field_text, false);
+
     return;
   }
 
@@ -2014,6 +2035,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
         image_target == GL_TEXTURE_EXTERNAL_OES,
         context_provider->ContextCapabilities().gpu.egl_image_external);
 
+    *rasterizer = SoftwareRasterizer::Create();
+
     if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) {
       *resource_pool =
           ResourcePool::Create(resource_provider_.get(), image_target,
@@ -2059,6 +2082,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
       resource_provider_.get(),
       GetMaxTransferBufferUsageBytes(context_provider->ContextCapabilities(),
                                      settings_.renderer_settings.refresh_rate));
+
+  *rasterizer = SoftwareRasterizer::Create();
 }
 
 void LayerTreeHostImpl::DestroyTileManager() {
@@ -2066,6 +2091,7 @@ void LayerTreeHostImpl::DestroyTileManager() {
   resource_pool_ = nullptr;
   staging_resource_pool_ = nullptr;
   tile_task_worker_pool_ = nullptr;
+  rasterizer_ = nullptr;
   single_thread_synchronous_task_graph_runner_ = nullptr;
 }