Move InspectorTask handling from MainThreadTaskRunner to Document

third_party/WebKit/Source/core/dom/MainThreadTaskRunner.cpp

 /*
  * Copyright (C) 2013 Google 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 28 matching lines @@
     : m_context(context),
       m_pendingTasksTimer(this, &MainThreadTaskRunner::pendingTasksTimerFired),
       m_suspended(false),
       m_weakFactory(this),
       // Bind a WeakPtr now to avoid data races creating a WeakPtr inside
       // postTask.
       m_weakPtr(m_weakFactory.createWeakPtr()) {}
 
 MainThreadTaskRunner::~MainThreadTaskRunner() {}
 
-void MainThreadTaskRunner::postTaskInternal(
-    const WebTraceLocation& location,
-    std::unique_ptr<ExecutionContextTask> task,
-    bool isInspectorTask,
-    bool instrumenting) {
-  Platform::current()->mainThread()->getWebTaskRunner()->postTask(
-      location,
-      crossThreadBind(&MainThreadTaskRunner::perform, m_weakPtr,
-                      passed(std::move(task)), isInspectorTask, instrumenting));
-}
-
 void MainThreadTaskRunner::postTask(const WebTraceLocation& location,
                                     std::unique_ptr<ExecutionContextTask> task,
                                     const String& taskNameForInstrumentation) {
   if (!taskNameForInstrumentation.isEmpty())
     InspectorInstrumentation::asyncTaskScheduled(
         m_context, taskNameForInstrumentation, task.get());
   const bool instrumenting = !taskNameForInstrumentation.isEmpty();
-  postTaskInternal(location, std::move(task), false, instrumenting);
-}
-
-void MainThreadTaskRunner::postInspectorTask(
-    const WebTraceLocation& location,
-    std::unique_ptr<ExecutionContextTask> task) {
-  postTaskInternal(location, std::move(task), true, false);
+  Platform::current()->mainThread()->getWebTaskRunner()->postTask(
+      location, crossThreadBind(&MainThreadTaskRunner::perform, m_weakPtr,
+                                passed(std::move(task)), instrumenting));
 }
 
 void MainThreadTaskRunner::perform(std::unique_ptr<ExecutionContextTask> task,
-                                   bool isInspectorTask,
                                    bool instrumenting) {
   // If the owner m_context is about to be swept then it
   // is no longer safe to access.
   if (ThreadHeap::willObjectBeLazilySwept(m_context.get()))
     return;
 
-  if (!isInspectorTask &&
-      (m_context->tasksNeedSuspension() || !m_pendingTasks.isEmpty())) {
+  if (m_context->tasksNeedSuspension() || !m_pendingTasks.isEmpty()) {
     m_pendingTasks.append(make_pair(std::move(task), instrumenting));
     return;
   }
 
   InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(),
-                                                !isInspectorTask);
+                                                instrumenting);
   task->performTask(m_context);
 }
 
 void MainThreadTaskRunner::suspend() {
   DCHECK(!m_suspended);
   m_pendingTasksTimer.stop();
   m_suspended = true;
 }
 
 void MainThreadTaskRunner::resume() {
@@ skipping 15 matching lines @@
         std::move(m_pendingTasks[0].first);
     const bool instrumenting = m_pendingTasks[0].second;
     m_pendingTasks.remove(0);
     InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(),
                                                   instrumenting);
     task->performTask(m_context);
   }
 }
 
 }  // namespace blink