[Android WebView] Fix async upload

ui/gl/gl_context_android.cc

 // Copyright (c) 2012 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 "ui/gl/gl_context.h"
 
 #include "base/android/sys_utils.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_info.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
 namespace {
 
 // Used to render into an already current context+surface,
 // that we do not have ownership of (draw callback).
+// TODO(boliu): Make this inherit from GLContextEGL.
 class GLNonOwnedContext : public GLContextReal {
  public:
   GLNonOwnedContext(GLShareGroup* share_group);
 
   // Implement GLContext.
   virtual bool Initialize(GLSurface* compatible_surface,
-                          GpuPreference gpu_preference) OVERRIDE {
-    return true;
-  }
+                          GpuPreference gpu_preference) OVERRIDE;
   virtual void Destroy() OVERRIDE {}
   virtual bool MakeCurrent(GLSurface* surface) OVERRIDE;
   virtual void ReleaseCurrent(GLSurface* surface) OVERRIDE {}
   virtual bool IsCurrent(GLSurface* surface) OVERRIDE { return true; }
   virtual void* GetHandle() OVERRIDE { return NULL; }
   virtual void SetSwapInterval(int interval) OVERRIDE {}
   virtual std::string GetExtensions() OVERRIDE;
 
  protected:
   virtual ~GLNonOwnedContext() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLNonOwnedContext);
+
+  EGLDisplay display_;
 };
 
 GLNonOwnedContext::GLNonOwnedContext(GLShareGroup* share_group)
-  : GLContextReal(share_group) {}
+  : GLContextReal(share_group), display_(NULL) {}
+
+bool GLNonOwnedContext::Initialize(GLSurface* compatible_surface,
+                        GpuPreference gpu_preference) {
+  display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  return true;
+}
 
 bool GLNonOwnedContext::MakeCurrent(GLSurface* surface) {
   SetCurrent(surface);
   SetRealGLApi();
   return true;
 }
 
 std::string GLNonOwnedContext::GetExtensions() {
-  return GLContext::GetExtensions();
+  const char* extensions = eglQueryString(display_, EGL_EXTENSIONS);
+  if (!extensions)
+    return GLContext::GetExtensions();
+
+  return GLContext::GetExtensions() + " " + extensions;
 }
 
 }  // anonymous namespace
 
 // static
 scoped_refptr<GLContext> GLContext::CreateGLContext(
     GLShareGroup* share_group,
     GLSurface* compatible_surface,
     GpuPreference gpu_preference) {
   if (GetGLImplementation() == kGLImplementationMockGL)
@@ skipping 48 matching lines @@
     } else {
       limit_bytes = physical_memory_mb / 32;
     }
     limit_bytes = limit_bytes * 1024 * 1024;
   }
   *bytes = limit_bytes;
   return true;
 }
 
 }