cc: zero/one-copy based on shared memory on IOS uses GL_TEXTURE_2D, not GL_TEXTURE_RECTANGLE_ARB.

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 75939658fbec641fd8e1f30f6e3b8d50ee53dd18..9e3fefacbe5d1d5f9412956e894544f3ca68f439 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2018,14 +2018,15 @@ void LayerTreeHostImpl::CreateResourceAndRasterWorkerPool(
 
   if (GetRendererCapabilities().using_image) {
     unsigned image_target = GL_TEXTURE_2D;
-#if defined(OS_MACOSX)
-    // GL_TEXTURE_RECTANGLE_ARB target is required by IOSurface backed images.
-    DCHECK(context_provider->ContextCapabilities().gpu.texture_rectangle);
-    image_target = GL_TEXTURE_RECTANGLE_ARB;
-#endif
     if (settings_.use_image_external) {

[reveman, 2014/12/01 17:03:14]

use_image_external means that we should be using TEXTURE_EXTERNAL_OES not
something else. We shouldn't be using this setting for something that it's not
meant to be used for.

+#if defined(OS_MACOSX)
+      // GL_TEXTURE_RECTANGLE_ARB target is required by IOSurface backed images.
+      DCHECK(context_provider->ContextCapabilities().gpu.texture_rectangle);
+      image_target = GL_TEXTURE_RECTANGLE_ARB;
+#elif defined(OS_ANDROID)
       DCHECK(context_provider->ContextCapabilities().gpu.egl_image_external);
       image_target = GL_TEXTURE_EXTERNAL_OES;
+#endif
     }
 
     if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) {