Skip to content
This repository was archived by the owner on Aug 4, 2022. It is now read-only.

Commit 64a8249

Browse files
nbeleuzunbeleuzu
committed
Backed out changeset 389b6bbd76db (bug 1519636) for bustages on MarkupMap.h . CLOSED TREE
1 parent b42baf6 commit 64a8249

File tree

427 files changed

+4536
-6444
lines changed

Some content is hidden

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

427 files changed

+4536
-6444
lines changed

‎accessible/base/MarkupMap.h

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

‎caps/tests/gtest/TestOriginAttributes.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@ static void TestSuffix(const OriginAttributes& attrs) {
1717
EXPECT_EQ(attrs, attrsFromSuffix);
1818
}
1919

20-
TEST(OriginAttributes, Suffix_default)
21-
{
20+
TEST(OriginAttributes, Suffix_default) {
2221
OriginAttributes attrs;
2322
TestSuffix(attrs);
2423
}
2524

26-
TEST(OriginAttributes, Suffix_appId_inIsolatedMozBrowser)
27-
{
25+
TEST(OriginAttributes, Suffix_appId_inIsolatedMozBrowser) {
2826
OriginAttributes attrs(1, true);
2927
TestSuffix(attrs);
3028
}
3129

32-
TEST(OriginAttributes, Suffix_maxAppId_inIsolatedMozBrowser)
33-
{
30+
TEST(OriginAttributes, Suffix_maxAppId_inIsolatedMozBrowser) {
3431
OriginAttributes attrs(4294967295, true);
3532
TestSuffix(attrs);
3633
}

‎dom/base/AnonymousContent.cpp

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

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

‎dom/base/DocGroup.cpp

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

145145
return CollectMemoryInfo(top, mainThread)
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-
});
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+
});
161160
}
162161

163162
nsresult DocGroup::Dispatch(TaskCategory aCategory,

‎dom/base/Document.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12621,20 +12621,19 @@ already_AddRefed<mozilla::dom::Promise> Document::RequestStorageAccess(
1262112621
AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
1262212622
NodePrincipal(), inner, AntiTrackingCommon::eStorageAccessAPI,
1262312623
performFinalChecks)
12624-
->Then(
12625-
GetCurrentThreadSerialEventTarget(), __func__,
12626-
[outer, promise] {
12627-
// Step 10. Grant the document access to cookies and store
12628-
// that fact for
12629-
// the purposes of future calls to
12630-
// hasStorageAccess() and requestStorageAccess().
12631-
outer->SetHasStorageAccess(true);
12632-
promise->MaybeResolveWithUndefined();
12633-
},
12634-
[outer, promise] {
12635-
outer->SetHasStorageAccess(false);
12636-
promise->MaybeRejectWithUndefined();
12637-
});
12624+
->Then(GetCurrentThreadSerialEventTarget(), __func__,
12625+
[outer, promise] {
12626+
// Step 10. Grant the document access to cookies and store
12627+
// that fact for
12628+
// the purposes of future calls to
12629+
// hasStorageAccess() and requestStorageAccess().
12630+
outer->SetHasStorageAccess(true);
12631+
promise->MaybeResolveWithUndefined();
12632+
},
12633+
[outer, promise] {
12634+
outer->SetHasStorageAccess(false);
12635+
promise->MaybeRejectWithUndefined();
12636+
});
1263812637

1263912638
return promise.forget();
1264012639
}

‎dom/base/TreeOrderedArrayInlines.h

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

4949
size_t idx;
50-
BinarySearchIf(mList, 0, mList.Length(), PositionComparator(aNode), &idx);
50+
BinarySearchIf(mList, 0, mList.Length(),
51+
PositionComparator(aNode), &idx);
5152
mList.InsertElementAt(idx, &aNode);
5253
return idx;
5354
}

‎dom/base/UIDirectionManager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ 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), "Failed to observe \"intl.uidirection\"");
54+
MOZ_ASSERT(NS_SUCCEEDED(rv),
55+
"Failed to observe \"intl.uidirection\"");
5556
}
5657

5758
/* static */

‎dom/base/nsAttrValue.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,9 +1645,7 @@ MiscContainer* nsAttrValue::ClearMiscContainer() {
16451645
delete cont->mValue.mIntMargin;
16461646
break;
16471647
}
1648-
default: {
1649-
break;
1650-
}
1648+
default: { break; }
16511649
}
16521650
}
16531651
ResetMiscAtomOrString();

‎dom/base/nsAttrValueInlines.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,7 @@ inline void nsAttrValue::ToString(mozilla::dom::DOMString& aResult) const {
242242
aResult.SetKnownLiveAtom(atom, mozilla::dom::DOMString::eNullNotExpected);
243243
break;
244244
}
245-
default: {
246-
ToString(aResult.AsAString());
247-
}
245+
default: { ToString(aResult.AsAString()); }
248246
}
249247
}
250248

‎dom/base/nsCCUncollectableMarker.cpp

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

434432
return NS_OK;

‎dom/base/test/gtest/TestContentUtils.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
#include "mozilla/CycleCollectedJSContext.h"
1212
#include "mozilla/dom/SimpleGlobalObject.h"
1313

14-
TEST(DOM_Base_ContentUtils, StringifyJSON_EmptyValue)
15-
{
14+
TEST(DOM_Base_ContentUtils, StringifyJSON_EmptyValue) {
1615
JSObject* globalObject = mozilla::dom::SimpleGlobalObject::Create(
1716
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail);
1817
mozilla::dom::AutoJSAPI jsAPI;
@@ -26,8 +25,7 @@ TEST(DOM_Base_ContentUtils, StringifyJSON_EmptyValue)
2625
ASSERT_TRUE(serializedValue.EqualsLiteral("null"));
2726
}
2827

29-
TEST(DOM_Base_ContentUtils, StringifyJSON_Object)
30-
{
28+
TEST(DOM_Base_ContentUtils, StringifyJSON_Object) {
3129
JSObject* globalObject = mozilla::dom::SimpleGlobalObject::Create(
3230
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail);
3331
mozilla::dom::AutoJSAPI jsAPI;

0 commit comments

Comments
 (0)