diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 09:53:13 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 10:23:17 +0000 |
commit | c5dbcb143405a38088d78b4b760d64aaff5157ab (patch) | |
tree | b37edca540b35f898e212bebfa6ded0806988122 /chromium/base/bind_internal.h | |
parent | 774f54339e5db91f785733232d3950366db65d07 (diff) |
BASELINE: Update Chromium to 102.0.5005.137
Change-Id: I162cdc7f56760218868e000a4c8ea92573344036
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/bind_internal.h')
-rw-r--r-- | chromium/base/bind_internal.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/base/bind_internal.h b/chromium/base/bind_internal.h index 60607efadb3..1b06e54b65a 100644 --- a/chromium/base/bind_internal.h +++ b/chromium/base/bind_internal.h @@ -859,8 +859,8 @@ bool QueryCancellationTraits(const BindStateBase* base, template <typename Functor, typename Receiver, typename... Unused> std::enable_if_t< !(MakeFunctorTraits<Functor>::is_method && - std::is_pointer_v<std::decay_t<Receiver>> && - IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value)> + IsPointerV<std::decay_t<Receiver>> && + IsRefCountedType<RemovePointerT<std::decay_t<Receiver>>>::value)> BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {} template <typename Functor> @@ -870,8 +870,8 @@ void BanUnconstructedRefCountedReceiver() {} template <typename Functor, typename Receiver, typename... Unused> std::enable_if_t< MakeFunctorTraits<Functor>::is_method && - std::is_pointer_v<std::decay_t<Receiver>> && - IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value> + IsPointerV<std::decay_t<Receiver>> && + IsRefCountedType<RemovePointerT<std::decay_t<Receiver>>>::value> BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) { DCHECK(receiver); @@ -1006,19 +1006,20 @@ struct MakeBindStateTypeImpl<true, Functor, Receiver, BoundArgs...> { static_assert(!std::is_array_v<std::remove_reference_t<Receiver>>, "First bound argument to a method cannot be an array."); static_assert( - !std::is_pointer_v<DecayedReceiver> || - IsRefCountedType<std::remove_pointer_t<DecayedReceiver>>::value, + !IsPointerV<DecayedReceiver> || + IsRefCountedType<RemovePointerT<DecayedReceiver>>::value, "Receivers may not be raw pointers. If using a raw pointer here is safe" " and has no lifetime concerns, use base::Unretained() and document why" " it's safe."); + static_assert(!HasRefCountedTypeAsRawPtr<std::decay_t<BoundArgs>...>::value, "A parameter is a refcounted type and needs scoped_refptr."); public: using Type = BindState< std::decay_t<Functor>, - std::conditional_t<std::is_pointer_v<DecayedReceiver>, - scoped_refptr<std::remove_pointer_t<DecayedReceiver>>, + std::conditional_t<IsPointerV<DecayedReceiver>, + scoped_refptr<RemovePointerT<DecayedReceiver>>, DecayedReceiver>, MakeStorageType<BoundArgs>...>; }; |