Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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 188 matching lines @@
   }
 
   void CreateRasterTasks(unsigned num_raster_tasks,
                          const ImageDecodeTask::Vector& image_decode_tasks,
                          RasterTaskVector* raster_tasks) {
     const gfx::Size size(1, 1);
 
     for (unsigned i = 0; i < num_raster_tasks; ++i) {
       scoped_ptr<ScopedResource> resource(
           ScopedResource::Create(resource_provider_.get()));
-      resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      resource->Allocate(size, ResourceProvider::TextureHintImmutable,
                          RGBA_8888);
 
       ImageDecodeTask::Vector dependencies = image_decode_tasks;
       raster_tasks->push_back(
           new PerfRasterTaskImpl(resource.Pass(), &dependencies));
     }
   }
 
   void BuildTileTaskQueue(TileTaskQueue* queue,
                           const RasterTaskVector& raster_tasks) {
@@ skipping 43 matching lines @@
         Create3dOutputSurfaceAndResourceProvider();
         staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(),
                                                       GL_TEXTURE_2D);
         tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             context_provider_.get(), resource_provider_.get(),
             staging_resource_pool_.get());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_GPU:
         Create3dOutputSurfaceAndResourceProvider();
-        rasterizer_ = GpuRasterizer::Create(
-            context_provider_.get(), resource_provider_.get(), false, false, 0);
         tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             static_cast<GpuRasterizer*>(rasterizer_.get()));
         break;
       case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
         CreateSoftwareOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             resource_provider_.get());
         break;
@@ skipping 226 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