diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 08:00:11 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 08:00:11 +0000 |
| commit | ac0c76228c92cbb338f17c1268fbfc801b11d73c (patch) | |
| tree | 043d8a446e724ee353743857da14c117c9b13d9e /content/app/android | |
| parent | 0b1a9c75d017d8d40eb183987ff934d74d718137 (diff) | |
| download | chromium_src-ac0c76228c92cbb338f17c1268fbfc801b11d73c.zip chromium_src-ac0c76228c92cbb338f17c1268fbfc801b11d73c.tar.gz chromium_src-ac0c76228c92cbb338f17c1268fbfc801b11d73c.tar.bz2 | |
Android: Move SurfaceTexture from content to ui/gl and add test.
This functionality needs to be exposed in places outside of content/, i.e. gpu/.
Review URL: https://chromiumcodereview.appspot.com/14366008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/android')
| -rw-r--r-- | content/app/android/child_process_service.cc | 6 | ||||
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc index c0deb83..2a12aa4 100644 --- a/content/app/android/child_process_service.cc +++ b/content/app/android/child_process_service.cc @@ -10,7 +10,6 @@ #include "base/android/jni_array.h" #include "base/logging.h" #include "base/posix/global_descriptors.h" -#include "content/common/android/scoped_java_surface.h" #include "content/common/android/surface_texture_peer.h" #include "content/common/child_process.h" #include "content/common/child_thread.h" @@ -19,6 +18,7 @@ #include "content/public/common/content_descriptors.h" #include "ipc/ipc_descriptors.h" #include "jni/ChildProcessService_jni.h" +#include "ui/gl/android/scoped_java_surface.h" using base::android::AttachCurrentThread; using base::android::CheckException; @@ -45,7 +45,7 @@ class SurfaceTexturePeerChildImpl : public content::SurfaceTexturePeer, virtual void EstablishSurfaceTexturePeer( base::ProcessHandle pid, - scoped_refptr<content::SurfaceTextureBridge> surface_texture_bridge, + scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_bridge, int primary_id, int secondary_id) { JNIEnv* env = base::android::AttachCurrentThread(); @@ -58,7 +58,7 @@ class SurfaceTexturePeerChildImpl : public content::SurfaceTexturePeer, virtual gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) OVERRIDE { JNIEnv* env = base::android::AttachCurrentThread(); - ScopedJavaSurface surface( + gfx::ScopedJavaSurface surface( content::Java_ChildProcessService_getViewSurface( env, service_.obj(), surface_id)); diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index f97db8d..3d0cb9c 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -27,6 +27,7 @@ #include "media/base/android/media_jni_registrar.h" #include "net/android/net_jni_registrar.h" #include "ui/android/ui_jni_registrar.h" +#include "ui/gl/android/gl_jni_registrar.h" #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" namespace { @@ -80,6 +81,9 @@ static jint LibraryLoaded(JNIEnv* env, jclass clazz, if (!ui::android::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!ui::gl::android::RegisterJni(env)) + return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!ui::shell_dialogs::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; |