Skip to content

Commit a1f2f73

Browse files
abpostelnicuabpostelnicu
committed
Bug 1519636 - Reformat recent changes to the Google coding style. r=necko-reviewers,valentin,sylvestre
Updated with clang-format version 11.0.1 (taskcluster-GI8pmG3eQ_OSXfjFfr2yFw) Differential Revision: https://phabricator.services.mozilla.com/D114618
1 parent 40cf9ec commit a1f2f73

File tree

12 files changed

+35
-40
lines changed

12 files changed

+35
-40
lines changed

‎dom/indexedDB/ActorsParent.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -450,16 +450,15 @@ struct FullObjectStoreMetadata {
450450
typedef nsTHashMap<nsUint64HashKey, SafeRefPtr<FullObjectStoreMetadata>>
451451
ObjectStoreTable;
452452

453-
static_assert(
454-
std::is_same_v<IndexOrObjectStoreId,
455-
std::remove_cv_t<std::remove_reference_t<
456-
decltype(std::declval<const ObjectStoreGetParams&>()
457-
.objectStoreId())>>>);
458453
static_assert(
459454
std::is_same_v<
460455
IndexOrObjectStoreId,
461-
std::remove_cv_t<std::remove_reference_t<
462-
decltype(std::declval<const IndexGetParams&>().objectStoreId())>>>);
456+
std::remove_cv_t<std::remove_reference_t<decltype(
457+
std::declval<const ObjectStoreGetParams&>().objectStoreId())>>>);
458+
static_assert(std::is_same_v<
459+
IndexOrObjectStoreId,
460+
std::remove_cv_t<std::remove_reference_t<decltype(
461+
std::declval<const IndexGetParams&>().objectStoreId())>>>);
463462

464463
struct FullDatabaseMetadata final : AtomicSafeRefCounted<FullDatabaseMetadata> {
465464
DatabaseMetadata mCommonMetadata;
@@ -20692,8 +20691,8 @@ CursorOpBaseHelperBase<CursorType>::PopulateResponseFromStatement(
2069220691
// inconsistent state.
2069320692

2069420693
if (aInitializeResponse) {
20695-
mOp.mResponse = std::remove_reference_t<
20696-
decltype(populateResponseHelper.GetTypedResponse(&mOp.mResponse))>();
20694+
mOp.mResponse = std::remove_reference_t<decltype(
20695+
populateResponseHelper.GetTypedResponse(&mOp.mResponse))>();
2069720696
}
2069820697

2069920698
auto& responses = populateResponseHelper.GetTypedResponse(&mOp.mResponse);

‎dom/quota/CheckedUnsafePtr.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ template <typename T, CheckingSupport = T::SupportsChecking::value>
8585
class CheckedUnsafePtrBase;
8686

8787
template <typename T, typename U, typename S = std::nullptr_t>
88-
using EnableIfCompatible = std::enable_if_t<
89-
std::is_base_of<
90-
T, std::remove_reference_t<decltype(*std::declval<U>())>>::value,
91-
S>;
88+
using EnableIfCompatible =
89+
std::enable_if_t<std::is_base_of<T, std::remove_reference_t<decltype(
90+
*std::declval<U>())>>::value,
91+
S>;
9292

9393
template <typename T>
9494
class CheckedUnsafePtrBase<T, CheckingSupport::Enabled>

‎gfx/thebes/gfxFcPlatformFontList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace dom {
3030
class SystemFontListEntry;
3131
class SystemFontList;
3232
class SystemFontOptions;
33-
};
33+
}; // namespace dom
3434

3535
template <>
3636
class RefPtrTraits<FcPattern> {

‎gfx/thebes/gfxPlatform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ inline uint32_t BackendTypeBit(BackendType b) { return 1 << uint8_t(b); }
6565
namespace dom {
6666
class SystemFontListEntry;
6767
class SystemFontList;
68-
}
68+
} // namespace dom
6969
} // namespace mozilla
7070

7171
#define MOZ_PERFORMANCE_WARNING(module, ...) \

‎gfx/webrender_bindings/WebRenderAPI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ class NewRenderer : public RendererEvent {
156156
aWindowId, mSize.width, mSize.height,
157157
mWindowKind == WindowKind::MAIN, supportLowPriorityTransactions,
158158
supportLowPriorityThreadpool, gfx::gfxVars::UseGLSwizzle(),
159-
gfx::gfxVars::UseWebRenderScissoredCacheClears(),
160-
swgl, gl, compositor->SurfaceOriginIsTopLeft(), progCache, shaders,
159+
gfx::gfxVars::UseWebRenderScissoredCacheClears(), swgl, gl,
160+
compositor->SurfaceOriginIsTopLeft(), progCache, shaders,
161161
aRenderThread.ThreadPool().Raw(),
162162
aRenderThread.ThreadPoolLP().Raw(), &WebRenderMallocSizeOf,
163163
&WebRenderMallocEnclosingSizeOf, 0, compositor.get(),

‎image/imgLoader.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,8 +2211,8 @@ nsresult imgLoader::LoadImage(
22112211

22122212
// Look in the preloaded images of loading document first.
22132213
if (StaticPrefs::network_preload() && !aLinkPreload && aLoadingDocument) {
2214-
auto key = PreloadHashKey::CreateAsImage(aURI, aTriggeringPrincipal,
2215-
corsmode);
2214+
auto key =
2215+
PreloadHashKey::CreateAsImage(aURI, aTriggeringPrincipal, corsmode);
22162216
if (RefPtr<PreloaderBase> preload =
22172217
aLoadingDocument->Preloads().LookupPreload(key)) {
22182218
RefPtr<imgRequestProxy> proxy = do_QueryObject(preload);
@@ -2441,8 +2441,8 @@ nsresult imgLoader::LoadImage(
24412441
if (aLinkPreload) {
24422442
MOZ_ASSERT(aLoadingDocument);
24432443
proxy->PrioritizeAsPreload();
2444-
auto preloadKey = PreloadHashKey::CreateAsImage(
2445-
aURI, aTriggeringPrincipal, corsmode);
2444+
auto preloadKey =
2445+
PreloadHashKey::CreateAsImage(aURI, aTriggeringPrincipal, corsmode);
24462446
proxy->NotifyOpen(preloadKey, aLoadingDocument, true);
24472447
}
24482448

@@ -2544,8 +2544,7 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel* channel,
25442544

25452545
if (ValidateEntry(entry, uri, nullptr, nullptr, nullptr, aObserver,
25462546
aLoadingDocument, requestFlags, policyType, false,
2547-
nullptr, nullptr, nullptr, CORS_NONE,
2548-
false)) {
2547+
nullptr, nullptr, nullptr, CORS_NONE, false)) {
25492548
request = entry->GetRequest();
25502549
} else {
25512550
nsCOMPtr<nsICacheInfoChannel> cacheChan(do_QueryInterface(channel));

‎js/src/jsapi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,6 @@ JS_PUBLIC_API bool PropertySpecNameToPermanentId(JSContext* cx,
17041704
JSPropertySpec::Name name,
17051705
jsid* idp);
17061706

1707-
17081707
} /* namespace JS */
17091708

17101709
/************************************************************************/

‎js/src/wasm/WasmGC.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,5 @@ bool IsValidStackMapKey(bool debugEnabled, const uint8_t* nextPC) {
295295
}
296296
#endif
297297

298-
299298
} // namespace wasm
300299
} // namespace js

‎layout/painting/nsDisplayList.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7340,10 +7340,10 @@ nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder,
73407340
Init(aBuilder, aList);
73417341
}
73427342

7343-
nsDisplayTransform::nsDisplayTransform(
7344-
nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayList* aList,
7345-
const nsRect& aChildrenBuildingRect,
7346-
decltype(WithTransformGetter))
7343+
nsDisplayTransform::nsDisplayTransform(nsDisplayListBuilder* aBuilder,
7344+
nsIFrame* aFrame, nsDisplayList* aList,
7345+
const nsRect& aChildrenBuildingRect,
7346+
decltype(WithTransformGetter))
73477347
: nsPaintedDisplayItem(aBuilder, aFrame),
73487348
mAnimatedGeometryRootForChildren(mAnimatedGeometryRoot),
73497349
mAnimatedGeometryRootForScrollMetadata(mAnimatedGeometryRoot),
@@ -7917,7 +7917,8 @@ const Matrix4x4Flagged& nsDisplayTransform::GetInverseTransform() const {
79177917

79187918
Matrix4x4 nsDisplayTransform::GetTransformForRendering(
79197919
LayoutDevicePoint* aOutOrigin) const {
7920-
if (!mFrame->HasPerspective() || mHasTransformGetter || mIsTransformSeparator) {
7920+
if (!mFrame->HasPerspective() || mHasTransformGetter ||
7921+
mIsTransformSeparator) {
79217922
if (!mHasTransformGetter && !mIsTransformSeparator && aOutOrigin) {
79227923
// If aOutOrigin is provided, put the offset to origin into it, because
79237924
// we need to keep it separate for webrender. The combination of

‎netwerk/protocol/http/Http2Session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4362,7 +4362,7 @@ nsHttpRequestHead* Http2Session::RequestHead() {
43624362
uint32_t Http2Session::Http1xTransactionCount() { return 0; }
43634363

43644364
nsresult Http2Session::TakeSubTransactions(
4365-
nsTArray<RefPtr<nsAHttpTransaction> >& outTransactions) {
4365+
nsTArray<RefPtr<nsAHttpTransaction>>& outTransactions) {
43664366
MOZ_ASSERT(OnSocketThread(), "not on socket thread");
43674367
// Generally this cannot be done with http/2 as transactions are
43684368
// started right away.

‎netwerk/protocol/http/nsHttpHandler.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,9 @@ void nsHttpHandler::PrefsChanged(const char* pref) {
18341834
}
18351835
}
18361836

1837-
const bool imageAcceptPrefChanged = PREF_CHANGED("image.http.accept") ||
1838-
PREF_CHANGED("image.avif.enabled") ||
1839-
PREF_CHANGED("image.jxl.enabled") ||
1840-
PREF_CHANGED("image.webp.enabled");
1837+
const bool imageAcceptPrefChanged =
1838+
PREF_CHANGED("image.http.accept") || PREF_CHANGED("image.avif.enabled") ||
1839+
PREF_CHANGED("image.jxl.enabled") || PREF_CHANGED("image.webp.enabled");
18411840

18421841
if (imageAcceptPrefChanged) {
18431842
nsAutoCString userSetImageAcceptHeader;

‎widget/PuppetWidget.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,7 @@ void PuppetWidget::SetCursor(const Cursor& aCursor) {
939939
resolution.ScaleBy(GetDefaultScale().scale);
940940
resolution.ApplyInverseTo(width, height);
941941
surface = aCursor.mContainer->GetFrameAtSize(
942-
{width, height},
943-
imgIContainer::FRAME_CURRENT, flags);
942+
{width, height}, imgIContainer::FRAME_CURRENT, flags);
944943
} else {
945944
// NOTE(emilio): We get the frame at the full size, ignoring resolution,
946945
// because we're going to rasterize it, and we'd effectively lose the
@@ -963,9 +962,9 @@ void PuppetWidget::SetCursor(const Cursor& aCursor) {
963962
length);
964963
if (!mBrowserChild->SendSetCursor(
965964
aCursor.mDefaultCursor, hasCustomCursor, cursorData,
966-
customCursorSize.width, customCursorSize.height,
967-
resolution.mX, resolution.mY, stride, format,
968-
aCursor.mHotspotX, aCursor.mHotspotY, force)) {
965+
customCursorSize.width, customCursorSize.height, resolution.mX,
966+
resolution.mY, stride, format, aCursor.mHotspotX, aCursor.mHotspotY,
967+
force)) {
969968
return;
970969
}
971970
mCursor = aCursor;

0 commit comments

Comments
 (0)