Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)

New snapshot including various build fixes for newer Qt 5

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
index bc6d09fa1..9343281cf 100644
--- a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
+++ b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
@@ -47,6 +47,7 @@ namespace WebKit {
 
 WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend)
     : m_databaseBackend(databaseBackend)
+    , m_closePending(false)
 {
 }
 
@@ -94,8 +95,10 @@ void WebIDBDatabaseImpl::close()
 {
     // Use the callbacks that ::open gave us so that the backend in
     // multi-process chromium knows which database connection is closing.
-    if (!m_databaseCallbacks)
+    if (!m_databaseCallbacks) {
+        m_closePending = true;
         return;
+    }
     m_databaseBackend->close(m_databaseCallbacks);
     m_databaseCallbacks = 0;
 }
@@ -105,6 +108,8 @@ void WebIDBDatabaseImpl::open(WebIDBDatabaseCallbacks* callbacks)
     ASSERT(!m_databaseCallbacks);
     m_databaseCallbacks = IDBDatabaseCallbacksProxy::create(adoptPtr(callbacks));
     m_databaseBackend->registerFrontendCallbacks(m_databaseCallbacks);
+    if (m_closePending)
+        close();
 }
 
 } // namespace WebKit