Allow closing IndexedDB database before deleting

third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp

 /*
  * Copyright (C) 2010 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
@@ skipping 134 matching lines @@
                                    const String& name,
                                    ExceptionState& exceptionState) {
   IDB_TRACE("IDBFactory::open");
   return openInternal(scriptState, name, IDBDatabaseMetadata::NoVersion,
                       exceptionState);
 }
 
 IDBOpenDBRequest* IDBFactory::deleteDatabase(ScriptState* scriptState,
                                              const String& name,
                                              ExceptionState& exceptionState) {
+  return deleteDatabaseInternal(scriptState, name, exceptionState, false);
+}
+
+IDBOpenDBRequest* IDBFactory::closeConnectionsAndDeleteDatabase(
+    ScriptState* scriptState,
+    const String& name,
+    ExceptionState& exceptionState) {
+  return deleteDatabaseInternal(scriptState, name, exceptionState, true);
+}
+
+IDBOpenDBRequest* IDBFactory::deleteDatabaseInternal(
+    ScriptState* scriptState,
+    const String& name,
+    ExceptionState& exceptionState,
+    bool forceClose) {
   IDB_TRACE("IDBFactory::deleteDatabase");
   IDBDatabase::recordApiCallsHistogram(IDBDeleteDatabaseCall);
   if (!isContextValid(scriptState->getExecutionContext()))
     return nullptr;
   if (!scriptState->getExecutionContext()
            ->getSecurityOrigin()
            ->canAccessDatabase()) {
     exceptionState.throwSecurityError(
         "access to the Indexed Database API is denied in this context.");
     return nullptr;
   }
 
   IDBOpenDBRequest* request = IDBOpenDBRequest::create(
       scriptState, nullptr, 0, IDBDatabaseMetadata::DefaultVersion);
 
   if (!IndexedDBClient::from(scriptState->getExecutionContext())
            ->allowIndexedDB(scriptState->getExecutionContext(), name)) {
     request->onError(
         DOMException::create(UnknownError, permissionDeniedErrorMessage));
     return request;
   }
 
   Platform::current()->idbFactory()->deleteDatabase(
       name, request->createWebCallbacks().release(),
       WebSecurityOrigin(
-          scriptState->getExecutionContext()->getSecurityOrigin()));
+          scriptState->getExecutionContext()->getSecurityOrigin()),
+      forceClose);
   return request;
 }
 
 short IDBFactory::cmp(ScriptState* scriptState,
                       const ScriptValue& firstValue,
                       const ScriptValue& secondValue,
                       ExceptionState& exceptionState) {
   IDBKey* first = ScriptValue::to<IDBKey*>(scriptState->isolate(), firstValue,
                                            exceptionState);
   if (exceptionState.hadException())
@@ skipping 13 matching lines @@
   if (!second->isValid()) {
     exceptionState.throwDOMException(DataError,
                                      IDBDatabase::notValidKeyErrorMessage);
     return 0;
   }
 
   return static_cast<short>(first->compare(second));
 }
 
 }  // namespace blink