Bug 1711663 - Clean up includes related to FileInfo/FileInfoManager/DatabaseFileInfo/DatabaseFileManager; r=dom-storage-reviewers,jstutte
authorJan Varga <jvarga@mozilla.com>
Tue, 01 Jun 2021 08:50:32 +0000
changeset 654054 42aca39d8ed6d69c588664c3838915e4d3382202
parent 654053 030c75a42520e7033a67a7d257c2074b48556a69
child 654055 ab53d4ba1edf14fec2892a90413768e1d025424a
push id2623
push userffxbld-merge
push dateMon, 02 Aug 2021 14:47:51 +0000
treeherdermozilla-release@8500ce65f7c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdom-storage-reviewers, jstutte
bugs1711663
milestone91.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1711663 - Clean up includes related to FileInfo/FileInfoManager/DatabaseFileInfo/DatabaseFileManager; r=dom-storage-reviewers,jstutte Differential Revision: https://phabricator.services.mozilla.com/D115360
dom/indexedDB/ActorsParent.cpp
dom/indexedDB/ActorsParent.h
dom/indexedDB/ActorsParentCommon.cpp
dom/indexedDB/DatabaseFileInfo.cpp
dom/indexedDB/DatabaseFileInfo.h
dom/indexedDB/DatabaseFileInfoFwd.h
dom/indexedDB/IndexedDatabaseInlines.h
dom/indexedDB/SchemaUpgrades.cpp
dom/indexedDB/test/gtest/TestSimpleFileInfo.cpp
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -16,22 +16,20 @@
 #include <iterator>
 #include <new>
 #include <numeric>
 #include <tuple>
 #include <type_traits>
 #include <utility>
 #include "ActorsParentCommon.h"
 #include "CrashAnnotations.h"
-#include "DatabaseFileInfoFwd.h"
+#include "DatabaseFileInfo.h"
 #include "DatabaseFileManager.h"
 #include "DBSchema.h"
 #include "ErrorList.h"
-#include "FileInfo.h"
-#include "FileInfoManager.h"
 #include "IDBCursorType.h"
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "IndexedDBCommon.h"
 #include "IndexedDatabaseInlines.h"
 #include "IndexedDatabaseManager.h"
 #include "KeyPath.h"
 #include "MainThreadUtils.h"
--- a/dom/indexedDB/ActorsParent.h
+++ b/dom/indexedDB/ActorsParent.h
@@ -23,17 +23,16 @@ class FileHandleThreadPool;
 namespace quota {
 
 class Client;
 
 }  // namespace quota
 
 namespace indexedDB {
 
-class DatabaseFileManager;
 class LoggingInfo;
 class PBackgroundIDBFactoryParent;
 class PBackgroundIndexedDBUtilsParent;
 
 already_AddRefed<PBackgroundIDBFactoryParent> AllocPBackgroundIDBFactoryParent(
     const LoggingInfo& aLoggingInfo);
 
 bool RecvPBackgroundIDBFactoryConstructor(PBackgroundIDBFactoryParent* aActor,
--- a/dom/indexedDB/ActorsParentCommon.cpp
+++ b/dom/indexedDB/ActorsParentCommon.cpp
@@ -2,17 +2,17 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "ActorsParentCommon.h"
 
 // local includes
-#include "DatabaseFileInfoFwd.h"  // for DatabaseFileInfo
+#include "DatabaseFileInfo.h"
 #include "DatabaseFileManager.h"
 #include "IndexedDatabase.h"  // for StructuredCloneFile...
 #include "IndexedDatabaseManager.h"
 #include "IndexedDBCommon.h"
 #include "ReportInternalError.h"
 
 // global includes
 #include <stdlib.h>
--- a/dom/indexedDB/DatabaseFileInfo.cpp
+++ b/dom/indexedDB/DatabaseFileInfo.cpp
@@ -1,14 +1,15 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "DatabaseFileManager.h"
+#include "DatabaseFileInfo.h"
+
 #include "FileInfoImpl.h"
 
 namespace mozilla::dom::indexedDB {
 
 template class FileInfo<DatabaseFileManager>;
 
 }  // namespace mozilla::dom::indexedDB
new file mode 100644
--- /dev/null
+++ b/dom/indexedDB/DatabaseFileInfo.h
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+#ifndef DOM_INDEXEDDB_DATABASEFILEINFO_H_
+#define DOM_INDEXEDDB_DATABASEFILEINFO_H_
+
+#include "DatabaseFileInfoFwd.h"
+
+#include "DatabaseFileManager.h"
+#include "FileInfo.h"
+
+#endif  // DOM_INDEXEDDB_DATABASEFILEINFO_H_
--- a/dom/indexedDB/DatabaseFileInfoFwd.h
+++ b/dom/indexedDB/DatabaseFileInfoFwd.h
@@ -9,13 +9,13 @@
 
 namespace mozilla::dom::indexedDB {
 
 class DatabaseFileManager;
 
 template <typename FileManager>
 class FileInfo;
 
-using DatabaseFileInfo = FileInfo<indexedDB::DatabaseFileManager>;
+using DatabaseFileInfo = FileInfo<DatabaseFileManager>;
 
 }  // namespace mozilla::dom::indexedDB
 
 #endif  // DOM_INDEXEDDB_DATABASEFILEINFOFWD_H_
--- a/dom/indexedDB/IndexedDatabaseInlines.h
+++ b/dom/indexedDB/IndexedDatabaseInlines.h
@@ -6,17 +6,17 @@
 
 #ifndef IndexedDatabaseInlines_h
 #define IndexedDatabaseInlines_h
 
 #ifndef mozilla_dom_indexeddatabase_h__
 #  error Must include IndexedDatabase.h first
 #endif
 
-#include "DatabaseFileManager.h"
+#include "DatabaseFileInfo.h"
 #include "IDBMutableFile.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBSharedTypes.h"
 #include "mozilla/dom/DOMStringList.h"
 #include "mozilla/dom/File.h"
 
 namespace mozilla {
 namespace dom {
 namespace indexedDB {
--- a/dom/indexedDB/SchemaUpgrades.cpp
+++ b/dom/indexedDB/SchemaUpgrades.cpp
@@ -3,17 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "SchemaUpgrades.h"
 
 // local includes
 #include "ActorsParentCommon.h"
-#include "DatabaseFileInfoFwd.h"
+#include "DatabaseFileInfo.h"
 #include "DatabaseFileManager.h"
 #include "DBSchema.h"
 #include "IndexedDatabase.h"
 #include "IndexedDBCommon.h"
 #include "ReportInternalError.h"
 
 // global includes
 #include <stdlib.h>
--- a/dom/indexedDB/test/gtest/TestSimpleFileInfo.cpp
+++ b/dom/indexedDB/test/gtest/TestSimpleFileInfo.cpp
@@ -1,12 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "FileInfo.h"
 #include "FileInfoImpl.h"
 #include "FileInfoManager.h"
 
 #include "gtest/gtest.h"
 
 #include "mozilla/ArrayAlgorithm.h"
 #include "mozilla/StaticMutex.h"
 #include "nsTArray.h"