Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorSession.cpp

Issue 2004313003: DevTools: migrate from OwnPtr to std::unique_ptr for inspector protocol classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorSession.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorSession.cpp b/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
index d3b3281319f8bb564ea2aa2f1e33f6dcd0362d3c..e83df2445719b5715b8b296be685762b6f2f983d 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
@@ -30,13 +30,13 @@ InspectorSession::InspectorSession(Client* client, InspectedFrames* inspectedFra
, m_disposed(false)
, m_inspectedFrames(inspectedFrames)
, m_instrumentingAgents(instrumentingAgents)
- , m_inspectorFrontend(adoptPtr(new protocol::Frontend(this)))
+ , m_inspectorFrontend(new protocol::Frontend(this))
, m_inspectorBackendDispatcher(protocol::Dispatcher::create(this))
{
InspectorInstrumentation::frontendCreated();
if (savedState) {
- OwnPtr<protocol::Value> state = protocol::parseJSON(*savedState);
+ std::unique_ptr<protocol::Value> state = protocol::parseJSON(*savedState);
if (state)
m_state = protocol::DictionaryValue::cast(std::move(state));
if (!m_state)
@@ -73,12 +73,12 @@ void InspectorSession::dispose()
DCHECK(!m_disposed);
m_disposed = true;
m_inspectorBackendDispatcher->clearFrontend();
- m_inspectorBackendDispatcher.clear();
+ m_inspectorBackendDispatcher.reset();
for (size_t i = m_agents.size(); i > 0; i--)
m_agents[i - 1]->dispose();
- m_inspectorFrontend.clear();
+ m_inspectorFrontend.reset();
m_agents.clear();
- m_v8Session.clear();
+ m_v8Session.reset();
DCHECK(!isInstrumenting());
InspectorInstrumentation::frontendDeleted();
}
@@ -136,7 +136,7 @@ void InspectorSession::flushProtocolNotifications()
void InspectorSession::scriptExecutionBlockedByCSP(const String& directiveText)
{
DCHECK(isInstrumenting());
- OwnPtr<protocol::DictionaryValue> directive = protocol::DictionaryValue::create();
+ std::unique_ptr<protocol::DictionaryValue> directive = protocol::DictionaryValue::create();
directive->setString("directiveText", directiveText);
m_v8Session->breakProgramOnException(protocol::Debugger::Paused::ReasonEnum::CSPViolation, std::move(directive));
}

Powered by Google App Engine
This is Rietveld 408576698