Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

cc/resources/raster_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/raster_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 244 matching lines @@
                                             task_graph_runner_.get(),
                                             context_provider_.get(),
                                             resource_provider_.get(),
                                             staging_resource_pool_.get());
         break;
       case RASTER_WORKER_POOL_TYPE_GPU:
         Create3dOutputSurfaceAndResourceProvider();
         raster_worker_pool_ =
             GpuRasterWorkerPool::Create(task_runner_.get(),
                                         context_provider_.get(),
-                                        resource_provider_.get());
+                                        resource_provider_.get(),
+                                        false);
         break;
       case RASTER_WORKER_POOL_TYPE_BITMAP:
         CreateSoftwareOutputSurfaceAndResourceProvider();
         raster_worker_pool_ =
             BitmapRasterWorkerPool::Create(task_runner_.get(),
                                            task_graph_runner_.get(),
                                            resource_provider_.get());
         break;
     }
 
@@ skipping 123 matching lines @@
  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,
-                                                  false).Pass();
+                                                  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,
-                                                  false).Pass();
+                                                  1).Pass();
   }
 
   std::string TestModifierString() const {
     switch (GetParam()) {
       case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER:
         return std::string("_pixel_raster_worker_pool");
       case RASTER_WORKER_POOL_TYPE_ZERO_COPY:
         return std::string("_zero_copy_raster_worker_pool");
       case RASTER_WORKER_POOL_TYPE_ONE_COPY:
         return std::string("_one_copy_raster_worker_pool");
@@ skipping 49 matching lines @@
 
 class RasterWorkerPoolCommonPerfTest : public RasterWorkerPoolPerfTestBase,
                                        public testing::Test {
  public:
   // Overridden from testing::Test:
   virtual 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, false).Pass();
+            output_surface_.get(), NULL, NULL, NULL, 0, false, 1).Pass();
   }
 
   void RunBuildRasterTaskQueueTest(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 20 matching lines @@
   RunBuildRasterTaskQueueTest("1_0", 1, 0);
   RunBuildRasterTaskQueueTest("32_0", 32, 0);
   RunBuildRasterTaskQueueTest("1_1", 1, 1);
   RunBuildRasterTaskQueueTest("32_1", 32, 1);
   RunBuildRasterTaskQueueTest("1_4", 1, 4);
   RunBuildRasterTaskQueueTest("32_4", 32, 4);
 }
 
 }  // namespace
 }  // namespace cc