Index: gpu/command_buffer/client/gles2_implementation.cc |
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc |
index 9285b6d82ef1721de747ec98f02f3bc47acedf21..9b84def838aeaf0dd3f61bd285e120b296a8746f 100644 |
--- a/gpu/command_buffer/client/gles2_implementation.cc |
+++ b/gpu/command_buffer/client/gles2_implementation.cc |
@@ -85,8 +85,7 @@ GLES2Implementation::GLES2Implementation( |
GLES2CmdHelper* helper, |
ShareGroup* share_group, |
TransferBufferInterface* transfer_buffer, |
- bool bind_generates_resource, |
- ImageFactory* image_factory) |
+ bool bind_generates_resource) |
: helper_(helper), |
transfer_buffer_(transfer_buffer), |
angle_pack_reverse_row_order_status_(kUnknownExtensionStatus), |
@@ -110,8 +109,7 @@ GLES2Implementation::GLES2Implementation( |
debug_(false), |
use_count_(0), |
current_query_(NULL), |
- error_message_callback_(NULL), |
- image_factory_(image_factory) { |
+ error_message_callback_(NULL) { |
GPU_DCHECK(helper); |
GPU_DCHECK(transfer_buffer); |
@@ -165,7 +163,7 @@ bool GLES2Implementation::Initialize( |
query_tracker_.reset(new QueryTracker(mapped_memory_.get())); |
buffer_tracker_.reset(new BufferTracker(mapped_memory_.get())); |
- gpu_memory_buffer_tracker_.reset(new GpuMemoryBufferTracker(image_factory_)); |
+ gpu_memory_buffer_tracker_.reset(new GpuMemoryBufferTracker(helper_)); |
#if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS) |
GetIdHandler(id_namespaces::kBuffers)->MakeIds( |
@@ -2086,13 +2084,10 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) { |
case GL_EXTENSIONS: |
str += std::string(str.empty() ? "" : " ") + |
"GL_CHROMIUM_flipy " |
+ "GL_CHROMIUM_map_image " |
"GL_CHROMIUM_map_sub " |
"GL_CHROMIUM_shallow_flush " |
"GL_EXT_unpack_subimage"; |
- if (image_factory_ != NULL) { |
- // The first space character is intentional. |
- str += " GL_CHROMIUM_map_image"; |
- } |
break; |
default: |
break; |