diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
| commit | 98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch) | |
| tree | 0e269a27661fea619ab07a533e0c1fa195c3c671 /dom/storage | |
| parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
| parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
| download | uxp-4b8656a4eaa0fe8758cbddf2910089395bdfd1d6.tar.gz | |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/storage')
| -rw-r--r-- | dom/storage/DOMStorageDBUpdater.cpp | 4 | ||||
| -rw-r--r-- | dom/storage/DOMStorageManager.cpp | 1 | ||||
| -rw-r--r-- | dom/storage/moz.build | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/dom/storage/DOMStorageDBUpdater.cpp b/dom/storage/DOMStorageDBUpdater.cpp index 8e3f07d7ce..61d86ca6c7 100644 --- a/dom/storage/DOMStorageDBUpdater.cpp +++ b/dom/storage/DOMStorageDBUpdater.cpp @@ -4,12 +4,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "DOMStorageDBThread.h" #include "DOMStorageManager.h" #include "mozIStorageBindingParamsArray.h" #include "mozIStorageBindingParams.h" #include "mozIStorageValueArray.h" #include "mozIStorageFunction.h" + +#include "mozStorageHelper.h" + #include "mozilla/BasePrincipal.h" #include "nsVariant.h" #include "mozilla/Services.h" diff --git a/dom/storage/DOMStorageManager.cpp b/dom/storage/DOMStorageManager.cpp index 8f50fcfb48..55a360e16d 100644 --- a/dom/storage/DOMStorageManager.cpp +++ b/dom/storage/DOMStorageManager.cpp @@ -14,6 +14,7 @@ #include "nsNetUtil.h" #include "nsNetCID.h" #include "nsIURL.h" +#include "nsPIDOMWindow.h" #include "nsPrintfCString.h" #include "nsXULAppAPI.h" #include "nsThreadUtils.h" diff --git a/dom/storage/moz.build b/dom/storage/moz.build index 47c2fb85f7..7d52d6d7b0 100644 --- a/dom/storage/moz.build +++ b/dom/storage/moz.build @@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [ 'DOMStorageIPC.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DOMStorage.cpp', 'DOMStorageCache.cpp', 'DOMStorageDBThread.cpp', @@ -19,16 +19,13 @@ UNIFIED_SOURCES += [ 'DOMStorageObserver.cpp', ] -IPDL_SOURCES += [ - 'PStorage.ipdl', -] +IPDL_SOURCES += ['PStorage.ipdl'] include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -LOCAL_INCLUDES += [ - '/dom/base', -] + +LOCAL_INCLUDES += ['/dom/base'] if CONFIG['ENABLE_TESTS']: DEFINES['DOM_STORAGE_TESTS'] = True |