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 5d1eecddfeacab12e14ecf276bb2714ffdf7da92..b8e803ceceb38a1b54d7f46bbd5a637e242dcb37 100644 |
--- a/content/browser/renderer_host/compositor_impl_android.h |
+++ b/content/browser/renderer_host/compositor_impl_android.h |
@@ -42,6 +42,8 @@ class CONTENT_EXPORT CompositorImpl |
public ImageTransportFactoryAndroidObserver, |
public ui::WindowAndroidCompositor { |
public: |
+ typedef base::Callback<void(int32)> CreateSurfaceTextureCallback; |
+ |
CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window); |
virtual ~CompositorImpl(); |
@@ -54,9 +56,10 @@ class CONTENT_EXPORT CompositorImpl |
static jobject GetSurfaceTextureSurface(int surface_texture_id, |
base::ProcessHandle process_handle); |
- // Allocates a surface texture and returns a surface texture id. Returns -1 on |
- // failure. |
- static int AllocateSurfaceTexture(base::ProcessHandle process_handle); |
+ // Creates a new surface texture. |
+ static void CreateSurfaceTexture( |
+ base::ProcessHandle process_handle, |
+ const CreateSurfaceTextureCallback& callback); |
// Destroy all surface textures associated with |process_handle|. |
static void DestroyAllSurfaceTextures(base::ProcessHandle process_handle); |
@@ -114,6 +117,11 @@ class CONTENT_EXPORT CompositorImpl |
const cc::UIResourceBitmap& bitmap, |
bool is_transient); |
+ static void OnSurfaceTextureCreated( |
+ int surface_texture_id, |
+ base::ProcessHandle handle, |
+ const CreateSurfaceTextureCallback& callback); |
+ |
scoped_refptr<cc::Layer> root_layer_; |
scoped_ptr<cc::LayerTreeHost> host_; |