diff options
Diffstat (limited to 'cc/trees/thread_proxy.cc')
| -rw-r--r-- | cc/trees/thread_proxy.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc index dddf112..151cb3c 100644 --- a/cc/trees/thread_proxy.cc +++ b/cc/trees/thread_proxy.cc @@ -49,9 +49,8 @@ scoped_ptr<Proxy> ThreadProxy::Create( LayerTreeHost* layer_tree_host, scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) { - return make_scoped_ptr(new ThreadProxy(layer_tree_host, - main_task_runner, - impl_task_runner)).PassAs<Proxy>(); + return make_scoped_ptr( + new ThreadProxy(layer_tree_host, main_task_runner, impl_task_runner)); } ThreadProxy::ThreadProxy( @@ -963,7 +962,7 @@ void ThreadProxy::ScheduledActionCommit() { // Complete all remaining texture updates. impl().current_resource_update_controller->Finalize(); - impl().current_resource_update_controller.reset(); + impl().current_resource_update_controller = nullptr; if (impl().animations_frozen_until_next_draw) { impl().animation_time = std::max( @@ -1249,10 +1248,10 @@ void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { DCHECK(IsMainThreadBlocked()); layer_tree_host()->DeleteContentsTexturesOnImplThread( impl().layer_tree_host_impl->resource_provider()); - impl().current_resource_update_controller.reset(); + impl().current_resource_update_controller = nullptr; impl().layer_tree_host_impl->SetNeedsBeginFrame(false); - impl().scheduler.reset(); - impl().layer_tree_host_impl.reset(); + impl().scheduler = nullptr; + impl().layer_tree_host_impl = nullptr; impl().weak_factory.InvalidateWeakPtrs(); // We need to explicitly cancel the notifier, since it isn't using weak ptrs. // TODO(vmpstr): We should see if we can make it use weak ptrs and still keep |