Move InspectorTask handling from MainThreadTaskRunner to Document

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 5691 matching lines @@
 // FIXME(crbug.com/305497): This should be removed after
 // ExecutionContext-LocalDOMWindow migration.
 void Document::postTask(const WebTraceLocation& location,
                         std::unique_ptr<ExecutionContextTask> task,
                         const String& taskNameForInstrumentation) {
   m_taskRunner->postTask(location, std::move(task), taskNameForInstrumentation);
 }
 
 void Document::postInspectorTask(const WebTraceLocation& location,
                                  std::unique_ptr<ExecutionContextTask> task) {
-  m_taskRunner->postInspectorTask(location, std::move(task));
+  TaskRunnerHelper::get(TaskType::Internal, this)
+      ->postTask(location, WTF::bind(&Document::performInspectorTask,
+                                     wrapCrossThreadWeakPersistent(this),

[haraken, 2016/11/28 11:00:43]

Does this need to be cross-thread?

If this really needs to be cross-thread, it means that a non-main thread is
accessing a Document object. Document is a main-thread's thing, so it should be
problematic...

[tzik, 2016/11/29 01:52:38]

Yes, this needs to be cross-thread. In addition, there are only 4 caller of this
function, and all of them are cross-thread.

+                                     WTF::passed(std::move(task))));
 }
 
 void Document::tasksWereSuspended() {
   scriptRunner()->suspend();
 
   if (m_parser)
     m_parser->suspendScheduledTasks();
   if (m_scriptedAnimationController)
     m_scriptedAnimationController->suspend();
 }
@@ skipping 786 matching lines @@
 void Document::maybeRecordLoadReason(WouldLoadReason reason) {
   DCHECK(m_wouldLoadReason == Created || reason != Created);
   DCHECK(frame());
   if (m_wouldLoadReason == Created && frame()->isCrossOriginSubframe() &&
       frame()->loader().stateMachine()->committedFirstRealDocumentLoad()) {
     recordLoadReasonToHistogram(reason);
   }
   m_wouldLoadReason = reason;
 }
 
+void Document::performInspectorTask(
+    std::unique_ptr<ExecutionContextTask> task) {
+  task->performTask(this);
+}
+
 DEFINE_TRACE_WRAPPERS(Document) {
   visitor->traceWrappers(m_importsController);
   visitor->traceWrappers(m_implementation);
   visitor->traceWrappers(m_styleSheetList);
   visitor->traceWrappers(m_styleEngine);
   for (int i = 0; i < numNodeListInvalidationTypes; ++i) {
     for (auto list : m_nodeLists[i]) {
       visitor->traceWrappersWithManualWriteBarrier(list);
     }
   }
@@ skipping 17 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif