2014-05-24 01:32:38 +04:00
|
|
|
/* -*- 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/. */
|
|
|
|
|
|
|
|
/**
|
2017-02-15 08:01:35 +03:00
|
|
|
* Class for representing record arguments. Basically an array under the hood.
|
2014-05-24 01:32:38 +04:00
|
|
|
*/
|
|
|
|
|
2017-02-15 08:01:35 +03:00
|
|
|
#ifndef mozilla_dom_Record_h
|
|
|
|
#define mozilla_dom_Record_h
|
2014-05-24 01:32:38 +04:00
|
|
|
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
#include <utility>
|
|
|
|
|
|
|
|
#include "mozilla/Attributes.h"
|
2014-05-24 01:32:38 +04:00
|
|
|
#include "nsHashKeys.h"
|
2017-12-07 03:52:51 +03:00
|
|
|
#include "nsString.h"
|
2014-05-24 01:32:38 +04:00
|
|
|
#include "nsTArray.h"
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
#include "nsTHashtable.h"
|
2014-05-24 01:32:38 +04:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
namespace dom {
|
|
|
|
|
|
|
|
namespace binding_detail {
|
2017-02-15 08:00:00 +03:00
|
|
|
template <typename KeyType, typename ValueType>
|
2017-02-15 08:01:35 +03:00
|
|
|
class RecordEntry {
|
2014-05-24 01:32:38 +04:00
|
|
|
public:
|
2020-02-20 18:47:53 +03:00
|
|
|
RecordEntry() = default;
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2017-02-15 08:01:35 +03:00
|
|
|
// Move constructor so we can do Records of Records.
|
|
|
|
RecordEntry(RecordEntry<KeyType, ValueType>&& aOther)
|
2018-05-30 22:15:35 +03:00
|
|
|
: mKey(std::move(aOther.mKey)), mValue(std::move(aOther.mValue)) {}
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2017-02-15 08:00:00 +03:00
|
|
|
KeyType mKey;
|
|
|
|
ValueType mValue;
|
2014-05-24 01:32:38 +04:00
|
|
|
};
|
2015-07-13 18:25:42 +03:00
|
|
|
|
2019-04-16 22:18:52 +03:00
|
|
|
// Specialize for a JSObject* ValueType and initialize it on construction, so we
|
|
|
|
// don't need to worry about un-initialized JSObject* floating around.
|
|
|
|
template <typename KeyType>
|
|
|
|
class RecordEntry<KeyType, JSObject*> {
|
|
|
|
public:
|
|
|
|
RecordEntry() : mValue(nullptr) {}
|
|
|
|
|
|
|
|
// Move constructor so we can do Records of Records.
|
|
|
|
RecordEntry(RecordEntry<KeyType, JSObject*>&& aOther)
|
|
|
|
: mKey(std::move(aOther.mKey)), mValue(std::move(aOther.mValue)) {}
|
|
|
|
|
|
|
|
KeyType mKey;
|
|
|
|
JSObject* mValue;
|
|
|
|
};
|
|
|
|
|
2014-05-24 01:32:38 +04:00
|
|
|
} // namespace binding_detail
|
|
|
|
|
2017-02-15 08:01:35 +03:00
|
|
|
template <typename KeyType, typename ValueType>
|
|
|
|
class Record {
|
2014-05-24 01:32:38 +04:00
|
|
|
public:
|
2017-02-15 08:01:39 +03:00
|
|
|
typedef typename binding_detail::RecordEntry<KeyType, ValueType> EntryType;
|
2017-02-15 08:01:35 +03:00
|
|
|
typedef Record<KeyType, ValueType> SelfType;
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2020-02-20 18:47:53 +03:00
|
|
|
Record() = default;
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2017-02-15 08:01:35 +03:00
|
|
|
// Move constructor so we can do Record of Record.
|
2018-05-30 22:15:35 +03:00
|
|
|
Record(SelfType&& aOther) : mEntries(std::move(aOther.mEntries)) {}
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2017-02-15 08:00:00 +03:00
|
|
|
const nsTArray<EntryType>& Entries() const { return mEntries; }
|
2014-05-24 01:32:38 +04:00
|
|
|
|
2017-02-15 08:00:00 +03:00
|
|
|
nsTArray<EntryType>& Entries() { return mEntries; }
|
2014-06-25 21:25:09 +04:00
|
|
|
|
2017-02-15 08:00:00 +03:00
|
|
|
private:
|
|
|
|
nsTArray<EntryType> mEntries;
|
2014-05-24 01:32:38 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace dom
|
|
|
|
} // namespace mozilla
|
|
|
|
|
2017-02-15 08:01:41 +03:00
|
|
|
template <typename K, typename V>
|
|
|
|
class nsDefaultComparator<mozilla::dom::binding_detail::RecordEntry<K, V>, K> {
|
|
|
|
public:
|
|
|
|
bool Equals(const mozilla::dom::binding_detail::RecordEntry<K, V>& aEntry,
|
|
|
|
const K& aKey) const {
|
|
|
|
return aEntry.mKey == aKey;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-02-15 08:01:35 +03:00
|
|
|
#endif // mozilla_dom_Record_h
|