(not for commit) Simplified multi-threaded Ganesh with lock on Flush only.

cc/resources/tile_task_worker_pool_perftest.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 "cc/resources/tile_task_worker_pool.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/context_provider.h"
@@ skipping 374 matching lines @@
     RunMessageLoopUntilAllTasksHaveCompleted();
 
     perf_test::PrintResult("schedule_and_execute_tasks", TestModifierString(),
                            test_name, timer_.LapsPerSecond(), "runs/s", true);
   }
 
  private:
   void Create3dOutputSurfaceAndResourceProvider() {
     output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
     CHECK(output_surface_->BindToClient(&output_surface_client_));
-    resource_provider_ = ResourceProvider::Create(output_surface_.get(), NULL,
-                                                  &gpu_memory_buffer_manager_,
-                                                  NULL, 0, false, 1).Pass();
+    resource_provider_ =
+        ResourceProvider::Create(output_surface_.get(), NULL,
+                                 &gpu_memory_buffer_manager_, NULL, 0, false,
+                                 false, 1).Pass();
   }
 
   void CreateSoftwareOutputSurfaceAndResourceProvider() {
     output_surface_ = FakeOutputSurface::CreateSoftware(
         make_scoped_ptr(new SoftwareOutputDevice));
     CHECK(output_surface_->BindToClient(&output_surface_client_));
     resource_provider_ =
         ResourceProvider::Create(output_surface_.get(), &shared_bitmap_manager_,
-                                 NULL, NULL, 0, false, 1).Pass();
+                                 NULL, NULL, 0, false, false, 1).Pass();
   }
 
   std::string TestModifierString() const {
     switch (GetParam()) {
       case TILE_TASK_WORKER_POOL_TYPE_PIXEL_BUFFER:
         return std::string("_pixel_tile_task_worker_pool");
       case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY:
         return std::string("_zero_copy_tile_task_worker_pool");
       case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY:
         return std::string("_one_copy_tile_task_worker_pool");
@@ skipping 50 matching lines @@
 
 class TileTaskWorkerPoolCommonPerfTest : public TileTaskWorkerPoolPerfTestBase,
                                          public testing::Test {
  public:
   // Overridden from testing::Test:
   void SetUp() override {
     output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
     CHECK(output_surface_->BindToClient(&output_surface_client_));
     resource_provider_ =
         ResourceProvider::Create(output_surface_.get(), NULL, NULL, NULL, 0,
-                                 false, 1).Pass();
+                                 false, false, 1).Pass();
   }
 
   void RunBuildTileTaskQueueTest(const std::string& test_name,
                                  unsigned num_raster_tasks,
                                  unsigned num_image_decode_tasks) {
     ImageDecodeTask::Vector image_decode_tasks;
     RasterTaskVector raster_tasks;
     CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks);
     CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks);
 
@@ skipping 16 matching lines @@
   RunBuildTileTaskQueueTest("1_0", 1, 0);
   RunBuildTileTaskQueueTest("32_0", 32, 0);
   RunBuildTileTaskQueueTest("1_1", 1, 1);
   RunBuildTileTaskQueueTest("32_1", 32, 1);
   RunBuildTileTaskQueueTest("1_4", 1, 4);
   RunBuildTileTaskQueueTest("32_4", 32, 4);
 }
 
 }  // namespace
 }  // namespace cc