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

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

Index: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h
index 3ccaf34d9029da6739f9c9ab28cfd7563e85411e..7859987fd75424795df20d69415baf7266b7566a 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.h
@@ -40,35 +40,37 @@
 namespace blink {
 
 class InstrumentingAgents;
+class Resource;
 class ThreadDebugger;
 class WorkerGlobalScope;
 
 namespace InspectorInstrumentation {
 
-class CORE_EXPORT AsyncTask {
+class CORE_EXPORT NativeBreakpoint {
   STACK_ALLOCATED();
 
  public:
-  AsyncTask(ExecutionContext*, void* task);
-  AsyncTask(ExecutionContext*, void* task, bool enabled);
-  ~AsyncTask();
+  NativeBreakpoint(ExecutionContext*, const char* name);
+  NativeBreakpoint(ExecutionContext*, EventTarget*, Event*);
+  ~NativeBreakpoint();
 
  private:
-  ThreadDebugger* m_debugger;
-  void* m_task;
+  Member<InstrumentingAgents> m_instrumentingAgents;
 };
 
-class CORE_EXPORT NativeBreakpoint {
+class CORE_EXPORT AsyncTask {
   STACK_ALLOCATED();
 
  public:
-  NativeBreakpoint(ExecutionContext*, const char* name, bool sync);
-  NativeBreakpoint(ExecutionContext*, EventTarget*, Event*);
-  ~NativeBreakpoint();
+  AsyncTask(ExecutionContext*, void* task);
+  AsyncTask(ExecutionContext*, void* task, bool enabled);
+  AsyncTask(ExecutionContext*, void* task, const char* breakpointName);
+  ~AsyncTask();
 
  private:
-  Member<InstrumentingAgents> m_instrumentingAgents;
-  bool m_sync;
+  ThreadDebugger* m_debugger;
+  void* m_task;
+  NativeBreakpoint m_breakpoint;

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

Perhaps there should be two separate classes AsyncTask and
AsyncTaskWithBreakpoint?

 };
 
 // Called from generated instrumentation code.
@@ -109,13 +111,38 @@ inline InstrumentingAgents* instrumentingAgentsFor(EventTarget* eventTarget) {
              : nullptr;
 }
 
+CORE_EXPORT void breakIfNeeded(ExecutionContext*, const char* name);
+
+CORE_EXPORT void asyncTaskScheduled(ExecutionContext*,
+                                    const String& name,
+                                    void*,
+                                    bool recurring = false);
+CORE_EXPORT void asyncTaskScheduledBreakable(ExecutionContext*,
+                                             const char* name,
+                                             void*,
+                                             bool recurring = false);
+CORE_EXPORT void asyncTaskCanceled(ExecutionContext*, void*);
+CORE_EXPORT void asyncTaskCanceledBreakable(ExecutionContext*,
+                                            const char* name,
+                                            void*);
+
+CORE_EXPORT void allAsyncTasksCanceled(ExecutionContext*);
+CORE_EXPORT void canceledAfterReceivedResourceResponse(LocalFrame*,
+                                                       DocumentLoader*,
+                                                       unsigned long identifier,
+                                                       const ResourceResponse&,
+                                                       Resource*);
+CORE_EXPORT void continueWithPolicyIgnore(LocalFrame*,
+                                          DocumentLoader*,
+                                          unsigned long identifier,
+                                          const ResourceResponse&,
+                                          Resource*);
+
 }  // namespace InspectorInstrumentation
 }  // namespace blink
 
 #include "core/InspectorInstrumentationInl.h"
 
-#include "core/inspector/InspectorInstrumentationCustomInl.h"
-
 #include "core/InspectorOverridesInl.h"
 
 #endif  // !defined(InspectorInstrumentation_h)