cc: GPU rasterize tiles synchronously in PrepareToDraw.

cc/test/layer_tree_pixel_resource_test.cc

 // Copyright 2014 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/test/layer_tree_pixel_resource_test.h"
 
 #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"
 #include "gpu/GLES2/gl2extchromium.h"
 
 namespace cc {
 
 namespace {
 
 bool IsTestCaseSupported(PixelResourceTestCase test_case) {
@@ skipping 93 matching lines @@
     case GL_ASYNC_UPLOAD_2D_DRAW:
       test_type_ = PIXEL_TEST_GL;
       staging_texture_target_ = GL_INVALID_VALUE;
       draw_texture_target_ = GL_TEXTURE_2D;
       resource_pool_option_ = PIXEL_BUFFER_TILE_TASK_WORKER_POOL;
       return;
   }
   NOTREACHED();
 }
 
+void LayerTreeHostPixelResourceTest::CreateRasterizer(
+    LayerTreeHostImpl* host_impl,
+    scoped_ptr<Rasterizer>* rasterizer) {
+  bool use_distance_field_text = false;
+  ContextProvider* context_provider =
+      host_impl->output_surface()->context_provider();
+  ResourceProvider* resource_provider = host_impl->resource_provider();
+  switch (resource_pool_option_) {
+    case BITMAP_TILE_TASK_WORKER_POOL:
+    case ZERO_COPY_TILE_TASK_WORKER_POOL:
+    case ONE_COPY_TILE_TASK_WORKER_POOL:
+    case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
+      *rasterizer = SoftwareRasterizer::Create();
+      break;
+    case GPU_TILE_TASK_WORKER_POOL:
+      EXPECT_TRUE(context_provider);
+      *rasterizer = GpuRasterizer::Create(context_provider, resource_provider,
+                                          use_distance_field_text, false);
+      break;
+  }
+}
+
 void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
     LayerTreeHostImpl* host_impl,
     scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
     scoped_ptr<ResourcePool>* resource_pool,
     scoped_ptr<ResourcePool>* staging_resource_pool) {
   base::SingleThreadTaskRunner* task_runner =
       proxy()->HasImplThread() ? proxy()->ImplThreadTaskRunner()
                                : proxy()->MainThreadTaskRunner();
   DCHECK(task_runner);
   DCHECK(initialized_);
 
   ContextProvider* context_provider =
       host_impl->output_surface()->context_provider();
   ResourceProvider* resource_provider = host_impl->resource_provider();
-  bool use_distance_field_text = false;
   size_t max_transfer_buffer_usage_bytes = 1024u * 1024u * 60u;
 
   switch (resource_pool_option_) {
     case BITMAP_TILE_TASK_WORKER_POOL:
       EXPECT_FALSE(context_provider);
       EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
       *resource_pool =
           ResourcePool::Create(resource_provider,
                                draw_texture_target_,
                                resource_provider->best_texture_format());
 
       *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
           task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
           resource_provider);
       break;
     case GPU_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       *resource_pool =
           ResourcePool::Create(resource_provider,
                                draw_texture_target_,
                                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());
       break;
     case ZERO_COPY_TILE_TASK_WORKER_POOL:
       EXPECT_TRUE(context_provider);
       EXPECT_EQ(PIXEL_TEST_GL, test_type_);
       EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
       *resource_pool =
           ResourcePool::Create(resource_provider,
                                draw_texture_target_,
                                resource_provider->best_texture_format());
 
@@ skipping 43 matching lines @@
 
   if (layer_tree_host())
     EXPECT_TRUE(layer_tree_host()->settings().impl_side_painting);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
     : LayerTreeHostPixelResourceTest(GetParam()) {
 }
 
 }  // namespace cc