cc: Move RasterBuffer implementations from ResourceProvider to RasterWorkerPool implementations.

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"
 #include "cc/resources/gpu_raster_worker_pool.h"
 #include "cc/resources/image_copy_raster_worker_pool.h"
 #include "cc/resources/image_raster_worker_pool.h"
 #include "cc/resources/pixel_buffer_raster_worker_pool.h"
+#include "cc/resources/raster_buffer.h"
 #include "cc/resources/rasterizer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_support.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 16 matching lines @@
       buffers[i] = 1u;
   }
   virtual void GenTextures(GLsizei n, GLuint* textures) OVERRIDE {
     for (GLsizei i = 0; i < n; ++i)
       textures[i] = 1u;
   }
   virtual void GetIntegerv(GLenum pname, GLint* params) OVERRIDE {
     if (pname == GL_MAX_TEXTURE_SIZE)
       *params = INT_MAX;
   }
+  virtual void GenQueriesEXT(GLsizei n, GLuint* queries) OVERRIDE {
+    for (GLsizei i = 0; i < n; ++i)
+      queries[i] = 1u;
+  }
+  virtual void GetQueryObjectuivEXT(GLuint query,
+                                    GLenum pname,
+                                    GLuint* params) OVERRIDE {
+    if (pname == GL_QUERY_RESULT_AVAILABLE_EXT)
+      *params = 1;
+  }
 };
 
 class PerfContextProvider : public ContextProvider {
  public:
   PerfContextProvider() : context_gl_(new PerfGLES2Interface) {}
 
   virtual bool BindToCurrentThread() OVERRIDE { return true; }
-  virtual Capabilities ContextCapabilities() OVERRIDE { return Capabilities(); }
+  virtual Capabilities ContextCapabilities() OVERRIDE {
+    Capabilities capabilities;
+    capabilities.gpu.map_image = true;
+    capabilities.gpu.sync_query = true;
+    return capabilities;
+  }
   virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE {
     return context_gl_.get();
   }
   virtual gpu::ContextSupport* ContextSupport() OVERRIDE { return &support_; }
   virtual class GrContext* GrContext() OVERRIDE { return NULL; }
   virtual bool IsContextLost() OVERRIDE { return false; }
   virtual void VerifyContexts() OVERRIDE {}
   virtual void DeleteCachedResources() OVERRIDE {}
   virtual bool DestroyedOnMainThread() OVERRIDE { return false; }
   virtual void SetLostContextCallback(const LostContextCallback& cb) OVERRIDE {}
@@ skipping 46 matching lines @@
  public:
   PerfRasterTaskImpl(scoped_ptr<ScopedResource> resource,
                      ImageDecodeTask::Vector* dependencies)
       : RasterTask(resource.get(), dependencies), resource_(resource.Pass()) {}
 
   // Overridden from Task:
   virtual void RunOnWorkerThread() OVERRIDE {}
 
   // Overridden from RasterizerTask:
   virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
-    client->AcquireBufferForRaster(this);
+    raster_buffer_ = client->AcquireBufferForRaster(resource());
   }
   virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
-    client->ReleaseBufferForRaster(this);
+    client->ReleaseBufferForRaster(raster_buffer_.Pass());
   }
   virtual void RunReplyOnOriginThread() OVERRIDE { Reset(); }
 
   void Reset() {
     did_run_ = false;
     did_complete_ = false;
   }
 
  protected:
   virtual ~PerfRasterTaskImpl() {}
 
  private:
   scoped_ptr<ScopedResource> resource_;
+  scoped_ptr<RasterBuffer> raster_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(PerfRasterTaskImpl);
 };
 
 class RasterWorkerPoolPerfTestBase {
  public:
   typedef std::vector<scoped_refptr<RasterTask> > RasterTaskVector;
 
   enum NamedTaskSet { REQUIRED_FOR_ACTIVATION = 0, ALL = 1 };
 
@@ skipping 315 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