diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-21 15:28:03 +0000 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-24 10:37:19 +0200 |
commit | 0a33733505b3f3e098769f856adbcee597893518 (patch) | |
tree | 03fb8872eb8784430883896e885513e6e1ea4cd0 | |
parent | 691878e20f7080340642784e3009a52e71f003bc (diff) | |
download | UXP-0a33733505b3f3e098769f856adbcee597893518.tar UXP-0a33733505b3f3e098769f856adbcee597893518.tar.gz UXP-0a33733505b3f3e098769f856adbcee597893518.tar.lz UXP-0a33733505b3f3e098769f856adbcee597893518.tar.xz UXP-0a33733505b3f3e098769f856adbcee597893518.zip |
Issue #80 - De-unify dom/indexedDB
-rw-r--r-- | dom/indexedDB/IDBDatabase.cpp | 7 | ||||
-rw-r--r-- | dom/indexedDB/IDBFactory.cpp | 2 | ||||
-rw-r--r-- | dom/indexedDB/IDBFileHandle.cpp | 2 | ||||
-rw-r--r-- | dom/indexedDB/IDBIndex.cpp | 3 | ||||
-rw-r--r-- | dom/indexedDB/IDBObjectStore.cpp | 2 | ||||
-rw-r--r-- | dom/indexedDB/IDBTransaction.cpp | 1 | ||||
-rw-r--r-- | dom/indexedDB/KeyPath.cpp | 2 | ||||
-rw-r--r-- | dom/indexedDB/ScriptErrorHelper.h | 2 | ||||
-rw-r--r-- | dom/indexedDB/moz.build | 2 |
9 files changed, 20 insertions, 3 deletions
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp index 6ef352801..8a1fa4b21 100644 --- a/dom/indexedDB/IDBDatabase.cpp +++ b/dom/indexedDB/IDBDatabase.cpp @@ -16,6 +16,7 @@ #include "IDBTransaction.h" #include "IDBFactory.h" #include "IndexedDatabaseManager.h" +#include "KeyPath.h" #include "mozilla/ErrorResult.h" #include "mozilla/EventDispatcher.h" #include "MainThreadUtils.h" @@ -54,13 +55,15 @@ // Include this last to avoid path problems on Windows. #include "ActorsChild.h" -namespace mozilla { -namespace dom { +using namespace mozilla::dom::indexedDB; using namespace mozilla::dom::quota; using namespace mozilla::ipc; using namespace mozilla::services; +namespace mozilla { +namespace dom { + namespace { const char kCycleCollectionObserverTopic[] = "cycle-collector-end"; diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 66471fe24..1fae686b4 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -41,6 +41,8 @@ #include "nsContentUtils.h" // For assertions. #endif +using namespace mozilla::dom::indexedDB; + namespace mozilla { namespace dom { diff --git a/dom/indexedDB/IDBFileHandle.cpp b/dom/indexedDB/IDBFileHandle.cpp index 8b88e1722..3287cf404 100644 --- a/dom/indexedDB/IDBFileHandle.cpp +++ b/dom/indexedDB/IDBFileHandle.cpp @@ -12,6 +12,8 @@ #include "mozilla/dom/IDBFileHandleBinding.h" #include "mozilla/dom/filehandle/ActorsChild.h" #include "mozilla/EventDispatcher.h" +#include "nsContentUtils.h" +#include "nsQueryObject.h" #include "nsServiceManagerUtils.h" #include "nsWidgetsCID.h" diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp index af50926e6..f47098fce 100644 --- a/dom/indexedDB/IDBIndex.cpp +++ b/dom/indexedDB/IDBIndex.cpp @@ -23,6 +23,9 @@ // Include this last to avoid path problems on Windows. #include "ActorsChild.h" +using namespace mozilla::dom; +using namespace mozilla::dom::indexedDB; + namespace mozilla { namespace dom { diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp index cbac30894..1216c8f84 100644 --- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -52,6 +52,8 @@ // Include this last to avoid path problems on Windows. #include "ActorsChild.h" +using namespace mozilla::dom::indexedDB; + namespace mozilla { namespace dom { diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp index a50489898..61b49b137 100644 --- a/dom/indexedDB/IDBTransaction.cpp +++ b/dom/indexedDB/IDBTransaction.cpp @@ -18,6 +18,7 @@ #include "mozilla/ipc/BackgroundChild.h" #include "nsAutoPtr.h" #include "nsPIDOMWindow.h" +#include "nsQueryObject.h" #include "nsServiceManagerUtils.h" #include "nsTHashtable.h" #include "ProfilerHelpers.h" diff --git a/dom/indexedDB/KeyPath.cpp b/dom/indexedDB/KeyPath.cpp index 0221c9450..74316f465 100644 --- a/dom/indexedDB/KeyPath.cpp +++ b/dom/indexedDB/KeyPath.cpp @@ -11,10 +11,12 @@ #include "nsCharSeparatedTokenizer.h" #include "nsJSUtils.h" +#include "nsPrintfCString.h" #include "xpcpublic.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/BlobBinding.h" +#include "mozilla/dom/File.h" // for Blob #include "mozilla/dom/IDBObjectStoreBinding.h" namespace mozilla { diff --git a/dom/indexedDB/ScriptErrorHelper.h b/dom/indexedDB/ScriptErrorHelper.h index d1cd8c749..1716af87f 100644 --- a/dom/indexedDB/ScriptErrorHelper.h +++ b/dom/indexedDB/ScriptErrorHelper.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_indexeddb_scripterrorhelper_h__ #define mozilla_dom_indexeddb_scripterrorhelper_h__ +#include "nsString.h" + class nsAString; namespace mozilla { diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index d8c217f38..050599393 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -45,7 +45,7 @@ EXPORTS.mozilla.dom.indexedDB += [ 'SerializationHelpers.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ActorsChild.cpp', 'FileInfo.cpp', 'FileSnapshot.cpp', |