From 480d9a30e28a9684aae4d1f6b5200e12f8d6d486 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:18:11 -0400 Subject: Issue #80 - De-unify dom/storage --- dom/storage/DOMStorageDBUpdater.cpp | 4 ++++ dom/storage/DOMStorageManager.cpp | 1 + dom/storage/moz.build | 11 ++++------- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'dom') diff --git a/dom/storage/DOMStorageDBUpdater.cpp b/dom/storage/DOMStorageDBUpdater.cpp index 8e3f07d7c..61d86ca6c 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 8f50fcfb4..55a360e16 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 47c2fb85f..7d52d6d7b 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 -- cgit v1.2.3