| Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| index b3614bd502d290503c182ee76d720053c7068670..d27e7361807d83861f85a9170b3f45e51fb7fdf7 100644
|
| --- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| @@ -185,7 +185,7 @@ private:
|
| agent->flushPendingProtocolNotifications();
|
|
|
| Vector<WebViewImpl*> views;
|
| - WillBeHeapVector<RawPtrWillBeMember<WebFrameWidgetImpl>> widgets;
|
| + HeapVector<Member<WebFrameWidgetImpl>> widgets;
|
|
|
| // 1. Disable input events.
|
| const HashSet<WebViewImpl*>& viewImpls = WebViewImpl::allInstances();
|
| @@ -225,7 +225,7 @@ private:
|
| (*it)->setIgnoreInputEvents(false);
|
| }
|
| }
|
| - for (WillBeHeapVector<RawPtrWillBeMember<WebFrameWidgetImpl>>::iterator it = widgets.begin(); it != widgets.end(); ++it) {
|
| + for (HeapVector<Member<WebFrameWidgetImpl>>::iterator it = widgets.begin(); it != widgets.end(); ++it) {
|
| if (m_frozenWidgets.contains(*it)) {
|
| // The widget was not closed during the dispatch.
|
| (*it)->setIgnoreInputEvents(false);
|
| @@ -316,7 +316,7 @@ private:
|
| };
|
|
|
| // static
|
| -PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLocalFrameImpl* frame, WebDevToolsAgentClient* client)
|
| +RawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLocalFrameImpl* frame, WebDevToolsAgentClient* client)
|
| {
|
| WebViewImpl* view = frame->viewImpl();
|
| // TODO(dgozman): sometimes view->mainFrameImpl() does return null, even though |frame| is meant to be main frame.
|
| @@ -326,7 +326,7 @@ PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
|
| WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, nullptr);
|
| if (frame->frameWidget())
|
| agent->layerTreeViewChanged(toWebFrameWidgetImpl(frame->frameWidget())->layerTreeView());
|
| - return adoptPtrWillBeNoop(agent);
|
| + return (agent);
|
| }
|
|
|
| WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, InspectorOverlay::create(view));
|
| @@ -342,13 +342,13 @@ PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
|
| agent->registerAgent(InspectorDOMStorageAgent::create(view->page()));
|
| agent->registerAgent(InspectorCacheStorageAgent::create());
|
| agent->layerTreeViewChanged(view->layerTreeView());
|
| - return adoptPtrWillBeNoop(agent);
|
| + return (agent);
|
| }
|
|
|
| WebDevToolsAgentImpl::WebDevToolsAgentImpl(
|
| WebLocalFrameImpl* webLocalFrameImpl,
|
| WebDevToolsAgentClient* client,
|
| - PassOwnPtrWillBeRawPtr<InspectorOverlay> overlay)
|
| + RawPtr<InspectorOverlay> overlay)
|
| : m_client(client)
|
| , m_webLocalFrameImpl(webLocalFrameImpl)
|
| , m_attached(false)
|
| @@ -384,28 +384,28 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl(
|
| m_injectedScriptManager = InjectedScriptManager::create(mainThreadDebugger);
|
| InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
|
|
|
| - OwnPtrWillBeRawPtr<InspectorInspectorAgent> inspectorAgentPtr(InspectorInspectorAgent::create(injectedScriptManager));
|
| + RawPtr<InspectorInspectorAgent> inspectorAgentPtr(InspectorInspectorAgent::create(injectedScriptManager));
|
| m_inspectorAgent = inspectorAgentPtr.get();
|
| m_agents.append(inspectorAgentPtr.release());
|
|
|
| - OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_inspectedFrames.get(), injectedScriptManager, m_overlay.get()));
|
| + RawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_inspectedFrames.get(), injectedScriptManager, m_overlay.get()));
|
| m_domAgent = domAgentPtr.get();
|
| m_agents.append(domAgentPtr.release());
|
|
|
| - OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_inspectedFrames.get()));
|
| + RawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_inspectedFrames.get()));
|
| m_layerTreeAgent = layerTreeAgentPtr.get();
|
| m_agents.append(layerTreeAgentPtr.release());
|
|
|
| - OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, mainThreadDebugger->debugger(), m_inspectedFrames.get()));
|
| + RawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, mainThreadDebugger->debugger(), m_inspectedFrames.get()));
|
| m_pageRuntimeAgent = pageRuntimeAgentPtr.get();
|
| m_agents.append(pageRuntimeAgentPtr.release());
|
|
|
| - OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_inspectedFrames.get());
|
| + RawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_inspectedFrames.get());
|
| m_pageConsoleAgent = pageConsoleAgentPtr.get();
|
|
|
| - OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAgent::create(pageConsoleAgentPtr.get());
|
| + RawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAgent::create(pageConsoleAgentPtr.get());
|
|
|
| - OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(this, workerAgentPtr.get(), m_inspectedFrames.get());
|
| + RawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(this, workerAgentPtr.get(), m_inspectedFrames.get());
|
| m_tracingAgent = tracingAgentPtr.get();
|
| m_agents.append(tracingAgentPtr.release());
|
|
|
| @@ -482,11 +482,11 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
|
|
|
| InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
|
|
|
| - OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_inspectedFrames.get()));
|
| + RawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_inspectedFrames.get()));
|
| m_resourceAgent = resourceAgentPtr.get();
|
| m_agents.append(resourceAgentPtr.release());
|
|
|
| - OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent, m_inspectedFrames.get(), m_resourceAgent, m_resourceContentLoader.get()));
|
| + RawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent, m_inspectedFrames.get(), m_resourceAgent, m_resourceContentLoader.get()));
|
| InspectorCSSAgent* cssAgent = cssAgentPtr.get();
|
| m_agents.append(cssAgentPtr.release());
|
|
|
| @@ -498,7 +498,7 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
|
| m_agents.append(InspectorFileSystemAgent::create(m_inspectedFrames.get()));
|
| m_agents.append(InspectorIndexedDBAgent::create(m_inspectedFrames.get()));
|
|
|
| - OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(MainThreadDebugger::instance(), m_inspectedFrames.get(), injectedScriptManager));
|
| + RawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(MainThreadDebugger::instance(), m_inspectedFrames.get(), injectedScriptManager));
|
| InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
|
| m_agents.append(debuggerAgentPtr.release());
|
|
|
| @@ -511,7 +511,7 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
|
|
|
| m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptManager));
|
|
|
| - OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_inspectedFrames.get(), this, m_resourceContentLoader.get(), debuggerAgent));
|
| + RawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_inspectedFrames.get(), this, m_resourceContentLoader.get(), debuggerAgent));
|
| m_pageAgent = pageAgentPtr.get();
|
| m_agents.append(pageAgentPtr.release());
|
|
|
| @@ -526,7 +526,7 @@ void WebDevToolsAgentImpl::initializeDeferredAgents()
|
| m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get());
|
| }
|
|
|
| -void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
|
| +void WebDevToolsAgentImpl::registerAgent(RawPtr<InspectorAgent> agent)
|
| {
|
| m_agents.append(agent);
|
| }
|
|
|