Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceOwner.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceLoader.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698