cc: GPU rasterize tiles synchronously in PrepareToDraw.

cc/test/layer_tree_pixel_resource_test.cc

Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index 83a338e6bd929edad8ab858da7464639a5ceb4ae..66246b76a756bc4704c1cfa0948fd8ef68a56b56 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -6,10 +6,12 @@
 
 #include "cc/layers/layer.h"
 #include "cc/resources/bitmap_tile_task_worker_pool.h"
+#include "cc/resources/gpu_rasterizer.h"
 #include "cc/resources/gpu_tile_task_worker_pool.h"
 #include "cc/resources/one_copy_tile_task_worker_pool.h"
 #include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
+#include "cc/resources/software_rasterizer.h"
 #include "cc/resources/tile_task_worker_pool.h"
 #include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
@@ -126,6 +128,7 @@ void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
 void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
     LayerTreeHostImpl* host_impl,
     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 =
@@ -152,6 +155,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
       *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           resource_provider);
+
+      *rasterizer = SoftwareRasterizer::Create();
       break;
     case GPU_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
@@ -162,8 +167,10 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
                                resource_provider->best_texture_format());
 
       *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
-          task_runner, context_provider, resource_provider,
-          use_distance_field_text);
+          task_runner, TileTaskWorkerPool::GetTaskGraphRunner());
+
+      *rasterizer = GpuRasterizer::Create(context_provider, resource_provider,
+                                          use_distance_field_text, false);
       break;
     case ZERO_COPY_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
@@ -177,6 +184,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
       *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           resource_provider);
+
+      *rasterizer = SoftwareRasterizer::Create();
       break;
     case ONE_COPY_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
@@ -195,6 +204,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
       *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           context_provider, resource_provider, staging_resource_pool->get());
+
+      *rasterizer = SoftwareRasterizer::Create();
       break;
     case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
@@ -207,6 +218,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
       *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           context_provider, resource_provider, max_transfer_buffer_usage_bytes);
+
+      *rasterizer = SoftwareRasterizer::Create();
       break;
   }
 }