Skip to content

Commit 03c8e8c

Browse files
sylvestresylvestre
committed
Bug 1519636 - clang-format-8: Reformat recent changes to the Google coding style r=Ehsan
clang-format-8 upstream had some improvements wrt macros See: https://reviews.llvm.org/D33440 This is why the diff is bigger than usual # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D26098 --HG-- extra : moz-landing-system : lando
1 parent 45ec611 commit 03c8e8c

File tree

188 files changed

+3153
-2745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+3153
-2745
lines changed

‎accessible/base/MarkupMap.h

Lines changed: 346 additions & 323 deletions
Large diffs are not rendered by default.

‎dom/base/AnonymousContent.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ void AnonymousContent::GetComputedStylePropertyValue(
197197
aRv = cs->GetPropertyValue(aPropertyName, aResult);
198198
}
199199

200-
void AnonymousContent::GetTargetIdForEvent(Event& aEvent, DOMString& aResult)
201-
{
200+
void AnonymousContent::GetTargetIdForEvent(Event& aEvent, DOMString& aResult) {
202201
nsCOMPtr<Element> el = do_QueryInterface(aEvent.GetOriginalTarget());
203202
if (el && el->IsInNativeAnonymousSubtree() && mContentNode->Contains(el)) {
204203
aResult.SetKnownLiveAtom(el->GetID(), DOMString::eTreatNullAsNull);

‎dom/base/DocGroup.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,21 @@ RefPtr<PerformanceInfoPromise> DocGroup::ReportPerformanceInfo() {
143143
RefPtr<DocGroup> self = this;
144144

145145
return CollectMemoryInfo(top, mainThread)
146-
->Then(mainThread, __func__,
147-
[self, host, pid, windowID, duration, isTopLevel,
148-
items](const PerformanceMemoryInfo& aMemoryInfo) {
149-
PerformanceInfo info =
150-
PerformanceInfo(host, pid, windowID, duration,
151-
self->mPerformanceCounter->GetID(), false,
152-
isTopLevel, aMemoryInfo, items);
153-
154-
return PerformanceInfoPromise::CreateAndResolve(std::move(info),
155-
__func__);
156-
},
157-
[self](const nsresult rv) {
158-
return PerformanceInfoPromise::CreateAndReject(rv, __func__);
159-
});
146+
->Then(
147+
mainThread, __func__,
148+
[self, host, pid, windowID, duration, isTopLevel,
149+
items](const PerformanceMemoryInfo& aMemoryInfo) {
150+
PerformanceInfo info =
151+
PerformanceInfo(host, pid, windowID, duration,
152+
self->mPerformanceCounter->GetID(), false,
153+
isTopLevel, aMemoryInfo, items);
154+
155+
return PerformanceInfoPromise::CreateAndResolve(std::move(info),
156+
__func__);
157+
},
158+
[self](const nsresult rv) {
159+
return PerformanceInfoPromise::CreateAndReject(rv, __func__);
160+
});
160161
}
161162

162163
nsresult DocGroup::Dispatch(TaskCategory aCategory,

‎dom/base/TreeOrderedArrayInlines.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ size_t TreeOrderedArray<Node>::Insert(Node& aNode) {
4747
};
4848

4949
size_t idx;
50-
BinarySearchIf(mList, 0, mList.Length(),
51-
PositionComparator(aNode), &idx);
50+
BinarySearchIf(mList, 0, mList.Length(), PositionComparator(aNode), &idx);
5251
mList.InsertElementAt(idx, &aNode);
5352
return idx;
5453
}

‎dom/base/UIDirectionManager.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ void OnPrefChange(const char* aPrefName, void*) {
5151
void UIDirectionManager::Initialize() {
5252
DebugOnly<nsresult> rv =
5353
Preferences::RegisterCallback(OnPrefChange, "intl.uidirection");
54-
MOZ_ASSERT(NS_SUCCEEDED(rv),
55-
"Failed to observe \"intl.uidirection\"");
54+
MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"intl.uidirection\"");
5655
}
5756

5857
/* static */

‎dom/base/nsAttrValue.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,9 @@ MiscContainer* nsAttrValue::ClearMiscContainer() {
16461646
delete cont->mValue.mIntMargin;
16471647
break;
16481648
}
1649-
default: { break; }
1649+
default: {
1650+
break;
1651+
}
16501652
}
16511653
}
16521654
ResetMiscAtomOrString();

‎dom/base/nsAttrValueInlines.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ inline void nsAttrValue::ToString(mozilla::dom::DOMString& aResult) const {
243243
aResult.SetKnownLiveAtom(atom, mozilla::dom::DOMString::eNullNotExpected);
244244
break;
245245
}
246-
default: { ToString(aResult.AsAString()); }
246+
default: {
247+
ToString(aResult.AsAString());
248+
}
247249
}
248250
}
249251

‎dom/base/nsCCUncollectableMarker.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,9 @@ nsresult nsCCUncollectableMarker::Observe(nsISupports* aSubject,
426426
xpc_UnmarkSkippableJSHolders();
427427
break;
428428
}
429-
default: { break; }
429+
default: {
430+
break;
431+
}
430432
}
431433

432434
return NS_OK;

‎dom/cache/Context.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@ Context::QuotaInitRunnable::Run() {
437437
}
438438
// -----
439439
case STATE_WAIT_FOR_DIRECTORY_LOCK:
440-
default: { MOZ_CRASH("unexpected state in QuotaInitRunnable"); }
440+
default: {
441+
MOZ_CRASH("unexpected state in QuotaInitRunnable");
442+
}
441443
}
442444

443445
if (resolver->Resolved()) {

‎dom/canvas/CanvasRenderingContext2D.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CanvasRenderingContext2D)
893893
NS_INTERFACE_MAP_ENTRY(nsISupports)
894894
NS_INTERFACE_MAP_END
895895

896-
CanvasRenderingContext2D::ContextState::ContextState() = default;
896+
CanvasRenderingContext2D::ContextState::ContextState() = default;
897897

898898
CanvasRenderingContext2D::ContextState::ContextState(const ContextState& aOther)
899899
: fontGroup(aOther.fontGroup),

‎dom/canvas/WebGLContextVertices.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ void WebGLContext::VertexAttribAnyPointer(bool isFuncInt, GLuint index,
402402
}
403403

404404
WebGLVertexAttribData& vd = mBoundVertexArray->mAttribs[index];
405-
vd.VertexAttribPointer(isFuncInt, buffer, AutoAssertCast(size), type, normalized, stride,
406-
byteOffset);
405+
vd.VertexAttribPointer(isFuncInt, buffer, AutoAssertCast(size), type,
406+
normalized, stride, byteOffset);
407407
mBoundVertexArray->InvalidateCaches();
408408
}
409409

‎dom/canvas/WebGLTexelConversions.h

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ MOZ_ALWAYS_INLINE void
962962
pack<WebGLTexelFormat::RGB565, WebGLTexelPremultiplicationOp::None, uint8_t,
963963
uint16_t>(const uint8_t* __restrict src, uint16_t* __restrict dst) {
964964
*dst = uint16_t(((src[0] & 0xF8) << 8) | ((src[1] & 0xFC) << 3) |
965-
((src[2] & 0xF8) >> 3));
965+
((src[2] & 0xF8) >> 3));
966966
}
967967

968968
template <>
@@ -974,7 +974,8 @@ pack<WebGLTexelFormat::RGB565, WebGLTexelPremultiplicationOp::Premultiply,
974974
uint8_t srcR = static_cast<uint8_t>(src[0] * scaleFactor);
975975
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
976976
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
977-
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xFC) << 3) | ((srcB & 0xF8) >> 3));
977+
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xFC) << 3) |
978+
((srcB & 0xF8) >> 3));
978979
}
979980

980981
// FIXME: this routine is lossy and must be removed.
@@ -987,7 +988,8 @@ pack<WebGLTexelFormat::RGB565, WebGLTexelPremultiplicationOp::Unpremultiply,
987988
uint8_t srcR = static_cast<uint8_t>(src[0] * scaleFactor);
988989
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
989990
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
990-
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xFC) << 3) | ((srcB & 0xF8) >> 3));
991+
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xFC) << 3) |
992+
((srcB & 0xF8) >> 3));
991993
}
992994

993995
template <>
@@ -1121,8 +1123,8 @@ template <>
11211123
MOZ_ALWAYS_INLINE void
11221124
pack<WebGLTexelFormat::RGBA4444, WebGLTexelPremultiplicationOp::None, uint8_t,
11231125
uint16_t>(const uint8_t* __restrict src, uint16_t* __restrict dst) {
1124-
*dst = uint16_t(((src[0] & 0xF0) << 8) | ((src[1] & 0xF0) << 4) | (src[2] & 0xF0) |
1125-
(src[3] >> 4));
1126+
*dst = uint16_t(((src[0] & 0xF0) << 8) | ((src[1] & 0xF0) << 4) |
1127+
(src[2] & 0xF0) | (src[3] >> 4));
11261128
}
11271129

11281130
template <>
@@ -1135,7 +1137,7 @@ pack<WebGLTexelFormat::RGBA4444, WebGLTexelPremultiplicationOp::Premultiply,
11351137
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
11361138
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
11371139
*dst = uint16_t(((srcR & 0xF0) << 8) | ((srcG & 0xF0) << 4) | (srcB & 0xF0) |
1138-
(src[3] >> 4));
1140+
(src[3] >> 4));
11391141
}
11401142

11411143
// FIXME: this routine is lossy and must be removed.
@@ -1149,15 +1151,15 @@ pack<WebGLTexelFormat::RGBA4444, WebGLTexelPremultiplicationOp::Unpremultiply,
11491151
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
11501152
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
11511153
*dst = uint16_t(((srcR & 0xF0) << 8) | ((srcG & 0xF0) << 4) | (srcB & 0xF0) |
1152-
(src[3] >> 4));
1154+
(src[3] >> 4));
11531155
}
11541156

11551157
template <>
11561158
MOZ_ALWAYS_INLINE void
11571159
pack<WebGLTexelFormat::RGBA5551, WebGLTexelPremultiplicationOp::None, uint8_t,
11581160
uint16_t>(const uint8_t* __restrict src, uint16_t* __restrict dst) {
11591161
*dst = uint16_t(((src[0] & 0xF8) << 8) | ((src[1] & 0xF8) << 3) |
1160-
((src[2] & 0xF8) >> 2) | (src[3] >> 7));
1162+
((src[2] & 0xF8) >> 2) | (src[3] >> 7));
11611163
}
11621164

11631165
template <>
@@ -1169,8 +1171,8 @@ pack<WebGLTexelFormat::RGBA5551, WebGLTexelPremultiplicationOp::Premultiply,
11691171
uint8_t srcR = static_cast<uint8_t>(src[0] * scaleFactor);
11701172
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
11711173
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
1172-
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xF8) << 3) | ((srcB & 0xF8) >> 2) |
1173-
(src[3] >> 7));
1174+
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xF8) << 3) |
1175+
((srcB & 0xF8) >> 2) | (src[3] >> 7));
11741176
}
11751177

11761178
// FIXME: this routine is lossy and must be removed.
@@ -1183,8 +1185,8 @@ pack<WebGLTexelFormat::RGBA5551, WebGLTexelPremultiplicationOp::Unpremultiply,
11831185
uint8_t srcR = static_cast<uint8_t>(src[0] * scaleFactor);
11841186
uint8_t srcG = static_cast<uint8_t>(src[1] * scaleFactor);
11851187
uint8_t srcB = static_cast<uint8_t>(src[2] * scaleFactor);
1186-
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xF8) << 3) | ((srcB & 0xF8) >> 2) |
1187-
(src[3] >> 7));
1188+
*dst = uint16_t(((srcR & 0xF8) << 8) | ((srcG & 0xF8) << 3) |
1189+
((srcB & 0xF8) >> 2) | (src[3] >> 7));
11881190
}
11891191

11901192
template <>

‎dom/canvas/WebGLTexture.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ class WebGLTexture final : public nsWrapperCache,
270270
case LOCAL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
271271
case LOCAL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
272272
case LOCAL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
273-
return AutoAssertCast(rawTexImageTarget - LOCAL_GL_TEXTURE_CUBE_MAP_POSITIVE_X);
273+
return AutoAssertCast(rawTexImageTarget -
274+
LOCAL_GL_TEXTURE_CUBE_MAP_POSITIVE_X);
274275

275276
default:
276277
return 0;

‎dom/canvas/WebGLTypes.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@ inline void* calloc(const ForbidNarrowing<size_t> n,
6060

6161
namespace detail {
6262

63-
template<typename From>
63+
template <typename From>
6464
class AutoAssertCastT final {
6565
const From mVal;
6666

67-
public:
68-
explicit AutoAssertCastT(const From val) : mVal(val) { }
67+
public:
68+
explicit AutoAssertCastT(const From val) : mVal(val) {}
6969

70-
template<typename To>
70+
template <typename To>
7171
operator To() const {
7272
return AssertedCast<To>(mVal);
7373
}
7474
};
7575

7676
} // namespace detail
7777

78-
template<typename From>
78+
template <typename From>
7979
inline auto AutoAssertCast(const From val) {
8080
return detail::AutoAssertCastT<From>(val);
8181
}

‎dom/clients/api/Client.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,20 @@ already_AddRefed<Promise> Client::Focus(ErrorResult& aRv) {
150150
MakeRefPtr<DOMMozPromiseRequestHolder<ClientStatePromise>>(mGlobal);
151151

152152
mHandle->Focus()
153-
->Then(mGlobal->EventTargetFor(TaskCategory::Other), __func__,
154-
[ipcClientInfo, holder, outerPromise](const ClientState& aResult) {
155-
holder->Complete();
156-
NS_ENSURE_TRUE_VOID(holder->GetParentObject());
157-
RefPtr<Client> newClient = new Client(
158-
holder->GetParentObject(),
159-
ClientInfoAndState(ipcClientInfo, aResult.ToIPC()));
160-
outerPromise->MaybeResolve(newClient);
161-
},
162-
[holder, outerPromise](nsresult aResult) {
163-
holder->Complete();
164-
outerPromise->MaybeReject(aResult);
165-
})
153+
->Then(
154+
mGlobal->EventTargetFor(TaskCategory::Other), __func__,
155+
[ipcClientInfo, holder, outerPromise](const ClientState& aResult) {
156+
holder->Complete();
157+
NS_ENSURE_TRUE_VOID(holder->GetParentObject());
158+
RefPtr<Client> newClient =
159+
new Client(holder->GetParentObject(),
160+
ClientInfoAndState(ipcClientInfo, aResult.ToIPC()));
161+
outerPromise->MaybeResolve(newClient);
162+
},
163+
[holder, outerPromise](nsresult aResult) {
164+
holder->Complete();
165+
outerPromise->MaybeReject(aResult);
166+
})
166167
->Track(*holder);
167168

168169
return outerPromise.forget();

‎dom/clients/api/ClientDOMUtil.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ void StartClientManagerOp(Func aFunc, const Arg& aArg, nsIGlobalObject* aGlobal,
3232
MakeRefPtr<DOMMozPromiseRequestHolder<ClientOpPromise>>(aGlobal);
3333

3434
aFunc(aArg, target)
35-
->Then(target, __func__,
36-
[aResolve, holder](const ClientOpResult& aResult) {
37-
holder->Complete();
38-
aResolve(aResult);
39-
},
40-
[aReject, holder](nsresult aResult) {
41-
holder->Complete();
42-
aReject(aResult);
43-
})
35+
->Then(
36+
target, __func__,
37+
[aResolve, holder](const ClientOpResult& aResult) {
38+
holder->Complete();
39+
aResolve(aResult);
40+
},
41+
[aReject, holder](nsresult aResult) {
42+
holder->Complete();
43+
aReject(aResult);
44+
})
4445
->Track(*holder);
4546
}
4647

‎dom/clients/api/Clients.cpp

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,30 +80,31 @@ already_AddRefed<Promise> Clients::Get(const nsAString& aClientID,
8080
MakeRefPtr<DOMMozPromiseRequestHolder<ClientOpPromise>>(mGlobal);
8181

8282
innerPromise
83-
->Then(target, __func__,
84-
[outerPromise, holder, scope](const ClientOpResult& aResult) {
85-
holder->Complete();
86-
NS_ENSURE_TRUE_VOID(holder->GetParentObject());
87-
RefPtr<Client> client = new Client(
88-
holder->GetParentObject(), aResult.get_ClientInfoAndState());
89-
if (client->GetStorageAccess() ==
90-
nsContentUtils::StorageAccess::eAllow) {
91-
outerPromise->MaybeResolve(std::move(client));
92-
return;
93-
}
94-
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(
95-
"Clients::Get() storage denied", [scope] {
96-
ServiceWorkerManager::LocalizeAndReportToAllClients(
97-
scope, "ServiceWorkerGetClientStorageError",
98-
nsTArray<nsString>());
99-
});
100-
SystemGroup::Dispatch(TaskCategory::Other, r.forget());
101-
outerPromise->MaybeResolveWithUndefined();
102-
},
103-
[outerPromise, holder](nsresult aResult) {
104-
holder->Complete();
105-
outerPromise->MaybeResolveWithUndefined();
106-
})
83+
->Then(
84+
target, __func__,
85+
[outerPromise, holder, scope](const ClientOpResult& aResult) {
86+
holder->Complete();
87+
NS_ENSURE_TRUE_VOID(holder->GetParentObject());
88+
RefPtr<Client> client = new Client(
89+
holder->GetParentObject(), aResult.get_ClientInfoAndState());
90+
if (client->GetStorageAccess() ==
91+
nsContentUtils::StorageAccess::eAllow) {
92+
outerPromise->MaybeResolve(std::move(client));
93+
return;
94+
}
95+
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(
96+
"Clients::Get() storage denied", [scope] {
97+
ServiceWorkerManager::LocalizeAndReportToAllClients(
98+
scope, "ServiceWorkerGetClientStorageError",
99+
nsTArray<nsString>());
100+
});
101+
SystemGroup::Dispatch(TaskCategory::Other, r.forget());
102+
outerPromise->MaybeResolveWithUndefined();
103+
},
104+
[outerPromise, holder](nsresult aResult) {
105+
holder->Complete();
106+
outerPromise->MaybeResolveWithUndefined();
107+
})
107108
->Track(*holder);
108109

109110
return outerPromise.forget();

0 commit comments

Comments
 (0)