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

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 1999 matching lines @@
 
     *raster_worker_pool =
         GpuRasterWorkerPool::Create(task_runner,
                                     context_provider,
                                     resource_provider_.get(),
                                     settings_.use_distance_field_text);
     return;
   }
 
   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) {
+    unsigned image_target = settings_.image_texture_target;
+    if (image_target == GL_TEXTURE_RECTANGLE_ARB) {

[reveman, 2014/12/03 15:57:19]

Please remove if/else statements and use DCHECK_IMPLIES instead. ie.
DCHECK_IMPLIES(image_target == GL_TEXTURE_RECTANGLE_ARB,
context_provider->ContextCapabilities().gpu.texture_rectangle)

+      DCHECK(context_provider->ContextCapabilities().gpu.texture_rectangle);
+    } else if (image_target == GL_TEXTURE_EXTERNAL_OES) {
       DCHECK(context_provider->ContextCapabilities().gpu.egl_image_external);
-      image_target = GL_TEXTURE_EXTERNAL_OES;
     }
 
     if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) {
       *resource_pool =
           ResourcePool::Create(resource_provider_.get(), image_target,
                                resource_provider_->best_texture_format());
 
       TaskGraphRunner* task_graph_runner;
       if (IsSynchronousSingleThreaded()) {
         DCHECK(!single_thread_synchronous_task_graph_runner_);
@@ skipping 1447 matching lines @@
 }
 
 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
   std::vector<PictureLayerImpl*>::iterator it =
       std::find(picture_layers_.begin(), picture_layers_.end(), layer);
   DCHECK(it != picture_layers_.end());
   picture_layers_.erase(it);
 }
 
 }  // namespace cc