| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index a1f3fbc855fdf3ccedace1d4b9d43b3c3b4865b8..8b6943fba96260715199828fae69b358e876b69b 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -220,7 +220,7 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
|
| cc::AnimationTimeline::Create(cc::AnimationIdProvider::NextTimelineId());
|
| host_->animation_host()->AddAnimationTimeline(animation_timeline_.get());
|
|
|
| - host_->SetRootLayer(root_web_layer_);
|
| + host_->GetLayerTree()->SetRootLayer(root_web_layer_);
|
| host_->set_surface_client_id(surface_id_allocator_->client_id());
|
| host_->SetVisible(true);
|
| }
|
| @@ -327,7 +327,8 @@ cc::AnimationTimeline* Compositor::GetAnimationTimeline() const {
|
|
|
| void Compositor::SetHostHasTransparentBackground(
|
| bool host_has_transparent_background) {
|
| - host_->set_has_transparent_background(host_has_transparent_background);
|
| + host_->GetLayerTree()->set_has_transparent_background(
|
| + host_has_transparent_background);
|
| }
|
|
|
| void Compositor::ScheduleFullRedraw() {
|
| @@ -359,13 +360,13 @@ void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
|
| DCHECK_GT(scale, 0);
|
| if (!size_in_pixel.IsEmpty()) {
|
| size_ = size_in_pixel;
|
| - host_->SetViewportSize(size_in_pixel);
|
| + host_->GetLayerTree()->SetViewportSize(size_in_pixel);
|
| root_web_layer_->SetBounds(size_in_pixel);
|
| context_factory_->ResizeDisplay(this, size_in_pixel);
|
| }
|
| if (device_scale_factor_ != scale) {
|
| device_scale_factor_ = scale;
|
| - host_->SetDeviceScaleFactor(scale);
|
| + host_->GetLayerTree()->SetDeviceScaleFactor(scale);
|
| if (root_layer_)
|
| root_layer_->OnDeviceScaleFactorChanged(scale);
|
| }
|
| @@ -376,7 +377,7 @@ void Compositor::SetDisplayColorSpace(const gfx::ColorSpace& color_space) {
|
| }
|
|
|
| void Compositor::SetBackgroundColor(SkColor color) {
|
| - host_->set_background_color(color);
|
| + host_->GetLayerTree()->set_background_color(color);
|
| ScheduleDraw();
|
| }
|
|
|
|
|