Source/modules/cachestorage/Cache.h - Issue 1320563003: Oilpan: avoid using WeakPtr<> for heap residing objects.

Unified Diff: Source/modules/cachestorage/Cache.h

Issue 1320563003: Oilpan: avoid using WeakPtr<> for heap residing objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: revert unrelated unit test addition Created 5 years, 4 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:

Index: Source/modules/cachestorage/Cache.h

diff --git a/Source/modules/cachestorage/Cache.h b/Source/modules/cachestorage/Cache.h

index 11caf99dc037f7409cbd2635ab1c801f1067f674..cc61280c5efb38776dff9eb0eb4014623215ef72 100644

--- a/Source/modules/cachestorage/Cache.h

+++ b/Source/modules/cachestorage/Cache.h

@@ -32,7 +32,7 @@ class MODULES_EXPORT Cache final : public GarbageCollectedFinalized<Cache>, publ

DEFINE_WRAPPERTYPEINFO();

WTF_MAKE_NONCOPYABLE(Cache);

public:

- static Cache* create(WeakPtr<GlobalFetch::ScopedFetcher>, PassOwnPtr<WebServiceWorkerCache>);

+ static Cache* create(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher>, PassOwnPtr<WebServiceWorkerCache>);

// From Cache.idl:

ScriptPromise match(ScriptState*, const RequestInfo&, const CacheQueryOptions&, ExceptionState&);

@@ -47,14 +47,14 @@ public:

static WebServiceWorkerCache::QueryParams toWebQueryParams(const CacheQueryOptions&);

- DEFINE_INLINE_TRACE() { }

+ DECLARE_TRACE();

private:

class BarrierCallbackForPut;

class BlobHandleCallbackForPut;

class FetchResolvedForAdd;

friend class FetchResolvedForAdd;

- Cache(WeakPtr<GlobalFetch::ScopedFetcher>, PassOwnPtr<WebServiceWorkerCache>);

+ Cache(WeakPtrWillBeRawPtr<GlobalFetch::ScopedFetcher>, PassOwnPtr<WebServiceWorkerCache>);

ScriptPromise matchImpl(ScriptState*, const Request*, const CacheQueryOptions&);

ScriptPromise matchAllImpl(ScriptState*);

@@ -67,7 +67,7 @@ private:

WebServiceWorkerCache* webCache() const;

- WeakPtr<GlobalFetch::ScopedFetcher> m_scopedFetcher;

+ WeakPtrWillBeMember<GlobalFetch::ScopedFetcher> m_scopedFetcher;

haraken 2015/08/27 00:41:05 I'm wondering why this needs to be a WeakPtr in no

sof 2015/08/27 05:17:13 It's a WeakPtr<> because the GlobalFetcherImpl is

OwnPtr<WebServiceWorkerCache> m_webCache;

};