Skip to content

Commit af8e458

Browse files
aiakabaiakab
committed
Backed out changeset a296439a25ff (bug 1519636) for frequent Windows cppunit failures CLOSED TREE
1 parent 5bed2b0 commit af8e458

File tree

159 files changed

+592
-565
lines changed

Some content is hidden

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

159 files changed

+592
-565
lines changed

‎accessible/html/HTMLFormControlAccessible.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ uint64_t HTMLTextFieldAccessible::NativeState() const {
338338
return state | states::SUPPORTS_AUTOCOMPLETION | states::HASPOPUP;
339339

340340
// Ordinal XUL textboxes don't support autocomplete.
341-
if (!BindingOrWidgetParent() &&
342-
Preferences::GetBool("browser.formfill.enable")) {
341+
if (!BindingOrWidgetParent() && Preferences::GetBool("browser.formfill.enable")) {
343342
// Check to see if autocompletion is allowed on this input. We don't expose
344343
// it for password fields even though the entire password can be remembered
345344
// for a page if the user asks it to be. However, the kind of autocomplete

‎accessible/html/HTMLFormControlAccessible.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class HTMLTextFieldAccessible final : public HyperTextAccessibleWrap {
102102
* HTML:input@type="number".
103103
*/
104104
nsIContent* BindingOrWidgetParent() const {
105-
nsIContent* el = mContent->GetBindingParent();
105+
nsIContent * el = mContent->GetBindingParent();
106106
if (el) {
107107
return el;
108108
}

‎browser/app/winlauncher/LauncherProcessWin.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ static mozilla::Maybe<bool> RunAsLauncherProcess(int& argc, wchar_t** argv) {
176176
bool runAsLauncher = DoLauncherProcessChecks(argc, argv);
177177

178178
#if defined(MOZ_LAUNCHER_PROCESS)
179-
bool forceLauncher =
180-
runAsLauncher &&
181-
mozilla::CheckArg(argc, argv, L"force-launcher",
182-
static_cast<const wchar_t**>(nullptr),
183-
mozilla::CheckArgFlag::RemoveArg) == mozilla::ARG_FOUND;
179+
bool forceLauncher = runAsLauncher &&
180+
mozilla::CheckArg(argc, argv, L"force-launcher",
181+
static_cast<const wchar_t**>(nullptr),
182+
mozilla::CheckArgFlag::RemoveArg) ==
183+
mozilla::ARG_FOUND;
184184

185185
mozilla::LauncherRegistryInfo::ProcessType desiredType =
186186
runAsLauncher ? mozilla::LauncherRegistryInfo::ProcessType::Launcher

‎caps/ContentPrincipal.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ NS_IMPL_CI_INTERFACE_GETTER(ContentPrincipal, nsIPrincipal, nsISerializable)
4949

5050
ContentPrincipal::ContentPrincipal() : BasePrincipal(eCodebasePrincipal) {}
5151

52-
ContentPrincipal::~ContentPrincipal() {}
52+
ContentPrincipal::~ContentPrincipal() {
53+
}
5354

5455
nsresult ContentPrincipal::Init(nsIURI* aCodebase,
5556
const OriginAttributes& aOriginAttributes,

‎docshell/base/BrowsingContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,9 +814,9 @@ void BrowsingContext::Transaction::Apply(BrowsingContext* aBrowsingContext,
814814
}
815815

816816
BrowsingContext::IPCInitializer BrowsingContext::GetIPCInitializer() {
817-
MOZ_ASSERT(!mozilla::Preferences::GetBool(
818-
"fission.preserve_browsing_contexts", false) ||
819-
IsContent());
817+
MOZ_ASSERT(
818+
!mozilla::Preferences::GetBool("fission.preserve_browsing_contexts", false) ||
819+
IsContent());
820820

821821
IPCInitializer init;
822822
init.mId = Id();

‎docshell/base/nsDocShell.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -766,24 +766,24 @@ class nsDocShell final : public nsDocLoader,
766766
BFCACHE_SUCCESS,
767767
UNLOAD = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER,
768768
UNLOAD_REQUEST = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
769-
mozilla::dom::BFCacheStatus::REQUEST,
769+
mozilla::dom::BFCacheStatus::REQUEST,
770770
REQUEST = mozilla::dom::BFCacheStatus::REQUEST,
771771
UNLOAD_REQUEST_PEER = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
772772
mozilla::dom::BFCacheStatus::REQUEST |
773773
mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
774774
UNLOAD_REQUEST_PEER_MSE =
775-
mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
776-
mozilla::dom::BFCacheStatus::REQUEST |
777-
mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION |
778-
mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
775+
mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
776+
mozilla::dom::BFCacheStatus::REQUEST |
777+
mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION |
778+
mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
779779
UNLOAD_REQUEST_MSE = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
780780
mozilla::dom::BFCacheStatus::REQUEST |
781781
mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
782782
SUSPENDED_UNLOAD_REQUEST_PEER =
783-
mozilla::dom::BFCacheStatus::SUSPENDED |
784-
mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
785-
mozilla::dom::BFCacheStatus::REQUEST |
786-
mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
783+
mozilla::dom::BFCacheStatus::SUSPENDED |
784+
mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
785+
mozilla::dom::BFCacheStatus::REQUEST |
786+
mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
787787
};
788788

789789
void ReportBFCacheComboTelemetry(uint16_t aCombo);

‎dom/base/Document.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6871,7 +6871,7 @@ static Maybe<LayoutDeviceToScreenScale> ParseScaleString(
68716871
}
68726872

68736873
Maybe<LayoutDeviceToScreenScale> Document::ParseScaleInHeader(
6874-
nsAtom* aHeaderField) {
6874+
nsAtom* aHeaderField) {
68756875
MOZ_ASSERT(aHeaderField == nsGkAtoms::viewport_initial_scale ||
68766876
aHeaderField == nsGkAtoms::viewport_maximum_scale ||
68776877
aHeaderField == nsGkAtoms::viewport_minimum_scale);

‎dom/base/ResizeObserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void ResizeObserverEntry::SetContentRectAndSize(const nsSize& aSize) {
280280
nsIFrame* frame = mTarget->GetPrimaryFrame();
281281

282282
// 1. Update mContentRect.
283-
nsMargin padding = frame ? frame->GetUsedPadding() : nsMargin();
283+
nsMargin padding = frame ? frame->GetUsedPadding(): nsMargin();
284284
// Per the spec, we need to use the top-left padding offset as the origin of
285285
// our contentRect.
286286
nsRect rect(nsPoint(padding.left, padding.top), aSize);

‎dom/base/ResizeObserverController.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ void ResizeObserverNotificationHelper::Unregister() {
5959
}
6060

6161
nsRefreshDriver* refreshDriver = GetRefreshDriver();
62-
MOZ_RELEASE_ASSERT(
63-
refreshDriver,
64-
"We should not leave a dangling reference to the observer around");
62+
MOZ_RELEASE_ASSERT(refreshDriver,
63+
"We should not leave a dangling reference to the observer around");
6564

6665
bool rv = refreshDriver->RemoveRefreshObserver(this, FlushType::Display);
6766
MOZ_DIAGNOSTIC_ASSERT(rv, "Should remove the observer successfully");

‎dom/base/SerializedStackHolder.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ namespace mozilla {
1313
namespace dom {
1414

1515
SerializedStackHolder::SerializedStackHolder()
16-
: mHolder(StructuredCloneHolder::CloningSupported,
17-
StructuredCloneHolder::TransferringNotSupported,
18-
StructuredCloneHolder::StructuredCloneScope::
19-
SameProcessDifferentThread) {}
16+
: mHolder(StructuredCloneHolder::CloningSupported,
17+
StructuredCloneHolder::TransferringNotSupported,
18+
StructuredCloneHolder::StructuredCloneScope::SameProcessDifferentThread) {}
2019

2120
void SerializedStackHolder::WriteStack(JSContext* aCx,
2221
JS::HandleObject aStack) {
@@ -38,8 +37,8 @@ void SerializedStackHolder::SerializeWorkerStack(JSContext* aCx,
3837
JS::HandleObject aStack) {
3938
MOZ_ASSERT(aWorkerPrivate->IsOnCurrentThread());
4039

41-
RefPtr<StrongWorkerRef> workerRef =
42-
StrongWorkerRef::Create(aWorkerPrivate, "WorkerErrorReport");
40+
RefPtr<StrongWorkerRef> workerRef = StrongWorkerRef::Create(
41+
aWorkerPrivate, "WorkerErrorReport");
4342
if (workerRef) {
4443
mWorkerRef = new ThreadSafeWorkerRef(workerRef);
4544
} else {
@@ -79,7 +78,8 @@ JSObject* SerializedStackHolder::ReadStack(JSContext* aCx) {
7978
}
8079

8180
JS::RootedValue stackValue(aCx);
82-
mHolder.Read(xpc::CurrentNativeGlobal(aCx), aCx, &stackValue, IgnoreErrors());
81+
mHolder.Read(xpc::CurrentNativeGlobal(aCx), aCx, &stackValue,
82+
IgnoreErrors());
8383
return stackValue.isObject() ? &stackValue.toObject() : nullptr;
8484
}
8585

@@ -92,8 +92,8 @@ UniquePtr<SerializedStackHolder> GetCurrentStackForNetMonitor(JSContext* aCx) {
9292
return stack;
9393
}
9494

95-
void NotifyNetworkMonitorAlternateStack(
96-
nsISupports* aChannel, UniquePtr<SerializedStackHolder> aStackHolder) {
95+
void NotifyNetworkMonitorAlternateStack(nsISupports* aChannel,
96+
UniquePtr<SerializedStackHolder> aStackHolder) {
9797
if (!aStackHolder) {
9898
return;
9999
}
@@ -121,8 +121,8 @@ void ConvertSerializedStackToJSON(UniquePtr<SerializedStackHolder> aStackHolder,
121121
}
122122

123123
JS::RootedObject converted(cx);
124-
converted = JS::ConvertSavedFrameToPlainObject(
125-
cx, savedFrame, JS::SavedFrameSelfHosted::Exclude);
124+
converted = JS::ConvertSavedFrameToPlainObject(cx, savedFrame,
125+
JS::SavedFrameSelfHosted::Exclude);
126126
if (!converted) {
127127
JS_ClearPendingException(cx);
128128
return;

0 commit comments

Comments
 (0)