gpu: Rename Capabilities::map_image to Capabilities::image.

Just a rename that we forgot to do when changing the name of the
extension.

BUG=418553
TBR=piman@chromium.org,jln@chromium.org

Review URL: https://codereview.chromium.org/612093008

Cr-Commit-Position: refs/heads/master@{#297427}

12 files changed, 17 insertions, 16 deletions

diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index de6c2b6..5a92019 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -45,7 +45,7 @@ DelegatingRenderer::DelegatingRenderer(RendererClient* client,
 
   if (!output_surface_->context_provider()) {
     capabilities_.using_shared_memory_resources = true;
-    capabilities_.using_map_image = true;
+    capabilities_.using_image = true;
   } else {
     const ContextProvider::Capabilities& caps =
         output_surface_->context_provider()->ContextCapabilities();
@@ -53,7 +53,7 @@ DelegatingRenderer::DelegatingRenderer(RendererClient* client,
     DCHECK(!caps.gpu.iosurface || caps.gpu.texture_rectangle);
 
     capabilities_.using_egl_image = caps.gpu.egl_image_external;
-    capabilities_.using_map_image = caps.gpu.map_image;
+    capabilities_.using_image = caps.gpu.image;
 
     capabilities_.allow_rasterize_on_demand = false;
   }
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 5e96126..0a897f3 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -330,7 +330,7 @@ GLRenderer::GLRenderer(RendererClient* client,
   // The updater can access textures while the GLRenderer is using them.
   capabilities_.allow_partial_texture_updates = true;
 
-  capabilities_.using_map_image = context_caps.gpu.map_image;
+  capabilities_.using_image = context_caps.gpu.image;
 
   capabilities_.using_discard_framebuffer =
       context_caps.gpu.discard_framebuffer;
diff --git a/cc/output/renderer.cc b/cc/output/renderer.cc
index 2a33028..7be8075 100644
--- a/cc/output/renderer.cc
+++ b/cc/output/renderer.cc
@@ -27,9 +27,10 @@ RendererCapabilitiesImpl::RendererCapabilitiesImpl()
       using_shared_memory_resources(false),
       using_partial_swap(false),
       using_egl_image(false),
-      using_map_image(false),
+      using_image(false),
       using_discard_framebuffer(false),
-      allow_rasterize_on_demand(false) {}
+      allow_rasterize_on_demand(false) {
+}
 
 RendererCapabilitiesImpl::~RendererCapabilitiesImpl() {}
 
diff --git a/cc/output/renderer.h b/cc/output/renderer.h
index da0ddc1..1953310 100644
--- a/cc/output/renderer.h
+++ b/cc/output/renderer.h
@@ -34,7 +34,7 @@ struct RendererCapabilitiesImpl {
   // Capabilities used on compositor thread only.
   bool using_partial_swap;
   bool using_egl_image;
-  bool using_map_image;
+  bool using_image;
   bool using_discard_framebuffer;
   bool allow_rasterize_on_demand;
 
diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc
index 6584356..3ae1c20 100644
--- a/cc/resources/raster_worker_pool_perftest.cc
+++ b/cc/resources/raster_worker_pool_perftest.cc
@@ -69,7 +69,7 @@ class PerfContextProvider : public ContextProvider {
   virtual bool BindToCurrentThread() OVERRIDE { return true; }
   virtual Capabilities ContextCapabilities() OVERRIDE {
     Capabilities capabilities;
-    capabilities.gpu.map_image = true;
+    capabilities.gpu.image = true;
     capabilities.gpu.sync_query = true;
     return capabilities;
   }
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 0e338b0..1aca0b0 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2055,12 +2055,12 @@ bool LayerTreeHostImpl::UsePendingTreeForSync() const {
 }
 
 bool LayerTreeHostImpl::UseZeroCopyRasterizer() const {
-  return settings_.use_zero_copy && GetRendererCapabilities().using_map_image;
+  return settings_.use_zero_copy && GetRendererCapabilities().using_image;
 }
 
 bool LayerTreeHostImpl::UseOneCopyRasterizer() const {
   // Sync query support is required by one-copy rasterizer.
-  return settings_.use_one_copy && GetRendererCapabilities().using_map_image &&
+  return settings_.use_one_copy && GetRendererCapabilities().using_image &&
          resource_provider_->use_sync_query();
 }
 
diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc
index 9884ad6..2080209 100644
--- a/content/common/gpu/client/command_buffer_proxy_impl.cc
+++ b/content/common/gpu/client/command_buffer_proxy_impl.cc
@@ -159,7 +159,7 @@ bool CommandBufferProxyImpl::Initialize() {
     return false;
   }
 
-  capabilities_.map_image = true;
+  capabilities_.image = true;
 
   return true;
 }
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index 9e6854d..5612927 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -214,7 +214,7 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::Capabilities)
   IPC_STRUCT_TRAITS_MEMBER(texture_storage)
   IPC_STRUCT_TRAITS_MEMBER(discard_framebuffer)
   IPC_STRUCT_TRAITS_MEMBER(sync_query)
-  IPC_STRUCT_TRAITS_MEMBER(map_image)
+  IPC_STRUCT_TRAITS_MEMBER(image)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::GPUVideoMemoryUsageStats::ProcessStats)
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 86b1501..852410b 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -2210,9 +2210,9 @@ const GLubyte* GLES2Implementation::GetStringHelper(GLenum name) {
             "GL_CHROMIUM_flipy "
             "GL_EXT_unpack_subimage "
             "GL_CHROMIUM_map_sub";
-        if (capabilities_.map_image) {
+        if (capabilities_.image) {
           // The first space character is intentional.
-          str += " GL_CHROMIUM_map_image";
+          str += " GL_CHROMIUM_image";
         }
         if (capabilities_.future_sync_points)
           str += " GL_CHROMIUM_future_sync_point";
diff --git a/gpu/command_buffer/common/capabilities.cc b/gpu/command_buffer/common/capabilities.cc
index 257086a..74b2423 100644
--- a/gpu/command_buffer/common/capabilities.cc
+++ b/gpu/command_buffer/common/capabilities.cc
@@ -18,7 +18,7 @@ Capabilities::Capabilities()
       texture_storage(false),
       discard_framebuffer(false),
       sync_query(false),
-      map_image(false),
+      image(false),
       future_sync_points(false) {
 }
 
diff --git a/gpu/command_buffer/common/capabilities.h b/gpu/command_buffer/common/capabilities.h
index 60f7b0d..cb0246f 100644
--- a/gpu/command_buffer/common/capabilities.h
+++ b/gpu/command_buffer/common/capabilities.h
@@ -21,7 +21,7 @@ struct GPU_EXPORT Capabilities {
   bool texture_storage;
   bool discard_framebuffer;
   bool sync_query;
-  bool map_image;
+  bool image;
   bool future_sync_points;
 
   Capabilities();
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 0e99bb9..d4c0e98 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2756,7 +2756,7 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
 #endif
 
   caps.post_sub_buffer = supports_post_sub_buffer_;
-  caps.map_image = true;
+  caps.image = true;
 
   return caps;
 }