DevTools: do not use RAII for sync native breakpoints, reuse AsyncTask where possible.

third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
index 0470465885e7bcc1f852704e38b9e6d693616371..1dbd37dc494bd30b5b7ac724b5012c00ee2bf7d7 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
@@ -57,7 +57,18 @@ AsyncTask::AsyncTask(ExecutionContext* context, void* task)
 
 AsyncTask::AsyncTask(ExecutionContext* context, void* task, bool enabled)
     : m_debugger(enabled ? ThreadDebugger::from(toIsolate(context)) : nullptr),
-      m_task(task) {
+      m_task(task),
+      m_breakpoint(nullptr, nullptr) {
+  if (m_debugger)
+    m_debugger->asyncTaskStarted(m_task);
+}
+
+AsyncTask::AsyncTask(ExecutionContext* context,
+                     void* task,
+                     const char* breakpointName)
+    : m_debugger(ThreadDebugger::from(toIsolate(context))),
+      m_task(task),
+      m_breakpoint(context, breakpointName) {
   if (m_debugger)
     m_debugger->asyncTaskStarted(m_task);
 }
@@ -69,17 +80,19 @@ AsyncTask::~AsyncTask() {
 
 void asyncTaskScheduled(ExecutionContext* context,
                         const String& name,
-                        void* task) {
+                        void* task,
+                        bool recurring) {
   if (ThreadDebugger* debugger = ThreadDebugger::from(toIsolate(context)))
-    debugger->asyncTaskScheduled(name, task, false);
+    debugger->asyncTaskScheduled(name, task, recurring);
 }
 
-void asyncTaskScheduled(ExecutionContext* context,
-                        const String& name,
-                        void* task,
-                        bool recurring) {
+void asyncTaskScheduledBreakable(ExecutionContext* context,
+                                 const char* name,
+                                 void* task,
+                                 bool recurring) {
   if (ThreadDebugger* debugger = ThreadDebugger::from(toIsolate(context)))

[alph, 2017/02/21 20:13:58]

nit: asyncTaskScheduled(...)

     debugger->asyncTaskScheduled(name, task, recurring);
+  breakIfNeeded(context, name);
 }
 
 void asyncTaskCanceled(ExecutionContext* context, void* task) {
@@ -87,27 +100,42 @@ void asyncTaskCanceled(ExecutionContext* context, void* task) {
     debugger->asyncTaskCanceled(task);
 }
 
+void asyncTaskCanceledBreakable(ExecutionContext* context,
+                                const char* name,
+                                void* task) {
+  asyncTaskCanceled(context, task);
+  breakIfNeeded(context, name);
+}
+
 void allAsyncTasksCanceled(ExecutionContext* context) {
   if (ThreadDebugger* debugger = ThreadDebugger::from(toIsolate(context)))
     debugger->allAsyncTasksCanceled();
 }
 
-NativeBreakpoint::NativeBreakpoint(ExecutionContext* context,
-                                   const char* name,
-                                   bool sync)
-    : m_instrumentingAgents(instrumentingAgentsFor(context)), m_sync(sync) {
+void breakIfNeeded(ExecutionContext* context, const char* name) {
+  InstrumentingAgents* instrumentingAgents = instrumentingAgentsFor(context);
+  if (!instrumentingAgents ||
+      !instrumentingAgents->hasInspectorDOMDebuggerAgents())
+    return;

[caseq, 2017/02/21 21:04:27]

{} around this one.

+  for (InspectorDOMDebuggerAgent* domDebuggerAgent :
+       instrumentingAgents->inspectorDOMDebuggerAgents())
+    domDebuggerAgent->allowNativeBreakpoint(name, nullptr, true);

[caseq, 2017/02/21 21:04:27]

ditto.

+}
+
+NativeBreakpoint::NativeBreakpoint(ExecutionContext* context, const char* name)
+    : m_instrumentingAgents(instrumentingAgentsFor(context)) {
   if (!m_instrumentingAgents ||
       !m_instrumentingAgents->hasInspectorDOMDebuggerAgents())
     return;
   for (InspectorDOMDebuggerAgent* domDebuggerAgent :
        m_instrumentingAgents->inspectorDOMDebuggerAgents())
-    domDebuggerAgent->allowNativeBreakpoint(name, nullptr, m_sync);
+    domDebuggerAgent->allowNativeBreakpoint(name, nullptr, false);
 }
 
 NativeBreakpoint::NativeBreakpoint(ExecutionContext* context,
                                    EventTarget* eventTarget,
                                    Event* event)
-    : m_instrumentingAgents(instrumentingAgentsFor(context)), m_sync(false) {
+    : m_instrumentingAgents(instrumentingAgentsFor(context)) {
   if (!m_instrumentingAgents ||
       !m_instrumentingAgents->hasInspectorDOMDebuggerAgents())
     return;
@@ -115,11 +143,11 @@ NativeBreakpoint::NativeBreakpoint(ExecutionContext* context,
   String targetName = node ? node->nodeName() : eventTarget->interfaceName();
   for (InspectorDOMDebuggerAgent* domDebuggerAgent :
        m_instrumentingAgents->inspectorDOMDebuggerAgents())
-    domDebuggerAgent->allowNativeBreakpoint(event->type(), &targetName, m_sync);
+    domDebuggerAgent->allowNativeBreakpoint(event->type(), &targetName, false);
 }
 
 NativeBreakpoint::~NativeBreakpoint() {
-  if (m_sync || !m_instrumentingAgents ||
+  if (!m_instrumentingAgents ||
       !m_instrumentingAgents->hasInspectorDOMDebuggerAgents())
     return;
   for (InspectorDOMDebuggerAgent* domDebuggerAgent :
@@ -127,10 +155,6 @@ NativeBreakpoint::~NativeBreakpoint() {
     domDebuggerAgent->cancelNativeBreakpoint();
 }
 
-bool isDebuggerPaused(LocalFrame*) {
-  return MainThreadDebugger::instance()->isPaused();
-}
-
 void didReceiveResourceResponseButCanceled(LocalFrame* frame,
                                            DocumentLoader* loader,
                                            unsigned long identifier,