Enable SurfaceTexture based zero-copy texture uploading on Android platform

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 93 matching lines @@
   // preserve caching behavior (and limit memory waste when priorities change).
   return GetMaxTransferBufferUsageBytes(context_provider);
 }
 
 unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) {
   if (!context_provider)
     return GL_TEXTURE_2D;
 
   // TODO(reveman): Determine if GL_TEXTURE_EXTERNAL_OES works well on
   // Android before we enable this. crbug.com/322780
-#if !defined(OS_ANDROID)
+  // #if !defined(OS_ANDROID)

[reveman, 2014/02/26 08:02:34]

Someone needs to take ownership of crbug.com/322780 and get this ifdef removed
before we can land any surface texture support. It's really just a matter of
removing the ifdef and making sure we don't regress.

   if (context_provider->ContextCapabilities().gpu.egl_image_external)
     return GL_TEXTURE_EXTERNAL_OES;
   if (context_provider->ContextCapabilities().gpu.texture_rectangle)
     return GL_TEXTURE_RECTANGLE_ARB;
-#endif
+  // #endif
 
   return GL_TEXTURE_2D;
 }
 
 }  // namespace
 
 namespace cc {
 
 class LayerTreeHostImplTimeSourceAdapter : public TimeSourceClient {
  public:
@@ skipping 2865 matching lines @@
   swap_promise_monitor_.erase(monitor);
 }
 
 void LayerTreeHostImpl::NotifySwapPromiseMonitorsOfSetNeedsRedraw() {
   std::set<SwapPromiseMonitor*>::iterator it = swap_promise_monitor_.begin();
   for (; it != swap_promise_monitor_.end(); it++)
     (*it)->OnSetNeedsRedrawOnImpl();
 }
 
 }  // namespace cc