mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
256c124f94
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
123 lines
4.4 KiB
C++
123 lines
4.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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 nsChromeRegistryChrome_h
|
|
#define nsChromeRegistryChrome_h
|
|
|
|
#include <utility>
|
|
|
|
#include "nsCOMArray.h"
|
|
#include "nsChromeRegistry.h"
|
|
#include "nsClassHashtable.h"
|
|
#include "nsTArray.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
class PContentParent;
|
|
} // namespace dom
|
|
} // namespace mozilla
|
|
|
|
class nsIPrefBranch;
|
|
struct ChromePackage;
|
|
|
|
class nsChromeRegistryChrome : public nsChromeRegistry {
|
|
public:
|
|
nsChromeRegistryChrome();
|
|
~nsChromeRegistryChrome();
|
|
|
|
nsresult Init() override;
|
|
|
|
NS_IMETHOD CheckForNewChrome() override;
|
|
NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
|
|
nsIUTF8StringEnumerator** aResult) override;
|
|
NS_IMETHOD IsLocaleRTL(const nsACString& package, bool* aResult) override;
|
|
NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, bool aAsBCP47,
|
|
nsACString& aLocale) override;
|
|
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
|
|
const char16_t* someData) override;
|
|
|
|
// If aChild is non-null then it is a new child to notify. If aChild is
|
|
// null, then we have installed new chrome and we are resetting all of our
|
|
// children's registered chrome.
|
|
void SendRegisteredChrome(mozilla::dom::PContentParent* aChild);
|
|
|
|
private:
|
|
struct PackageEntry;
|
|
static void ChromePackageFromPackageEntry(const nsACString& aPackageName,
|
|
PackageEntry* aPackage,
|
|
ChromePackage* aChromePackage,
|
|
const nsCString& aSelectedSkin);
|
|
|
|
nsresult OverrideLocalePackage(const nsACString& aPackage,
|
|
nsACString& aOverride);
|
|
nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
|
|
const nsCString& aProvider,
|
|
const nsCString& aPath) override;
|
|
nsresult GetFlagsFromPackage(const nsCString& aPackage,
|
|
uint32_t* aFlags) override;
|
|
|
|
struct ProviderEntry {
|
|
ProviderEntry(const nsACString& aProvider, nsIURI* aBase)
|
|
: provider(aProvider), baseURI(aBase) {}
|
|
|
|
nsCString provider;
|
|
nsCOMPtr<nsIURI> baseURI;
|
|
};
|
|
|
|
class nsProviderArray {
|
|
public:
|
|
nsProviderArray() : mArray(1) {}
|
|
~nsProviderArray() {}
|
|
|
|
// When looking up locales and skins, the "selected" locale is not always
|
|
// available. This enum identifies what kind of match is desired/found.
|
|
enum MatchType {
|
|
EXACT = 0,
|
|
LOCALE = 1, // "en-GB" is selected, we found "en-US"
|
|
ANY = 2
|
|
};
|
|
|
|
nsIURI* GetBase(const nsACString& aPreferred, MatchType aType);
|
|
const nsACString& GetSelected(const nsACString& aPreferred,
|
|
MatchType aType);
|
|
void SetBase(const nsACString& aProvider, nsIURI* base);
|
|
void EnumerateToArray(nsTArray<nsCString>* a);
|
|
|
|
private:
|
|
ProviderEntry* GetProvider(const nsACString& aPreferred, MatchType aType);
|
|
|
|
nsTArray<ProviderEntry> mArray;
|
|
};
|
|
|
|
struct PackageEntry : public PLDHashEntryHdr {
|
|
PackageEntry() : flags(0) {}
|
|
~PackageEntry() {}
|
|
|
|
nsCOMPtr<nsIURI> baseURI;
|
|
uint32_t flags;
|
|
nsProviderArray locales;
|
|
nsProviderArray skins;
|
|
};
|
|
|
|
bool mProfileLoaded;
|
|
bool mDynamicRegistration;
|
|
|
|
// Hash of package names ("global") to PackageEntry objects
|
|
nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
|
|
|
|
virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
|
|
char* const* argv, int flags) override;
|
|
virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
|
|
char* const* argv, int flags) override;
|
|
virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
|
|
char* const* argv, int flags) override;
|
|
virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
|
|
char* const* argv, int flags) override;
|
|
virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
|
|
char* const* argv, int flags) override;
|
|
};
|
|
|
|
#endif // nsChromeRegistryChrome_h
|