cc: Changes to use GL API for GpuMemoryBuffers

Corresponding gpu changes are here:
https://codereview.chromium.org/14456004/

BUG=175012

Review URL: https://chromiumcodereview.appspot.com/14409006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201718 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 12 deletions

diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index e3a784e..76093c4 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -80,22 +80,26 @@ bool DelegatingRenderer::Initialize() {
 
   // TODO(danakj): We need non-GPU-specific paths for these things. This
   // renderer shouldn't need to use context3d extensions directly.
-  bool has_read_bgra = true;
-  bool has_set_visibility = true;
-  bool has_io_surface = true;
-  bool has_arb_texture_rect = true;
-  bool has_egl_image = true;
+  bool has_read_bgra = false;
+  bool has_set_visibility = false;
+  bool has_io_surface = false;
+  bool has_arb_texture_rect = false;
+  bool has_egl_image = false;
+  bool has_map_image = false;
   for (size_t i = 0; i < extensions.size(); ++i) {
-    if (extensions[i] == "GL_EXT_read_format_bgra")
+    if (extensions[i] == "GL_EXT_read_format_bgra") {
       has_read_bgra = true;
-    else if (extensions[i] == "GL_CHROMIUM_set_visibility")
+    } else if (extensions[i] == "GL_CHROMIUM_set_visibility") {
       has_set_visibility = true;
-    else if (extensions[i] == "GL_CHROMIUM_iosurface")
+    } else if (extensions[i] == "GL_CHROMIUM_iosurface") {
       has_io_surface = true;
-    else if (extensions[i] == "GL_ARB_texture_rectangle")
-      has_arb_texture_rect = true;
-    else if (extensions[i] == "GL_OES_EGL_image_external")
-      has_egl_image = true;
+    } else if (extensions[i] == "GL_ARB_texture_rectangle") {
+        has_arb_texture_rect = true;
+    } else if (extensions[i] == "GL_OES_EGL_image_external") {
+        has_egl_image = true;
+    } else if (extensions[i] == "GL_CHROMIUM_map_image") {
+      has_map_image = true;
+    }
   }
 
   if (has_io_surface)
@@ -114,6 +118,8 @@ bool DelegatingRenderer::Initialize() {
 
   capabilities_.using_egl_image = has_egl_image;
 
+  capabilities_.using_map_image = has_map_image;
+
   return true;
 }
 
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index b151e36..15766c4 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -198,6 +198,10 @@ bool GLRenderer::Initialize() {
 
   capabilities_.using_offscreen_context3d = true;
 
+  capabilities_.using_map_image =
+      extensions.count("GL_CHROMIUM_map_image") > 0 &&
+      Settings().use_map_image;
+
   is_using_bind_uniform_ =
       extensions.count("GL_CHROMIUM_bind_uniform_location") > 0;