Chromium Code Reviews| Index: ui/compositor/layer.h |
| diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h |
| index 4bb77d315bdc7e96014a88a6b7a7e7e874c27ae5..b3ac0771958e44c6ff502d599415efab3f869ff6 100644 |
| --- a/ui/compositor/layer.h |
| +++ b/ui/compositor/layer.h |
| @@ -22,7 +22,7 @@ |
| #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" |
| +#include "cc/surfaces/sequence_surface_reference_factory.h" |
| #include "third_party/skia/include/core/SkColor.h" |
| #include "third_party/skia/include/core/SkRegion.h" |
| #include "ui/compositor/compositor.h" |
| @@ -293,11 +293,8 @@ class COMPOSITOR_EXPORT Layer |
| bool TextureFlipped() const; |
| // Begins showing content from a surface with a particular id. |
| - void SetShowSurface(const cc::SurfaceId& surface_id, |
| - const cc::SurfaceLayer::SatisfyCallback& satisfy_callback, |
| - const cc::SurfaceLayer::RequireCallback& require_callback, |
| - gfx::Size surface_size, |
| - float scale, |
| + void SetShowSurface(const cc::SurfaceInfo& surface_info, |
| + scoped_refptr<cc::SurfaceReferenceFactory> surface_ref, |
| gfx::Size frame_size_in_dip); |
|
Fady Samuel
2016/12/13 22:55:06
Can we get rid of this?
Saman Sami
2016/12/14 17:50:02
I'll do it in a separate CL.
|
| bool has_external_content() { |