Remove ExecutionContextTask::taskNameForInstrumentation()

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 29 matching lines @@
     , m_pendingTasksTimer(this, &MainThreadTaskRunner::pendingTasksTimerFired)
     , m_suspended(false)
     , m_weakFactory(this)
 {
 }
 
 MainThreadTaskRunner::~MainThreadTaskRunner()
 {
 }
 
-void MainThreadTaskRunner::postTaskInternal(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task, bool isInspectorTask)
+void MainThreadTaskRunner::postTaskInternal(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task, bool isInspectorTask, bool instrumenting)
 {
     Platform::current()->mainThread()->getWebTaskRunner()->postTask(location, threadSafeBind(
         &MainThreadTaskRunner::perform,
         m_weakFactory.createWeakPtr(),
         passed(std::move(task)),
-        isInspectorTask));
+        isInspectorTask,
+        instrumenting));
 }
 
-void MainThreadTaskRunner::postTask(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task)
+void MainThreadTaskRunner::postTask(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task, const String& taskNameForInstrumentation)
 {
-    if (!task->taskNameForInstrumentation().isEmpty())
-        InspectorInstrumentation::asyncTaskScheduled(m_context, task->taskNameForInstrumentation(), task.get());
-    postTaskInternal(location, std::move(task), false);
+    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);
+    postTaskInternal(location, std::move(task), true, false);
 }
 
-void MainThreadTaskRunner::perform(std::unique_ptr<ExecutionContextTask> task, bool isInspectorTask)
+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())) {
-        m_pendingTasks.append(std::move(task));
+        m_pendingTasks.append(make_pair(std::move(task), instrumenting));
         return;
     }
 
     InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(), !isInspectorTask);
     task->performTask(m_context);
 }
 
 void MainThreadTaskRunner::suspend()
 {
     DCHECK(!m_suspended);
@@ skipping 11 matching lines @@
 }
 
 void MainThreadTaskRunner::pendingTasksTimerFired(Timer<MainThreadTaskRunner>*)
 {
     // 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;
 
     while (!m_pendingTasks.isEmpty()) {
-        std::unique_ptr<ExecutionContextTask> task = std::move(m_pendingTasks[0]);
+        std::unique_ptr<ExecutionContextTask> task = std::move(m_pendingTasks[0].first);
+        const bool instrumenting = m_pendingTasks[0].second;
         m_pendingTasks.remove(0);
-        const bool instrumenting = !task->taskNameForInstrumentation().isEmpty();
         InspectorInstrumentation::AsyncTask asyncTask(m_context, task.get(), instrumenting);
         task->performTask(m_context);
     }
 }
 
 } // namespace blink