summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 01:01:50 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 01:01:50 +0000
commitb3fd32d3fc22b996f0bc5dd284331cc4bab156ff (patch)
tree6884b68590ac2acd99c691903f98ac3a72340154 /mojo
parentd48dc9bb8bdcff277771769c6da5b15338394245 (diff)
downloadchromium_src-b3fd32d3fc22b996f0bc5dd284331cc4bab156ff.zip
chromium_src-b3fd32d3fc22b996f0bc5dd284331cc4bab156ff.tar.gz
chromium_src-b3fd32d3fc22b996f0bc5dd284331cc4bab156ff.tar.bz2
base: Add ScopedJavaLocalFrame class.
This class can be used to create a local reference frame. A local reference frame ensures that some amount of local references can be created and forces all references created in the frame to be releases when exiting the frame. BUG=360069 TBR=darin Review URL: https://codereview.chromium.org/225283008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
-rw-r--r--mojo/services/native_viewport/native_viewport_android.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/mojo/services/native_viewport/native_viewport_android.cc b/mojo/services/native_viewport/native_viewport_android.cc
index 791c27f..1763f17 100644
--- a/mojo/services/native_viewport/native_viewport_android.cc
+++ b/mojo/services/native_viewport/native_viewport_android.cc
@@ -60,7 +60,13 @@ void NativeViewportAndroid::SurfaceCreated(JNIEnv* env,
jobject obj,
jobject jsurface) {
base::android::ScopedJavaLocalRef<jobject> protector(env, jsurface);
- window_ = ANativeWindow_fromSurface(env, jsurface);
+ // 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);
+ window_ = ANativeWindow_fromSurface(env, jsurface);
+ }
delegate_->OnAcceleratedWidgetAvailable(window_);
}