| Index: cc/layers/surface_layer.cc
|
| diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
|
| index 989f90cb9b0c7038b26499e1d8deea12a6330d24..f16ccc415a228fe793fd851c593355f90d37c6d3 100644
|
| --- a/cc/layers/surface_layer.cc
|
| +++ b/cc/layers/surface_layer.cc
|
| @@ -10,7 +10,8 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "cc/layers/surface_layer_impl.h"
|
| #include "cc/output/swap_promise.h"
|
| -#include "cc/trees/layer_tree_host.h"
|
| +#include "cc/surfaces/surface_sequence_generator.h"
|
| +#include "cc/trees/swap_promise_manager.h"
|
|
|
| namespace cc {
|
|
|
| @@ -54,7 +55,7 @@ SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
|
| require_callback_(require_callback) {}
|
|
|
| SurfaceLayer::~SurfaceLayer() {
|
| - DCHECK(!layer_tree_host());
|
| + DCHECK(!GetLayerTree());
|
| DCHECK(destroy_sequence_.is_null());
|
| }
|
|
|
| @@ -103,8 +104,9 @@ void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
|
|
|
| void SurfaceLayer::CreateNewDestroySequence() {
|
| DCHECK(destroy_sequence_.is_null());
|
| - if (layer_tree_host()) {
|
| - destroy_sequence_ = layer_tree_host()->CreateSurfaceSequence();
|
| + if (GetLayerTree()) {
|
| + destroy_sequence_ =
|
| + GetLayerTree()->GetSurfaceSequenceGenerator()->CreateSurfaceSequence();
|
| require_callback_.Run(surface_id_, destroy_sequence_);
|
| }
|
| }
|
| @@ -115,7 +117,7 @@ void SurfaceLayer::SatisfyDestroySequence() {
|
| DCHECK(!destroy_sequence_.is_null());
|
| std::unique_ptr<SatisfySwapPromise> satisfy(
|
| new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
|
| - layer_tree_host()->QueueSwapPromise(std::move(satisfy));
|
| + GetLayerTree()->GetSwapPromiseManager()->QueueSwapPromise(std::move(satisfy));
|
| destroy_sequence_ = SurfaceSequence();
|
| }
|
|
|
|
|