| Index: third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.h b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.h
|
| index c219f339cb756f124ca93d21c06779b8eee19ca8..3549125fb4db96f40ee6734327ea86454d0044c9 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.h
|
| @@ -17,13 +17,12 @@ namespace blink {
|
| class LocalFrame;
|
| class Resource;
|
|
|
| -class CORE_EXPORT InspectorResourceContentLoader final : public NoBaseWillBeGarbageCollectedFinalized<InspectorResourceContentLoader> {
|
| +class CORE_EXPORT InspectorResourceContentLoader final : public GarbageCollectedFinalized<InspectorResourceContentLoader> {
|
| WTF_MAKE_NONCOPYABLE(InspectorResourceContentLoader);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(InspectorResourceContentLoader);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<InspectorResourceContentLoader> create(LocalFrame* inspectedFrame)
|
| + static RawPtr<InspectorResourceContentLoader> create(LocalFrame* inspectedFrame)
|
| {
|
| - return adoptPtrWillBeNoop(new InspectorResourceContentLoader(inspectedFrame));
|
| + return new InspectorResourceContentLoader(inspectedFrame);
|
| }
|
| ~InspectorResourceContentLoader();
|
| void dispose();
|
| @@ -45,9 +44,9 @@ private:
|
| Vector<OwnPtr<SameThreadClosure>> m_callbacks;
|
| bool m_allRequestsStarted;
|
| bool m_started;
|
| - RawPtrWillBeMember<LocalFrame> m_inspectedFrame;
|
| - WillBeHeapHashSet<RawPtrWillBeMember<ResourceClient>> m_pendingResourceClients;
|
| - WillBeHeapVector<RefPtrWillBeMember<Resource>> m_resources;
|
| + Member<LocalFrame> m_inspectedFrame;
|
| + HeapHashSet<Member<ResourceClient>> m_pendingResourceClients;
|
| + HeapVector<Member<Resource>> m_resources;
|
|
|
| friend class ResourceClient;
|
| };
|
|
|