| Index: third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
|
| index e1f8bdb590c2488e9bd8a821aecb1eb4103a8bc7..59e712a879b5f40208dfd2720c54b4ce5c863bd6 100644
|
| --- a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
|
| @@ -74,12 +74,11 @@ private:
|
|
|
| } // namespace
|
|
|
| -class WorkerInspectorController::PageInspectorProxy final : public NoBaseWillBeGarbageCollectedFinalized<WorkerInspectorController::PageInspectorProxy>, public InspectorFrontendChannel {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(PageInspectorProxy);
|
| +class WorkerInspectorController::PageInspectorProxy final : public GarbageCollectedFinalized<WorkerInspectorController::PageInspectorProxy>, public InspectorFrontendChannel {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<PageInspectorProxy> create(WorkerGlobalScope* workerGlobalScope)
|
| + static RawPtr<PageInspectorProxy> create(WorkerGlobalScope* workerGlobalScope)
|
| {
|
| - return adoptPtrWillBeNoop(new PageInspectorProxy(workerGlobalScope));
|
| + return (new PageInspectorProxy(workerGlobalScope));
|
| }
|
| ~PageInspectorProxy() override { }
|
|
|
| @@ -105,7 +104,7 @@ private:
|
| }
|
| void flush() override { }
|
|
|
| - RawPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
|
| + Member<WorkerGlobalScope> m_workerGlobalScope;
|
| };
|
|
|
| class WorkerInjectedScriptHostClient: public InjectedScriptHostClient {
|
| @@ -138,18 +137,18 @@ WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGl
|
| m_injectedScriptManager = InjectedScriptManager::create(m_workerThreadDebugger);
|
| V8Debugger* debugger = m_workerThreadDebugger->debugger();
|
|
|
| - OwnPtrWillBeRawPtr<WorkerRuntimeAgent> workerRuntimeAgent = WorkerRuntimeAgent::create(m_injectedScriptManager.get(), debugger, workerGlobalScope, this);
|
| + RawPtr<WorkerRuntimeAgent> workerRuntimeAgent = WorkerRuntimeAgent::create(m_injectedScriptManager.get(), debugger, workerGlobalScope, this);
|
| m_workerRuntimeAgent = workerRuntimeAgent.get();
|
| m_agents.append(workerRuntimeAgent.release());
|
|
|
| - OwnPtrWillBeRawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebuggerAgent::create(debugger, workerGlobalScope, m_injectedScriptManager.get());
|
| + RawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebuggerAgent::create(debugger, workerGlobalScope, m_injectedScriptManager.get());
|
| m_workerDebuggerAgent = workerDebuggerAgent.get();
|
| m_agents.append(workerDebuggerAgent.release());
|
|
|
| m_agents.append(InspectorProfilerAgent::create(debugger, 0));
|
| m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_injectedScriptManager.get()));
|
|
|
| - OwnPtrWillBeRawPtr<WorkerConsoleAgent> workerConsoleAgent = WorkerConsoleAgent::create(m_injectedScriptManager.get(), workerGlobalScope);
|
| + RawPtr<WorkerConsoleAgent> workerConsoleAgent = WorkerConsoleAgent::create(m_injectedScriptManager.get(), workerGlobalScope);
|
| WorkerConsoleAgent* workerConsoleAgentPtr = workerConsoleAgent.get();
|
| workerConsoleAgentPtr->setDebuggerAgent(m_workerDebuggerAgent->v8DebuggerAgent());
|
| m_agents.append(workerConsoleAgent.release());
|
| @@ -164,7 +163,7 @@ WorkerInspectorController::~WorkerInspectorController()
|
| {
|
| }
|
|
|
| -void WorkerInspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
|
| +void WorkerInspectorController::registerModuleAgent(RawPtr<InspectorAgent> agent)
|
| {
|
| m_agents.append(agent);
|
| }
|
|
|