| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 9247e1096745723ddade6b276c244cef37c84464..da11599b2f794c239ae22e9b11a5ea951c899c44 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -31,6 +31,7 @@
|
| #include "cc/surfaces/surface_id_allocator.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| +#include "cc/trees/swap_promise_manager.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/compositor/compositor_observer.h"
|
| #include "ui/compositor/compositor_switches.h"
|
| @@ -212,7 +213,8 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
|
| animation_timeline_.get());
|
|
|
| host_->GetLayerTree()->SetRootLayer(root_web_layer_);
|
| - host_->SetSurfaceClientId(surface_id_allocator_->client_id());
|
| + host_->GetSurfaceSequenceGenerator()->set_surface_client_id(
|
| + surface_id_allocator_->client_id());
|
| host_->SetVisible(true);
|
| }
|
|
|
| @@ -320,7 +322,7 @@ void Compositor::DisableSwapUntilResize() {
|
| void Compositor::SetLatencyInfo(const ui::LatencyInfo& latency_info) {
|
| std::unique_ptr<cc::SwapPromise> swap_promise(
|
| new cc::LatencyInfoSwapPromise(latency_info));
|
| - host_->QueueSwapPromise(std::move(swap_promise));
|
| + host_->GetSwapPromiseManager()->QueueSwapPromise(std::move(swap_promise));
|
| }
|
|
|
| void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
|
|
|