| Index: third_party/WebKit/Source/core/fetch/ResourceOwner.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceOwner.h b/third_party/WebKit/Source/core/fetch/ResourceOwner.h
|
| index 2fb6fe532b64662782ba7d5f260210297ab15158..1b16c88a771ea7061ef112f54c72cc905685e9f3 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceOwner.h
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceOwner.h
|
| @@ -36,8 +36,8 @@
|
| namespace blink {
|
|
|
| template<class R, class C = typename R::ClientType>
|
| -class ResourceOwner : public WillBeGarbageCollectedMixin, public C {
|
| - WILL_BE_USING_PRE_FINALIZER(ResourceOwner, clearResource);
|
| +class ResourceOwner : public GarbageCollectedMixin, public C {
|
| + USING_PRE_FINALIZER(ResourceOwner, clearResource);
|
| public:
|
| using ResourceType = R;
|
|
|
| @@ -49,11 +49,11 @@ public:
|
| protected:
|
| ResourceOwner();
|
|
|
| - void setResource(const PassRefPtrWillBeRawPtr<ResourceType>&);
|
| + void setResource(const RawPtr<ResourceType>&);
|
| void clearResource() { setResource(nullptr); }
|
|
|
| private:
|
| - RefPtrWillBeMember<ResourceType> m_resource;
|
| + Member<ResourceType> m_resource;
|
| };
|
|
|
| template<class R, class C>
|
| @@ -73,14 +73,14 @@ inline ResourceOwner<R, C>::~ResourceOwner()
|
| }
|
|
|
| template<class R, class C>
|
| -inline void ResourceOwner<R, C>::setResource(const PassRefPtrWillBeRawPtr<R>& newResource)
|
| +inline void ResourceOwner<R, C>::setResource(const RawPtr<R>& newResource)
|
| {
|
| if (newResource == m_resource)
|
| return;
|
|
|
| // Some ResourceClient implementations reenter this so
|
| // we need to prevent double removal.
|
| - if (RefPtrWillBeRawPtr<ResourceType> oldResource = m_resource.release())
|
| + if (RawPtr<ResourceType> oldResource = m_resource.release())
|
| oldResource->removeClient(this);
|
|
|
| if (newResource) {
|
|
|