Index: cc/resources/raster_worker_pool_perftest.cc |
diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc |
index da53d8ecfe4a9918435f52f7137d6a08a5140790..d37b526fc76ed2f5ad61452533ad8cb613161944 100644 |
--- a/cc/resources/raster_worker_pool_perftest.cc |
+++ b/cc/resources/raster_worker_pool_perftest.cc |
@@ -12,6 +12,7 @@ |
#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" |
@@ -48,6 +49,16 @@ class PerfGLES2Interface : public gpu::gles2::GLES2InterfaceStub { |
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 { |
@@ -122,10 +133,10 @@ class PerfRasterTaskImpl : public RasterTask { |
// 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(); } |
@@ -139,6 +150,7 @@ class PerfRasterTaskImpl : public RasterTask { |
private: |
scoped_ptr<ScopedResource> resource_; |
+ scoped_ptr<RasterBuffer> raster_buffer_; |
DISALLOW_COPY_AND_ASSIGN(PerfRasterTaskImpl); |
}; |