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 e0b0cb82f60b36b2a9e5f3f39217aaec0112f9d4..852bd3ad04e2a1c96cd3e16dc3075540c591ef33 100644 |
--- a/gpu/command_buffer/client/gles2_implementation.cc |
+++ b/gpu/command_buffer/client/gles2_implementation.cc |
@@ -86,7 +86,8 @@ GLES2Implementation::GLES2Implementation( |
ShareGroup* share_group, |
TransferBufferInterface* transfer_buffer, |
bool bind_generates_resource, |
- GpuControl* gpu_control) |
+ GpuControl* gpu_control, |
+ const Capabilities& capabilities) |
: helper_(helper), |
transfer_buffer_(transfer_buffer), |
angle_pack_reverse_row_order_status_(kUnknownExtensionStatus), |
@@ -111,7 +112,7 @@ GLES2Implementation::GLES2Implementation( |
use_count_(0), |
error_message_callback_(NULL), |
gpu_control_(gpu_control), |
- capabilities_(gpu_control->GetCapabilities()), |
+ capabilities_(capabilities), |
weak_ptr_factory_(this) { |
DCHECK(helper); |
DCHECK(transfer_buffer); |
@@ -2142,11 +2143,8 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) { |
case GL_EXTENSIONS: |
str += std::string(str.empty() ? "" : " ") + |
"GL_CHROMIUM_flipy " |
+ "GL_CHROMIUM_map_image " |
"GL_EXT_unpack_subimage"; |
- if (capabilities_.map_image) { |
- // The first space character is intentional. |
- str += " GL_CHROMIUM_map_image"; |
- } |
break; |
default: |
break; |