| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index b01aee6503763853b363a1b7bc42ac3a01032fd9..e4ca7e4ade1acaefb01ef2afa74df021ac949934 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -14,6 +14,7 @@
|
| #include "cc/animation/scrollbar_animation_controller.h"
|
| #include "cc/animation/timing_function.h"
|
| #include "cc/base/math_util.h"
|
| +#include "cc/base/thread.h"
|
| #include "cc/base/util.h"
|
| #include "cc/debug/debug_rect_history.h"
|
| #include "cc/debug/frame_rate_counter.h"
|
| @@ -775,7 +776,7 @@ void LayerTreeHostImpl::UpdateBackgroundAnimateTicking(
|
| time_source_client_adapter_ = LayerTreeHostImplTimeSourceAdapter::Create(
|
| this,
|
| DelayBasedTimeSource::Create(LowFrequencyAnimationInterval(),
|
| - proxy_->CurrentThread()));
|
| + proxy_->CurrentThread()->TaskRunner()));
|
| }
|
|
|
| time_source_client_adapter_->SetActive(enabled);
|
| @@ -1517,7 +1518,7 @@ bool LayerTreeHostImpl::DoInitializeRenderer(
|
| settings_.refresh_rate);
|
|
|
| output_surface->InitializeBeginFrameEmulation(
|
| - proxy_->ImplThread(),
|
| + proxy_->ImplThread() ? proxy_->ImplThread()->TaskRunner() : NULL,
|
| settings_.throttle_frame_production,
|
| display_refresh_interval);
|
| }
|
|
|