| Index: third_party/WebKit/public/platform/WebPrivatePtr.h
|
| diff --git a/third_party/WebKit/public/platform/WebPrivatePtr.h b/third_party/WebKit/public/platform/WebPrivatePtr.h
|
| index 0ff025803edc70fd557b045c94041e72eb00d2f5..4925f35aaa44160ecb2ccb42cf7f78907d435cc9 100644
|
| --- a/third_party/WebKit/public/platform/WebPrivatePtr.h
|
| +++ b/third_party/WebKit/public/platform/WebPrivatePtr.h
|
| @@ -66,18 +66,14 @@ enum class WebPrivatePtrStrength {
|
| enum LifetimeManagementType {
|
| RefCountedLifetime,
|
| GarbageCollectedLifetime,
|
| - RefCountedGarbageCollectedLifetime
|
| };
|
|
|
| template<typename T>
|
| struct LifetimeOf {
|
| private:
|
| static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, GarbageCollected>::value || IsGarbageCollectedMixin<T>::value;
|
| - static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, RefCountedGarbageCollected>::value;
|
| public:
|
| - static const LifetimeManagementType value =
|
| - !isGarbageCollected ? RefCountedLifetime :
|
| - isRefCountedGarbageCollected ? RefCountedGarbageCollectedLifetime : GarbageCollectedLifetime;
|
| + static const LifetimeManagementType value = !isGarbageCollected ? RefCountedLifetime : GarbageCollectedLifetime;
|
| };
|
|
|
| template<typename T, WebPrivatePtrDestruction crossThreadDestruction, WebPrivatePtrStrength strongOrWeak, LifetimeManagementType lifetime>
|
| @@ -173,14 +169,6 @@ private:
|
| };
|
|
|
| template<typename T, WebPrivatePtrDestruction crossThreadDestruction, WebPrivatePtrStrength strongOrWeak>
|
| -class PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, RefCountedGarbageCollectedLifetime> : public PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, GarbageCollectedLifetime> {
|
| -public:
|
| - void assign(T* val) { PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, GarbageCollectedLifetime>::assign(val); }
|
| -
|
| - void assign(const PtrStorageImpl& other) { PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, GarbageCollectedLifetime>::assign(other.get()); }
|
| -};
|
| -
|
| -template<typename T, WebPrivatePtrDestruction crossThreadDestruction, WebPrivatePtrStrength strongOrWeak>
|
| class PtrStorage : public PtrStorageImpl<T, crossThreadDestruction, strongOrWeak, LifetimeOf<T>::value> {
|
| public:
|
| static PtrStorage& fromSlot(void** slot)
|
|
|