Oilpan: avoid using WeakPtr<> for heap residing objects.

Source/modules/cachestorage/Cache.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef Cache_h
 #define Cache_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "bindings/modules/v8/UnionTypesModules.h"
@@ skipping 14 matching lines @@
 class Response;
 class Request;
 class ScriptState;
 
 typedef RequestOrUSVString RequestInfo;
 
 class MODULES_EXPORT Cache final : public GarbageCollectedFinalized<Cache>, public ScriptWrappable {
     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&);
     ScriptPromise matchAll(ScriptState*, ExceptionState&);
     ScriptPromise matchAll(ScriptState*, const RequestInfo&, const CacheQueryOptions&, ExceptionState&);
     ScriptPromise add(ScriptState*, const RequestInfo&, ExceptionState&);
     ScriptPromise addAll(ScriptState*, const HeapVector<RequestInfo>&, ExceptionState&);
     ScriptPromise deleteFunction(ScriptState*, const RequestInfo&, const CacheQueryOptions&, ExceptionState&);
     ScriptPromise put(ScriptState*, const RequestInfo&, Response*, ExceptionState&);
     ScriptPromise keys(ScriptState*, ExceptionState&);
     ScriptPromise keys(ScriptState*, const RequestInfo&, const CacheQueryOptions&, ExceptionState&);
 
     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*);
     ScriptPromise matchAllImpl(ScriptState*, const Request*, const CacheQueryOptions&);
     ScriptPromise addAllImpl(ScriptState*, const HeapVector<Member<Request>>&, ExceptionState&);
     ScriptPromise deleteImpl(ScriptState*, const Request*, const CacheQueryOptions&);
     ScriptPromise putImpl(ScriptState*, const HeapVector<Member<Request>>&, const HeapVector<Member<Response>>&);
     ScriptPromise keysImpl(ScriptState*);
     ScriptPromise keysImpl(ScriptState*, const Request*, const CacheQueryOptions&);
 
     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 non-oilpan. Can it just be a
RawPtr?

(I'm asking this just because WeakPtrWillBeMember sounds a bit strange -- it
means that the pointer has a weak semantics in non-oilpan but doesn't in
oilpan.)

[sof, 2015/08/27 05:17:13]

It's a WeakPtr<> because the GlobalFetcherImpl is a supplement of its global
object. Supplements are owned by their supplementables, so we have to drop the
reference from Cache once the supplementable decides to finalize its
supplements.

No such restrictions on the lifetime of the ScopedFetcher references for Cache &
CacheStorage are needed with Oilpan enabled.

     OwnPtr<WebServiceWorkerCache> m_webCache;
 };
 
 } // namespace blink
 
 #endif // Cache_h