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

third_party/WebKit/Source/core/frame/DOMTimer.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 46 matching lines @@
 int DOMTimer::install(ExecutionContext* context,
                       ScheduledAction* action,
                       int timeout,
                       bool singleShot) {
   int timeoutID = context->timers()->installNewTimeout(context, action, timeout,
                                                        singleShot);
   TRACE_EVENT_INSTANT1("devtools.timeline", "TimerInstall",
                        TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorTimerInstallEvent::data(context, timeoutID,
                                                         timeout, singleShot));
+  InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(context,
+                                                              "setTimer", true);
   return timeoutID;
 }
 
 void DOMTimer::removeByID(ExecutionContext* context, int timeoutID) {
   DOMTimer* timer = context->timers()->removeTimeoutByID(timeoutID);
   TRACE_EVENT_INSTANT1("devtools.timeline", "TimerRemove",
                        TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorTimerRemoveEvent::data(context, timeoutID));
+  InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+      context, "clearTimer", true);
   // Eagerly unregister as ExecutionContext observer.
   if (timer)
     timer->clearContext();
 }
 
 DOMTimer::DOMTimer(ExecutionContext* context,
                    ScheduledAction* action,
                    int interval,
                    bool singleShot,
                    int timeoutID)
     : SuspendableTimer(context, TaskType::Timer),
       m_timeoutID(timeoutID),
       m_nestingLevel(context->timers()->timerNestingLevel() + 1),
       m_action(action) {
   ASSERT(timeoutID > 0);
   if (shouldForwardUserGesture(interval, m_nestingLevel)) {
     // Thread safe because shouldForwardUserGesture will only return true if
     // execution is on the the main thread.
     m_userGestureToken = UserGestureIndicator::currentToken();
   }
 
+  InspectorInstrumentation::asyncTaskScheduled(
+      context, singleShot ? "setTimeout" : "setInterval", this, !singleShot);
+
   double intervalMilliseconds =
       std::max(oneMillisecond, interval * oneMillisecond);
   if (intervalMilliseconds < minimumInterval &&
       m_nestingLevel >= maxTimerNestingLevel)
     intervalMilliseconds = minimumInterval;
   if (singleShot)
     startOneShot(intervalMilliseconds, BLINK_FROM_HERE);
   else
     startRepeating(intervalMilliseconds, BLINK_FROM_HERE);
-
-  suspendIfNeeded();
-  InspectorInstrumentation::asyncTaskScheduledBreakable(
-      context, singleShot ? "setTimeout" : "setInterval", this, !singleShot);
 }
 
 DOMTimer::~DOMTimer() {
   if (m_action)
     m_action->dispose();
 }
 
 void DOMTimer::stop() {
-  InspectorInstrumentation::asyncTaskCanceledBreakable(
-      getExecutionContext(),
-      repeatInterval() ? "clearInterval" : "clearTimeout", this);
-
+  InspectorInstrumentation::asyncTaskCanceled(getExecutionContext(), this);
   m_userGestureToken = nullptr;
   // Need to release JS objects potentially protected by ScheduledAction
   // because they can form circular references back to the ExecutionContext
   // which will cause a memory leak.
   if (m_action)
     m_action->dispose();
   m_action = nullptr;
   SuspendableTimer::stop();
 }
 
 void DOMTimer::contextDestroyed(ExecutionContext*) {
   stop();
 }
 
 void DOMTimer::fired() {
   ExecutionContext* context = getExecutionContext();
   ASSERT(context);
   context->timers()->setTimerNestingLevel(m_nestingLevel);
   DCHECK(!context->isContextSuspended());
   // Only the first execution of a multi-shot timer should get an affirmative
   // user gesture indicator.
   UserGestureIndicator gestureIndicator(std::move(m_userGestureToken));
 
   TRACE_EVENT1("devtools.timeline", "TimerFire", "data",
                InspectorTimerFireEvent::data(context, m_timeoutID));
   PerformanceMonitor::HandlerCall handlerCall(
       context, repeatInterval() ? "setInterval" : "setTimeout", true);
-  InspectorInstrumentation::AsyncTask asyncTask(context, this, "timerFired");
+  InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+      context, "timerFired", false);
+  InspectorInstrumentation::AsyncTask asyncTask(context, this);
 
   // Simple case for non-one-shot timers.
   if (isActive()) {
     if (repeatInterval() && repeatInterval() < minimumInterval) {
       m_nestingLevel++;
       if (m_nestingLevel >= maxTimerNestingLevel)
         augmentRepeatInterval(minimumInterval - repeatInterval());
     }
 
     // No access to member variables after this point, it can delete the timer.
@@ skipping 30 matching lines @@
 RefPtr<WebTaskRunner> DOMTimer::timerTaskRunner() const {
   return getExecutionContext()->timers()->timerTaskRunner();
 }
 
 DEFINE_TRACE(DOMTimer) {
   visitor->trace(m_action);
   SuspendableTimer::trace(visitor);
 }
 
 }  // namespace blink