mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +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
80 lines
2.4 KiB
C++
80 lines
2.4 KiB
C++
/* -*- 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/. */
|
|
|
|
/* thread-safe container of information for resolving url values */
|
|
|
|
#ifndef mozilla_URLExtraData_h
|
|
#define mozilla_URLExtraData_h
|
|
|
|
#include <utility>
|
|
|
|
#include "ReferrerInfo.h"
|
|
#include "mozilla/StaticPtr.h"
|
|
#include "mozilla/UserAgentStyleSheetID.h"
|
|
#include "mozilla/dom/URL.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIPrincipal.h"
|
|
#include "nsIReferrerInfo.h"
|
|
#include "nsIURI.h"
|
|
|
|
namespace mozilla {
|
|
|
|
struct URLExtraData {
|
|
URLExtraData(already_AddRefed<nsIURI> aBaseURI,
|
|
already_AddRefed<nsIReferrerInfo> aReferrerInfo,
|
|
already_AddRefed<nsIPrincipal> aPrincipal)
|
|
: mBaseURI(std::move(aBaseURI)),
|
|
mReferrerInfo(std::move(aReferrerInfo)),
|
|
mPrincipal(std::move(aPrincipal)) {
|
|
MOZ_ASSERT(mBaseURI);
|
|
MOZ_ASSERT(mPrincipal);
|
|
MOZ_ASSERT(mReferrerInfo);
|
|
// When we hold the URI data of a style sheet, referrer is always
|
|
// equal to the sheet URI.
|
|
nsCOMPtr<nsIURI> referrer = mReferrerInfo->GetOriginalReferrer();
|
|
mIsChrome = referrer ? dom::IsChromeURI(referrer) : false;
|
|
}
|
|
|
|
URLExtraData(nsIURI* aBaseURI, nsIReferrerInfo* aReferrerInfo,
|
|
nsIPrincipal* aPrincipal)
|
|
: URLExtraData(do_AddRef(aBaseURI), do_AddRef(aReferrerInfo),
|
|
do_AddRef(aPrincipal)) {}
|
|
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(URLExtraData)
|
|
|
|
nsIURI* BaseURI() const { return mBaseURI; }
|
|
nsIReferrerInfo* ReferrerInfo() const { return mReferrerInfo; }
|
|
nsIPrincipal* Principal() const { return mPrincipal; }
|
|
|
|
static URLExtraData* Dummy() {
|
|
MOZ_ASSERT(sDummy);
|
|
return sDummy;
|
|
}
|
|
static void InitDummy();
|
|
static void ReleaseDummy();
|
|
|
|
// URLExtraData objects that shared style sheets use a sheet ID index to
|
|
// refer to.
|
|
static StaticRefPtr<URLExtraData>
|
|
sShared[size_t(UserAgentStyleSheetID::Count)];
|
|
|
|
private:
|
|
~URLExtraData();
|
|
|
|
nsCOMPtr<nsIURI> mBaseURI;
|
|
nsCOMPtr<nsIReferrerInfo> mReferrerInfo;
|
|
nsCOMPtr<nsIPrincipal> mPrincipal;
|
|
|
|
// True if referrer is a chrome:// URI.
|
|
bool mIsChrome;
|
|
|
|
static StaticRefPtr<URLExtraData> sDummy;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_URLExtraData_h
|