| Index: third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
|
| index aed02c4968862af1b79e084971759912b78c1476..6f624c7444ea15ff620b80ed9e3d650073a75e15 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
|
| @@ -48,7 +48,7 @@ using ErrorString = String;
|
| class CORE_EXPORT InspectorWorkerAgent final : public InspectorBaseAgent<InspectorWorkerAgent, InspectorFrontend::Worker>, public InspectorBackendDispatcher::WorkerCommandHandler {
|
| WTF_MAKE_NONCOPYABLE(InspectorWorkerAgent);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<InspectorWorkerAgent> create(PageConsoleAgent*);
|
| + static RawPtr<InspectorWorkerAgent> create(PageConsoleAgent*);
|
| ~InspectorWorkerAgent() override;
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -71,9 +71,8 @@ public:
|
| void setTracingSessionId(const String&);
|
|
|
| class WorkerAgentClient final : public WorkerInspectorProxy::PageInspector {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(InspectorWorkerAgent::WorkerAgentClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<WorkerAgentClient> create(InspectorFrontend::Worker*, WorkerInspectorProxy*, const String& id, PageConsoleAgent*);
|
| + static RawPtr<WorkerAgentClient> create(InspectorFrontend::Worker*, WorkerInspectorProxy*, const String& id, PageConsoleAgent*);
|
| WorkerAgentClient(InspectorFrontend::Worker*, WorkerInspectorProxy*, const String& id, PageConsoleAgent*);
|
| ~WorkerAgentClient() override;
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -90,10 +89,10 @@ public:
|
| void workerConsoleAgentEnabled(WorkerGlobalScopeProxy*) override;
|
|
|
| InspectorFrontend::Worker* m_frontend;
|
| - RawPtrWillBeMember<WorkerInspectorProxy> m_proxy;
|
| + Member<WorkerInspectorProxy> m_proxy;
|
| String m_id;
|
| bool m_connected;
|
| - RawPtrWillBeMember<PageConsoleAgent> m_consoleAgent;
|
| + Member<PageConsoleAgent> m_consoleAgent;
|
| };
|
|
|
| private:
|
| @@ -110,12 +109,12 @@ private:
|
| String id;
|
| };
|
|
|
| - using WorkerClients = WillBeHeapHashMap<String, OwnPtrWillBeMember<WorkerAgentClient>>;
|
| + using WorkerClients = HeapHashMap<String, Member<WorkerAgentClient>>;
|
| WorkerClients m_idToClient;
|
| - using WorkerInfos = WillBeHeapHashMap<RawPtrWillBeMember<WorkerInspectorProxy>, WorkerInfo>;
|
| + using WorkerInfos = HeapHashMap<Member<WorkerInspectorProxy>, WorkerInfo>;
|
| WorkerInfos m_workerInfos;
|
| String m_tracingSessionId;
|
| - RawPtrWillBeMember<PageConsoleAgent> m_consoleAgent;
|
| + Member<PageConsoleAgent> m_consoleAgent;
|
| };
|
|
|
| } // namespace blink
|
|
|