Index: examples/ganesh_app/texture_uploader.h |
diff --git a/examples/ganesh_app/texture_uploader.h b/examples/ganesh_app/texture_uploader.h |
index e773b1fb5f27b5ff3347d54a8ecfaa0e430ade40..9730f0e699a8af57dd8455f453f99b153baca948 100644 |
--- a/examples/ganesh_app/texture_uploader.h |
+++ b/examples/ganesh_app/texture_uploader.h |
@@ -20,7 +20,7 @@ class Shell; |
namespace examples { |
-class TextureUploader : public mojo::SurfaceClient, |
+class TextureUploader : public mojo::ResourceReturner, |
public mojo::GLContext::Observer { |
public: |
class Client { |
@@ -42,8 +42,8 @@ class TextureUploader : public mojo::SurfaceClient, |
// mojo::GLContext::Observer |
void OnContextLost() override; |
- // mojo::SurfaceClient |
- void SetIdNamespace(uint32_t id_namespace) override; |
+ void SetIdNamespace(uint32_t id_namespace); |
+ // mojo::ResourceReturner |
sky
2015/01/31 01:25:28
nit: newline here too.
|
void ReturnResources( |
mojo::Array<mojo::ReturnedResourcePtr> resources) override; |
@@ -59,6 +59,7 @@ class TextureUploader : public mojo::SurfaceClient, |
uint32_t id_namespace_; |
uint32_t local_id_; |
base::hash_map<uint32_t, mojo::GLTexture*> resource_to_texture_map_; |
+ mojo::Binding<mojo::ResourceReturner> returner_binding_; |
base::WeakPtrFactory<TextureUploader> weak_factory_; |