[scheduler] Fix TaskQueueThrottler::SetQueueEnabled logic.

third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scheduler/base/task_queue_manager.h"
 
 #include <queue>
 #include <set>
 
 #include "base/bind.h"
+#include "base/format_macros.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "platform/scheduler/base/real_time_domain.h"
 #include "platform/scheduler/base/task_queue_impl.h"
 #include "platform/scheduler/base/task_queue_manager_delegate.h"
 #include "platform/scheduler/base/task_queue_selector.h"
 #include "platform/scheduler/base/work_queue.h"
 #include "platform/scheduler/base/work_queue_sets.h"
 #include "public/platform/scheduler/base/task_time_observer.h"
 
 namespace blink {
@@ skipping 19 matching lines @@
 
 // Converts a OnceClosure to a RepeatingClosure. It hits CHECK failure to run
 // the resulting RepeatingClosure more than once.
 // TODO(tzik): This will be unneeded after the Closure-to-OnceClosure migration
 // on TaskRunner finished. Remove it once it gets unneeded.
 base::RepeatingClosure UnsafeConvertOnceClosureToRepeating(
     base::OnceClosure cb) {
   return base::BindRepeating([](base::OnceClosure cb) { std::move(cb).Run(); },
                              base::Passed(&cb));
 }
+
+std::string PointerToId(void* pointer) {

[alex clarke (OOO till 29th), 2016/11/24 14:45:07]

Can we land this separately?  It seems unrelated to the fix.

[altimin, 2016/11/24 15:00:55]

Oops, sorry.

+  return base::StringPrintf(
+      "%" PRIx64, static_cast<uint64_t>(reinterpret_cast<uintptr_t>(pointer)));
 }
 
+}  // namespace
+
 TaskQueueManager::TaskQueueManager(
     scoped_refptr<TaskQueueManagerDelegate> delegate,
     const char* tracing_category,
     const char* disabled_by_default_tracing_category,
     const char* disabled_by_default_verbose_tracing_category)
     : real_time_domain_(new RealTimeDomain(tracing_category)),
       delegate_(delegate),
       task_was_run_on_quiescence_monitored_queue_(false),
       other_thread_pending_wakeup_(false),
       work_batch_size_(1),
@@ skipping 277 matching lines @@
 
   MaybeRecordTaskDelayHistograms(pending_task, queue);
 
   TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue",
                        pending_task);
   if (queue->GetShouldNotifyObservers()) {
     for (auto& observer : task_observers_)
       observer.WillProcessTask(pending_task);
     queue->NotifyWillProcessTask(pending_task);
   }
-  TRACE_EVENT1(tracing_category_, "TaskQueueManager::RunTask", "queue",
-               queue->GetName());
+  TRACE_EVENT2(tracing_category_, "TaskQueueManager::RunTask", "queue",
+               queue->GetName(), "queue_id", PointerToId(queue));
   // NOTE when TaskQueues get unregistered a reference ends up getting retained
   // by |queues_to_delete_| which is cleared at the top of |DoWork|. This means
   // we are OK to use raw pointers here.
   internal::TaskQueueImpl* prev_executing_task_queue =
       currently_executing_task_queue_;
   currently_executing_task_queue_ = queue;
   task_annotator_.RunTask("TaskQueueManager::PostTask", &pending_task);
   // Detect if the TaskQueueManager just got deleted.  If this happens we must
   // not access any member variables after this point.
   if (protect->HasOneRef())
@@ skipping 128 matching lines @@
                                            *work_queue->GetFrontTask());
   }
 }
 
 bool TaskQueueManager::HasImmediateWorkForTesting() const {
   return !selector_.EnabledWorkQueuesEmpty();
 }
 
 }  // namespace scheduler
 }  // namespace blink