Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / gl / android / surface_texture.cc

diff --git a/src/ui/gl/android/surface_texture.cc b/src/ui/gl/android/surface_texture.cc
index a580041..3f55cbd 100644 (file)
--- a/src/ui/gl/android/surface_texture.cc
+++ b/src/ui/gl/android/surface_texture.cc
@@ -123,6 +123,10 @@ void SurfaceTexture::DetachFromGLContext() {
 ANativeWindow* SurfaceTexture::CreateSurface() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaSurface surface(this);
+  // Note: This ensures that any local references used by
+  // ANativeWindow_fromSurface are released immediately. This is needed as a
+  // workaround for https://code.google.com/p/android/issues/detail?id=68174
+  base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
   ANativeWindow* native_window = ANativeWindow_fromSurface(
       env, surface.j_surface().obj());
   return native_window;