| Index: webrtc/rtc_base/asyncinvoker-inl.h
|
| diff --git a/webrtc/rtc_base/asyncinvoker-inl.h b/webrtc/rtc_base/asyncinvoker-inl.h
|
| index 5b2cf4e250093d9629f9767ede10477b4272ad28..7878b15f7307bedf10c96d82fa0202e7e7c7b7d1 100644
|
| --- a/webrtc/rtc_base/asyncinvoker-inl.h
|
| +++ b/webrtc/rtc_base/asyncinvoker-inl.h
|
| @@ -11,10 +11,12 @@
|
| #ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
|
| #define WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
|
|
|
| -#include "webrtc/rtc_base/atomicops.h"
|
| #include "webrtc/rtc_base/bind.h"
|
| #include "webrtc/rtc_base/criticalsection.h"
|
| +#include "webrtc/rtc_base/event.h"
|
| #include "webrtc/rtc_base/messagehandler.h"
|
| +#include "webrtc/rtc_base/refcountedobject.h"
|
| +#include "webrtc/rtc_base/scoped_ref_ptr.h"
|
| #include "webrtc/rtc_base/sigslot.h"
|
| #include "webrtc/rtc_base/thread.h"
|
| #include "webrtc/rtc_base/thread_annotations.h"
|
| @@ -27,7 +29,7 @@ class AsyncInvoker;
|
| // on the calling thread if necessary.
|
| class AsyncClosure {
|
| public:
|
| - explicit AsyncClosure(AsyncInvoker* invoker) : invoker_(invoker) {}
|
| + explicit AsyncClosure(AsyncInvoker* invoker);
|
| virtual ~AsyncClosure();
|
| // Runs the asynchronous task, and triggers a callback to the calling
|
| // thread if needed. Should be called from the target thread.
|
| @@ -35,6 +37,11 @@ class AsyncClosure {
|
|
|
| protected:
|
| AsyncInvoker* invoker_;
|
| + // Reference counted so that if the AsyncInvoker destructor finishes before
|
| + // an AsyncClosure's destructor that's about to call
|
| + // "invocation_complete_->Set()", it's not dereferenced after being
|
| + // destroyed.
|
| + scoped_refptr<RefCountedObject<Event>> invocation_complete_;
|
| };
|
|
|
| // Simple closure that doesn't trigger a callback for the calling thread.
|
|
|