| Index: third_party/WebKit/Source/platform/CrossThreadCopier.h
|
| diff --git a/third_party/WebKit/Source/platform/CrossThreadCopier.h b/third_party/WebKit/Source/platform/CrossThreadCopier.h
|
| index c863a4047bdba6462e1a62ff76a5f9f112326c14..7bd30c2892a4184ac2044326583712a5d9443916 100644
|
| --- a/third_party/WebKit/Source/platform/CrossThreadCopier.h
|
| +++ b/third_party/WebKit/Source/platform/CrossThreadCopier.h
|
| @@ -32,6 +32,7 @@
|
| #define CrossThreadCopier_h
|
|
|
| #include "platform/PlatformExport.h"
|
| +#include "platform/heap/Persistent.h"
|
| #include "third_party/skia/include/core/SkRefCnt.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Forward.h"
|
| @@ -144,7 +145,12 @@ struct CrossThreadCopier<CrossThreadPersistent<T>> : public CrossThreadCopierPas
|
| STATIC_ONLY(CrossThreadCopier);
|
| };
|
|
|
| -template<typename T>
|
| +template <typename T>
|
| +struct CrossThreadCopier<WTF::WeakPtr<T>> : public CrossThreadCopierPassThrough<WTF::WeakPtr<T>> {
|
| + STATIC_ONLY(CrossThreadCopier);
|
| +};
|
| +
|
| +template <typename T>
|
| struct CrossThreadCopier<CrossThreadWeakPersistent<T>> : public CrossThreadCopierPassThrough<CrossThreadWeakPersistent<T>> {
|
| STATIC_ONLY(CrossThreadCopier);
|
| };
|
| @@ -154,8 +160,8 @@ struct CrossThreadCopier<WTF::UnretainedWrapper<T, WTF::CrossThreadAffinity>> :
|
| STATIC_ONLY(CrossThreadCopier);
|
| };
|
|
|
| -template<typename T>
|
| -struct CrossThreadCopier<WeakPtr<T>> : public CrossThreadCopierPassThrough<WeakPtr<T>> {
|
| +template <typename T>
|
| +struct CrossThreadCopier<RevocableCrossThreadWeakPersistent<T>> : public CrossThreadCopierPassThrough<RevocableCrossThreadWeakPersistent<T>> {
|
| STATIC_ONLY(CrossThreadCopier);
|
| };
|
|
|
|
|