| Index: cc/trees/proxy_impl.cc
|
| diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc
|
| index 80adffbe0697a61a90e1932ea0fb8b0515dd947e..88cbbf85dfaca828b5c953360306ea3e30bc6ee7 100644
|
| --- a/cc/trees/proxy_impl.cc
|
| +++ b/cc/trees/proxy_impl.cc
|
| @@ -41,7 +41,7 @@ ProxyImpl::ProxyImpl(
|
| LayerTreeHost* layer_tree_host,
|
| TaskRunnerProvider* task_runner_provider,
|
| std::unique_ptr<BeginFrameSource> external_begin_frame_source)
|
| - : layer_tree_host_id_(layer_tree_host->id()),
|
| + : layer_tree_host_id_(layer_tree_host->GetId()),
|
| commit_completion_waits_for_activation_(false),
|
| commit_completion_event_(nullptr),
|
| activation_completion_event_(nullptr),
|
| @@ -69,7 +69,7 @@ ProxyImpl::ProxyImpl(
|
| layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this);
|
|
|
| SchedulerSettings scheduler_settings(
|
| - layer_tree_host->settings().ToSchedulerSettings());
|
| + layer_tree_host->GetSettings().ToSchedulerSettings());
|
|
|
| std::unique_ptr<CompositorTimingHistory> compositor_timing_history(
|
| new CompositorTimingHistory(
|
| @@ -81,12 +81,13 @@ ProxyImpl::ProxyImpl(
|
| // external, it must be provided. If from the output surface, it must
|
| // not be provided.
|
| // TODO(enne): Make all BFS come from the output surface.
|
| - DCHECK(layer_tree_host->settings().use_external_begin_frame_source ^
|
| - layer_tree_host->settings().use_output_surface_begin_frame_source);
|
| - DCHECK(!layer_tree_host->settings().use_external_begin_frame_source ||
|
| + DCHECK(layer_tree_host->GetSettings().use_external_begin_frame_source ^
|
| + layer_tree_host->GetSettings().use_output_surface_begin_frame_source);
|
| + DCHECK(!layer_tree_host->GetSettings().use_external_begin_frame_source ||
|
| external_begin_frame_source_);
|
| - DCHECK(!layer_tree_host->settings().use_output_surface_begin_frame_source ||
|
| - !external_begin_frame_source_);
|
| + DCHECK(
|
| + !layer_tree_host->GetSettings().use_output_surface_begin_frame_source ||
|
| + !external_begin_frame_source_);
|
| scheduler_ = Scheduler::Create(this, scheduler_settings, layer_tree_host_id_,
|
| task_runner_provider_->ImplThreadTaskRunner(),
|
| external_begin_frame_source_.get(),
|
|
|