| Index: content/browser/renderer_host/compositor_impl_android.h
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
|
| index 15a16b34d1d2c4d9ba1182c9803febc468d24f8c..56292efbda342fa7eb9d93e8baf74c785124acbe 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.h
|
| +++ b/content/browser/renderer_host/compositor_impl_android.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
|
| #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
|
|
|
| +#include "base/android/scoped_java_ref.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| @@ -47,7 +48,19 @@ class CONTENT_EXPORT CompositorImpl
|
| static bool IsInitialized();
|
|
|
| // Returns the Java Surface object for a given view surface id.
|
| - static jobject GetSurface(int surface_id);
|
| + static base::android::ScopedJavaLocalRef<jobject> GetSurface(int surface_id);
|
| +
|
| + // Returns the Java Surface object for a given surface texture id.
|
| + static base::android::ScopedJavaLocalRef<jobject> GetSurfaceTextureSurface(
|
| + int surface_texture_id,
|
| + int child_process_id);
|
| +
|
| + // Creates a surface texture and returns a surface texture id. Returns -1 on
|
| + // failure.
|
| + static int CreateSurfaceTexture(int child_process_id);
|
| +
|
| + // Destroy all surface textures associated with |child_process_id|.
|
| + static void DestroyAllSurfaceTextures(int child_process_id);
|
|
|
| // Compositor implementation.
|
| virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE;
|
|
|