[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"
@@ skipping 36 matching lines @@
 GLNonOwnedContext::GLNonOwnedContext(GLShareGroup* share_group)
   : GLContextReal(share_group) {}
 
 bool GLNonOwnedContext::MakeCurrent(GLSurface* surface) {
   SetCurrent(surface);
   SetRealGLApi();
   return true;
 }
 
 std::string GLNonOwnedContext::GetExtensions() {
-  return GLContext::GetExtensions();
+  const char* extensions =
+      eglQueryString(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_EXTENSIONS);

[no sievers, 2013/09/09 16:59:23]

use |display_|

[boliu, 2013/09/09 17:49:37]

This doesn't inherit from GLContextEGL, even though it probalby should. Changed
to GetDisplay once in Initialize instead (trying to keep this small..)

+  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;
 }
 
 }