| Index: ui/compositor/layer.h
|
| diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
|
| index 5d7d3ec23349e872fbdfcf6a89fe0feed41e32f6..3048355725f623ef51cda8d228b1b28af577cdbc 100644
|
| --- a/ui/compositor/layer.h
|
| +++ b/ui/compositor/layer.h
|
| @@ -17,6 +17,7 @@
|
| #include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/layers/content_layer_client.h"
|
| #include "cc/layers/layer_client.h"
|
| +#include "cc/layers/surface_layer.h"
|
| #include "cc/layers/texture_layer_client.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| #include "cc/surfaces/surface_id.h"
|
| @@ -279,7 +280,10 @@ class COMPOSITOR_EXPORT Layer
|
| gfx::Size frame_size_in_dip);
|
|
|
| // Begins showing content from a surface with a particular id.
|
| - void SetShowSurface(cc::SurfaceId id, gfx::Size frame_size_in_dip);
|
| + void SetShowSurface(cc::SurfaceId surface_id,
|
| + const cc::SurfaceLayer::SatisfyCallback& satisfy_callback,
|
| + const cc::SurfaceLayer::RequireCallback& require_callback,
|
| + gfx::Size frame_size_in_dip);
|
|
|
| bool has_external_content() {
|
| return texture_layer_.get() || delegated_renderer_layer_.get() ||
|
|
|