Index: examples/surfaces_app/embedder.h |
diff --git a/examples/surfaces_app/embedder.h b/examples/surfaces_app/embedder.h |
index b3d616d2d6c15af9d64d1a225b13cf902e2965ab..f7c08ff7dabd60e4693f50c0cf4221282485b2ea 100644 |
--- a/examples/surfaces_app/embedder.h |
+++ b/examples/surfaces_app/embedder.h |
@@ -23,10 +23,12 @@ namespace examples { |
// Simple example of a surface embedder that embeds two other surfaces. |
class Embedder { |
public: |
- explicit Embedder(Surface* surface); |
+ Embedder(); |
~Embedder(); |
- void SetSurfaceId(cc::SurfaceId id) { id_ = id; } |
+ void set_surface(Surface* surface) { surface_ = surface; } |
+ void set_surface_id(SurfaceIdPtr id) { id_ = id.Clone(); } |
sky
2014/12/16 03:34:04
id.Pass()?
|
+ |
void ProduceFrame(cc::SurfaceId child_one, |
cc::SurfaceId child_two, |
const gfx::Size& child_size, |
@@ -34,7 +36,7 @@ class Embedder { |
int offset); |
private: |
- cc::SurfaceId id_; |
+ SurfaceIdPtr id_; |
Surface* surface_; |
DISALLOW_COPY_AND_ASSIGN(Embedder); |