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

Unified Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 300393002: Merge DevTools Refactor CL to Blink36 (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/1985
Patch Set: PTAL Created 6 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
« no previous file with comments | « Source/devtools/protocol.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index adf2fccb0c5ee4ed90910abc380a193330981c60..689627ec94b4e0cabfbcdc61b655104a0b32d4e5 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -34,6 +34,7 @@
#include "InspectorBackendDispatcher.h"
#include "InspectorFrontend.h"
#include "RuntimeEnabledFeatures.h"
+#include "bindings/dart/DartScriptDebugServer.h"
#include "bindings/v8/PageScriptDebugServer.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/common/DeleteResult.h"
@@ -90,6 +91,8 @@ public:
return;
OwnPtr<ClientMessageLoopAdapter> instance = adoptPtr(new ClientMessageLoopAdapter(adoptPtr(client->createClientMessageLoop())));
s_instance = instance.get();
+ // FIXMEDART: cleanup memory model.
+ DartScriptDebugServer::shared().setClientMessageLoop(s_instance);
PageScriptDebugServer::shared().setClientMessageLoop(instance.release());
}
@@ -686,6 +689,7 @@ void WebDevToolsAgent::interruptAndDispatch(MessageDescriptor* rawDescriptor)
// rawDescriptor can't be a PassOwnPtr because interruptAndDispatch is a WebKit API function.
OwnPtr<MessageDescriptor> descriptor = adoptPtr(rawDescriptor);
OwnPtr<DebuggerTask> task = adoptPtr(new DebuggerTask(descriptor.release()));
+ // FIXMEDART: do we need to support Dart as well?
PageScriptDebugServer::interruptAndRun(task.release());
}
« no previous file with comments | « Source/devtools/protocol.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698