Add Callback::IsCancelled

base/callback_internal.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/callback_internal.h"
 
 #include "base/logging.h"
 
 namespace base {
 namespace internal {
 
 BindStateBase::BindStateBase(InvokeFuncStorage polymorphic_invoke,
-                             void (*destructor)(BindStateBase*))
+                             void (*destructor)(BindStateBase*),
+                             bool (*is_cancelled)(const BindStateBase*))
       : polymorphic_invoke_(polymorphic_invoke),
-        ref_count_(0), destructor_(destructor) {}
+        ref_count_(0),
+        destructor_(destructor),
+        is_cancelled_(is_cancelled) {}
 
 void BindStateBase::AddRef() {
   AtomicRefCountInc(&ref_count_);
 }
 
 void BindStateBase::Release() {
   if (!AtomicRefCountDec(&ref_count_))
     destructor_(this);
 }
 
 CallbackBase<CopyMode::MoveOnly>::CallbackBase(CallbackBase&& c) = default;
 
 CallbackBase<CopyMode::MoveOnly>&
 CallbackBase<CopyMode::MoveOnly>::operator=(CallbackBase&& c) = default;
 
 void CallbackBase<CopyMode::MoveOnly>::Reset() {
   // NULL the bind_state_ last, since it may be holding the last ref to whatever
   // object owns us, and we may be deleted after that.
   bind_state_ = nullptr;
 }
 
+bool CallbackBase<CopyMode::MoveOnly>::IsCancelled() const {
+  DCHECK(bind_state_);

[alex clarke (OOO till 29th), 2016/09/07 15:53:53]

Can we do this instead of the DCHECK?

if (!bind_state_)
  return false;

[dcheng, 2016/09/07 21:40:27]

If there's a null callback posted to the task queue, we'll explode anyway when
we try to Run() it. So DCHECKing seems fine to me.

[tzik, 2016/09/08 03:55:10]

Hmm, right, it doesn't matter for the intended usage in the scheduler,  but I
feel it's natural to return false for a empty callback. Let me update this.

[dcheng, 2016/09/08 04:01:33]

What is the use case where we'd want to call this on an empty callback? I feel
pretty strongly about keeping this a DCHECK: IsCancelled() simply doesn't have
any meaning for an empty callback.

[tzik, 2016/09/08 05:21:45]

There will be no actual use case for it. I just think state query functions
should be always valid.
Anyway, I don't have strong opinion on this. And it's OK to me to revert this to
DCHECK.

+  return bind_state_->IsCancelled();
+}
+
 bool CallbackBase<CopyMode::MoveOnly>::EqualsInternal(
     const CallbackBase& other) const {
   return bind_state_ == other.bind_state_;
 }
 
 CallbackBase<CopyMode::MoveOnly>::CallbackBase(
     BindStateBase* bind_state)
     : bind_state_(bind_state) {
   DCHECK(!bind_state_.get() || bind_state_->ref_count_ == 1);
 }
@@ skipping 15 matching lines @@
 }
 
 CallbackBase<CopyMode::Copyable>&
 CallbackBase<CopyMode::Copyable>::operator=(CallbackBase&& c) = default;
 
 template class CallbackBase<CopyMode::MoveOnly>;
 template class CallbackBase<CopyMode::Copyable>;
 
 }  // namespace internal
 }  // namespace base