| Index: Source/core/inspector/InspectorResourceContentLoader.h
|
| diff --git a/Source/core/inspector/InspectorResourceContentLoader.h b/Source/core/inspector/InspectorResourceContentLoader.h
|
| index d85bcdb3a8d232070db259b28b81e214f2690053..c0b31f68f9406e91d6743758d7a4b27abade5e79 100644
|
| --- a/Source/core/inspector/InspectorResourceContentLoader.h
|
| +++ b/Source/core/inspector/InspectorResourceContentLoader.h
|
| @@ -16,14 +16,14 @@ class Page;
|
| class Resource;
|
| class VoidCallback;
|
|
|
| -// FIXME: Oilpan: Move InspectorResourceContentLoader to the heap.
|
| -class InspectorResourceContentLoader FINAL {
|
| +class InspectorResourceContentLoader FINAL : public NoBaseWillBeGarbageCollectedFinalized<InspectorResourceContentLoader> {
|
| WTF_MAKE_NONCOPYABLE(InspectorResourceContentLoader);
|
| - WTF_MAKE_FAST_ALLOCATED;
|
| + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
|
| public:
|
| explicit InspectorResourceContentLoader(Page*);
|
| void ensureResourcesContentLoaded(PassOwnPtrWillBeRawPtr<VoidCallback>);
|
| ~InspectorResourceContentLoader();
|
| + void trace(Visitor*);
|
| bool hasFinished();
|
| void stop();
|
|
|
| @@ -34,10 +34,10 @@ private:
|
| void checkDone();
|
| void start();
|
|
|
| - WillBePersistentHeapVector<OwnPtrWillBeMember<VoidCallback> > m_callbacks;
|
| + WillBeHeapVector<OwnPtrWillBeMember<VoidCallback> > m_callbacks;
|
| bool m_allRequestsStarted;
|
| bool m_started;
|
| - Page* m_page;
|
| + RawPtrWillBeMember<Page> m_page;
|
| HashSet<ResourceClient*> m_pendingResourceClients;
|
| Vector<ResourcePtr<Resource> > m_resources;
|
|
|
|
|