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

Unified Diff: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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/web/WebDevToolsAgentImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
index 0e5a4f94247f756f5388a3ef320d2f88dbcc3ee5..7b5a6e3e5d421427f64a413d15d0568764db9d90 100644
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
@@ -90,7 +90,9 @@
#include "web/WebViewImpl.h"
#include "wtf/MathExtras.h"
#include "wtf/Noncopyable.h"
+#include "wtf/PtrUtil.h"
#include "wtf/text/WTFString.h"
+#include <memory>
namespace blink {
@@ -116,7 +118,7 @@ public:
{
if (s_instance)
return;
- OwnPtr<ClientMessageLoopAdapter> instance = adoptPtr(new ClientMessageLoopAdapter(adoptPtr(client->createClientMessageLoop())));
+ std::unique_ptr<ClientMessageLoopAdapter> instance = wrapUnique(new ClientMessageLoopAdapter(wrapUnique(client->createClientMessageLoop())));
s_instance = instance.get();
MainThreadDebugger::instance()->setClientMessageLoop(std::move(instance));
}
@@ -152,7 +154,7 @@ public:
}
private:
- ClientMessageLoopAdapter(PassOwnPtr<WebDevToolsAgentClient::WebKitClientMessageLoop> messageLoop)
+ ClientMessageLoopAdapter(std::unique_ptr<WebDevToolsAgentClient::WebKitClientMessageLoop> messageLoop)
: m_runningForDebugBreak(false)
, m_runningForCreateWindow(false)
, m_messageLoop(std::move(messageLoop))
@@ -267,7 +269,7 @@ private:
bool m_runningForDebugBreak;
bool m_runningForCreateWindow;
- OwnPtr<WebDevToolsAgentClient::WebKitClientMessageLoop> m_messageLoop;
+ std::unique_ptr<WebDevToolsAgentClient::WebKitClientMessageLoop> m_messageLoop;
typedef HashSet<WebViewImpl*> FrozenViewsSet;
FrozenViewsSet m_frozenViews;
WebFrameWidgetsSet m_frozenWidgets;
@@ -646,7 +648,7 @@ void WebDevToolsAgentImpl::didProcessTask()
flushProtocolNotifications();
}
-void WebDevToolsAgentImpl::runDebuggerTask(int sessionId, PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
+void WebDevToolsAgentImpl::runDebuggerTask(int sessionId, std::unique_ptr<WebDevToolsAgent::MessageDescriptor> descriptor)
{
WebDevToolsAgent* webagent = descriptor->agent();
if (!webagent)
@@ -659,8 +661,8 @@ void WebDevToolsAgentImpl::runDebuggerTask(int sessionId, PassOwnPtr<WebDevTools
void WebDevToolsAgent::interruptAndDispatch(int sessionId, MessageDescriptor* rawDescriptor)
{
- // rawDescriptor can't be a PassOwnPtr because interruptAndDispatch is a WebKit API function.
- MainThreadDebugger::interruptMainThreadAndRun(threadSafeBind(WebDevToolsAgentImpl::runDebuggerTask, sessionId, passed(adoptPtr(rawDescriptor))));
+ // rawDescriptor can't be a std::unique_ptr because interruptAndDispatch is a WebKit API function.
+ MainThreadDebugger::interruptMainThreadAndRun(threadSafeBind(WebDevToolsAgentImpl::runDebuggerTask, sessionId, passed(wrapUnique(rawDescriptor))));
}
bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method)
« no previous file with comments | « third_party/WebKit/Source/web/WebDevToolsAgentImpl.h ('k') | third_party/WebKit/Source/web/WebElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698