| Index: third_party/WebKit/Source/core/fetch/Resource.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
|
| index 39bca1c02587c2975803b9a363188661e8339d1c..1f91aa94d9d42af4b083f374287ac8c3646a820b 100644
|
| --- a/third_party/WebKit/Source/core/fetch/Resource.h
|
| +++ b/third_party/WebKit/Source/core/fetch/Resource.h
|
| @@ -265,6 +265,9 @@ public:
|
|
|
| static const char* resourceTypeToString(Type, const FetchInitiatorInfo&);
|
|
|
| + // TODO(japhet): Remove once oilpan ships, it doesn't need the WeakPtr.
|
| + WeakPtrWillBeRawPtr<Resource> asWeakPtr();
|
| +
|
| #ifdef ENABLE_RESOURCE_IS_DELETED_CHECK
|
| void assertAlive() const { RELEASE_ASSERT(!m_deleted); }
|
| #else
|
| @@ -382,6 +385,10 @@ private:
|
|
|
| String m_fragmentIdentifierForRequest;
|
|
|
| +#if !ENABLE(OILPAN)
|
| + WeakPtrFactory<Resource> m_weakPtrFactory;
|
| +#endif
|
| +
|
| RefPtr<CachedMetadata> m_cachedMetadata;
|
| OwnPtrWillBeMember<CacheHandler> m_cacheHandler;
|
|
|
|
|