From c65d9036d08bb8e1323b16f96a9bd20797186960 Mon Sep 17 00:00:00 2001 From: Arthur Edelstein Date: Mon, 6 Feb 2017 00:43:26 -0800 Subject: [PATCH] Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false Replaces old patch for Bug 16528. --- dom/indexedDB/IDBFactory.cpp | 4 +-- dom/indexedDB/test/mochitest.ini | 1 + .../test/test_disable_indexeddb.html | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 dom/indexedDB/test/test_disable_indexeddb.html diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 6638289786efa..e937811e903f9 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; + return NS_OK; } if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { @@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; + return NS_OK; } IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index 4ab55a9dc2b3f..a4473b26839ca 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -159,6 +159,7 @@ skip-if = e10s [test_deleteDatabase_interactions.html] [test_deleteDatabase_onblocked.html] [test_deleteDatabase_onblocked_duringVersionChange.html] +[test_disable_indexeddb.html] [test_error_events_abort_transactions.html] [test_event_propagation.html] [test_event_source.html] diff --git a/dom/indexedDB/test/test_disable_indexeddb.html b/dom/indexedDB/test/test_disable_indexeddb.html new file mode 100644 index 0000000000000..d8a691f9be184 --- /dev/null +++ b/dom/indexedDB/test/test_disable_indexeddb.html @@ -0,0 +1,28 @@ + + + + Indexed Database Disable Pref test + + + + + + + + + + + + -- GitLab