Merge 190021 "Web SQL: Termiante database thread before finalizi..."

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 26 matching lines @@
 #include "modules/webdatabase/DatabaseClient.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/DatabaseTask.h"
 #include "modules/webdatabase/DatabaseTracker.h"
 #include "platform/Logging.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/MainThread.h"
 
 namespace blink {
 
+static DatabaseManager* s_databaseManager;
+
 DatabaseManager& DatabaseManager::manager()
 {
     ASSERT(isMainThread());
-    DEFINE_STATIC_LOCAL(DatabaseManager, dbManager, ());
-    return dbManager;
+    if (!s_databaseManager)
+        s_databaseManager = new DatabaseManager();
+    return *s_databaseManager;
+}
+
+void DatabaseManager::terminateDatabaseThread()
+{
+    ASSERT(isMainThread());
+    if (!s_databaseManager || s_databaseManager->m_contextMap.isEmpty())
+        return;
+    // We have at most one DatabaseContext, which is for the main thread.
+    ASSERT(s_databaseManager->m_contextMap.size() == 1);
+    (*s_databaseManager->m_contextMap.values().begin())->stopDatabases();
 }
 
 DatabaseManager::DatabaseManager()
 #if ENABLE(ASSERT)
     : m_databaseContextRegisteredCount(0)
     , m_databaseContextInstanceCount(0)
 #endif
 {
 }
 
@@ skipping 156 matching lines @@
 {
     return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIfDoesNotExist);
 }
 
 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& message)
 {
     context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
 }
 
 } // namespace blink