Reduce createSameThreadTask usage in modules/

third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

 /*
  * Copyright (C) 2012 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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webdatabase/DatabaseManager.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/dom/ExecutionContextTask.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/inspector/InspectorInstrumentation.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseCallback.h"
 #include "modules/webdatabase/DatabaseClient.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/DatabaseTask.h"
 #include "modules/webdatabase/DatabaseTracker.h"
 #include "modules/webdatabase/StorageLog.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/PtrUtil.h"
@@ skipping 11 matching lines @@
 
 DatabaseManager::DatabaseManager()
 {
 }
 
 DatabaseManager::~DatabaseManager() {}
 
 // This is just for ignoring DatabaseCallback::handleEvent()'s return value.
 static void databaseCallbackHandleEvent(DatabaseCallback* callback,
                                         Database* database) {
+  InspectorInstrumentation::AsyncTask asyncTask(database->getExecutionContext(),
+                                                callback);
   callback->handleEvent(database);
 }
 
 DatabaseContext* DatabaseManager::existingDatabaseContextFor(
     ExecutionContext* context) {
   ASSERT(m_databaseContextRegisteredCount >= 0);
   ASSERT(m_databaseContextInstanceCount >= 0);
   ASSERT(m_databaseContextRegisteredCount <= m_databaseContextInstanceCount);
   return m_contextMap.get(context);
 }
@@ skipping 113 matching lines @@
   if (!database)
     return nullptr;
 
   databaseContextFor(context)->setHasOpenDatabases();
   DatabaseClient::from(context)->didOpenDatabase(
       database, context->getSecurityOrigin()->host(), name, expectedVersion);
 
   if (database->isNew() && creationCallback) {
     STORAGE_DVLOG(1) << "Scheduling DatabaseCreationCallbackTask for database "
                      << database;
-    database->getExecutionContext()->postTask(
-        TaskType::DatabaseAccess, BLINK_FROM_HERE,
-        createSameThreadTask(&databaseCallbackHandleEvent,
-                             wrapPersistent(creationCallback),
-                             wrapPersistent(database)),
-        "openDatabase");
+    InspectorInstrumentation::asyncTaskScheduled(
+        database->getExecutionContext(), "openDatabase", creationCallback);
+    TaskRunnerHelper::get(TaskType::DatabaseAccess,
+                          database->getExecutionContext())
+        ->postTask(BLINK_FROM_HERE, WTF::bind(&databaseCallbackHandleEvent,
+                                              wrapPersistent(creationCallback),
+                                              wrapPersistent(database)));
   }
 
   ASSERT(database);
   return database;
 }
 
 String DatabaseManager::fullPathForDatabase(SecurityOrigin* origin,
                                             const String& name,
                                             bool createIfDoesNotExist) {
   return DatabaseTracker::tracker().fullPathForDatabase(origin, name,
                                                         createIfDoesNotExist);
 }
 
 void DatabaseManager::logErrorMessage(ExecutionContext* context,
                                       const String& message) {
   context->addConsoleMessage(
       ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
 }
 
 }  // namespace blink