| Index: examples/surfaces_app/child_impl.h
|
| diff --git a/examples/surfaces_app/child_impl.h b/examples/surfaces_app/child_impl.h
|
| index 408a0f31d6efd012ac395c822055f5ca8b5aa0ef..f915bd52227295ce08399f5a09ae4b6f705e44b2 100644
|
| --- a/examples/surfaces_app/child_impl.h
|
| +++ b/examples/surfaces_app/child_impl.h
|
| @@ -40,19 +40,20 @@ class ChildImpl : public InterfaceImpl<Child>, public SurfaceClient {
|
| ~ChildImpl() override;
|
|
|
| private:
|
| + using ProduceCallback = mojo::Callback<void(SurfaceIdPtr id)>;
|
| +
|
| // SurfaceClient implementation
|
| void SetIdNamespace(uint32_t id_namespace) override;
|
| void ReturnResources(Array<ReturnedResourcePtr> resources) override;
|
|
|
| // Child implementation.
|
| - void ProduceFrame(
|
| - ColorPtr color,
|
| - SizePtr size,
|
| - const mojo::Callback<void(SurfaceIdPtr id)>& callback) override;
|
| + void ProduceFrame(ColorPtr color,
|
| + SizePtr size,
|
| + const ProduceCallback& callback) override;
|
|
|
| scoped_ptr<cc::SurfaceIdAllocator> allocator_;
|
| SurfacePtr surface_;
|
| - cc::SurfaceId id_;
|
| + uint32_t id_namespace_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChildImpl);
|
| };
|
|
|