| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index c343c97e7064859cf91cd169a8290022b5944da3..9a1d592cc822d37a8db20e5401f163142eb6785e 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -1107,10 +1107,6 @@ void ThreadProxy::DidBeginImplFrameDeadline() {
|
| impl().layer_tree_host_impl->ResetCurrentBeginFrameArgsForNextFrame();
|
| }
|
|
|
| -void ThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) {
|
| - NOTREACHED() << "Only used by SingleThreadProxy";
|
| -}
|
| -
|
| void ThreadProxy::ReadyToFinalizeTextureUpdates() {
|
| DCHECK(IsImplThread());
|
| impl().scheduler->NotifyReadyToCommit();
|
| @@ -1144,7 +1140,8 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) {
|
| impl().layer_tree_host_id,
|
| ImplThreadTaskRunner(),
|
| base::PowerMonitor::Get(),
|
| - impl().external_begin_frame_source.Pass());
|
| + impl().external_begin_frame_source.Pass(),
|
| + NULL);
|
| impl().scheduler->SetVisible(impl().layer_tree_host_impl->visible());
|
| impl_thread_weak_ptr_ = impl().weak_factory.GetWeakPtr();
|
| completion->Signal();
|
| @@ -1266,10 +1263,6 @@ bool ThreadProxy::MainFrameWillHappenForTesting() {
|
| return main_frame_will_happen;
|
| }
|
|
|
| -void ThreadProxy::SetChildrenNeedBeginFrames(bool children_need_begin_frames) {
|
| - NOTREACHED() << "Only used by SingleThreadProxy";
|
| -}
|
| -
|
| void ThreadProxy::MainFrameWillHappenOnImplThreadForTesting(
|
| CompletionEvent* completion,
|
| bool* main_frame_will_happen) {
|
|
|