| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/callback_helpers.h" | 5 #include "base/callback_helpers.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 | 8 |
| 9 namespace base { | 9 namespace base { |
| 10 | 10 |
| 11 ScopedClosureRunner::ScopedClosureRunner() {} | 11 ScopedClosureRunner::ScopedClosureRunner() {} |
| 12 | 12 |
| 13 ScopedClosureRunner::ScopedClosureRunner(const Closure& closure) | 13 ScopedClosureRunner::ScopedClosureRunner(const Closure& closure) |
| 14 : closure_(closure) {} | 14 : closure_(closure) {} |
| 15 | 15 |
| 16 ScopedClosureRunner::~ScopedClosureRunner() { | 16 ScopedClosureRunner::~ScopedClosureRunner() { |
| 17 if (!closure_.is_null()) | 17 if (!closure_.is_null()) |
| 18 closure_.Run(); | 18 closure_.Run(); |
| 19 } | 19 } |
| 20 | 20 |
| 21 ScopedClosureRunner::ScopedClosureRunner(ScopedClosureRunner&& other) | 21 ScopedClosureRunner::ScopedClosureRunner(ScopedClosureRunner&& other) |
| 22 : closure_(other.Release()) {} | 22 : closure_(other.Release()) {} |
| 23 | 23 |
| 24 ScopedClosureRunner& ScopedClosureRunner::operator=( | 24 ScopedClosureRunner& ScopedClosureRunner::operator=( |
| 25 ScopedClosureRunner&& other) { | 25 ScopedClosureRunner&& other) { |
| 26 Reset(other.Release()); | 26 ReplaceClosure(other.Release()); |
| 27 return *this; | 27 return *this; |
| 28 } | 28 } |
| 29 | 29 |
| 30 void ScopedClosureRunner::Reset() { | 30 void ScopedClosureRunner::RunAndReset() { |
| 31 Closure old_closure = Release(); | 31 Closure old_closure = Release(); |
| 32 if (!old_closure.is_null()) | 32 if (!old_closure.is_null()) |
| 33 old_closure.Run(); | 33 old_closure.Run(); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void ScopedClosureRunner::Reset(const Closure& closure) { | 36 void ScopedClosureRunner::ReplaceClosure(const Closure& closure) { |
| 37 Closure old_closure = Release(); | |
| 38 closure_ = closure; | 37 closure_ = closure; |
| 39 if (!old_closure.is_null()) | |
| 40 old_closure.Run(); | |
| 41 } | 38 } |
| 42 | 39 |
| 43 Closure ScopedClosureRunner::Release() { | 40 Closure ScopedClosureRunner::Release() { |
| 44 Closure result = closure_; | 41 Closure result = closure_; |
| 45 closure_.Reset(); | 42 closure_.Reset(); |
| 46 return result; | 43 return result; |
| 47 } | 44 } |
| 48 | 45 |
| 49 } // namespace base | 46 } // namespace base |
| OLD | NEW |