Skip to content

Commit f12b9fa

Browse files
committed
Bug 1519636 - Reformat recent changes to the Google coding style r=Ehsan
# ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D47737 --HG-- extra : moz-landing-system : lando
1 parent 2b49a6d commit f12b9fa

File tree

134 files changed

+602
-610
lines changed

Some content is hidden

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

134 files changed

+602
-610
lines changed

accessible/base/Pivot.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class Pivot final {
6666
Accessible* AtPoint(int32_t aX, int32_t aY, PivotRule& aRule);
6767

6868
private:
69-
7069
Accessible* AdjustStartPosition(Accessible* aAnchor, PivotRule& aRule,
7170
uint16_t* aFilterResult);
7271

accessible/generic/Accessible.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ class Accessible : public nsISupports {
10411041
eKidsMutating = 1 << 6, // subtree is being mutated
10421042
eIgnoreDOMUIEvent = 1 << 7, // don't process DOM UI events for a11y events
10431043
eRelocated = 1 << 8, // accessible was moved in tree
1044-
eNoKidsFromDOM = 1 << 9, // accessible doesn't allow children from DOM
1044+
eNoKidsFromDOM = 1 << 9, // accessible doesn't allow children from DOM
10451045
eHasTextKids = 1 << 10, // accessible have a text leaf in children
10461046

10471047
eLastStateFlag = eHasTextKids

accessible/html/HTMLListAccessible.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void HTMLListBulletAccessible::AppendTextTo(nsAString& aText,
159159
bool HTMLListBulletAccessible::IsInside() const {
160160
if (nsIFrame* frame = mContent->GetPrimaryFrame()) {
161161
return frame->StyleList()->mListStylePosition ==
162-
NS_STYLE_LIST_STYLE_POSITION_INSIDE;
162+
NS_STYLE_LIST_STYLE_POSITION_INSIDE;
163163
}
164164
return false;
165165
}

accessible/ipc/extension/android/DocAccessiblePlatformExtChild.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvPivot(
2222
}
2323

2424
mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvNavigateText(
25-
uint64_t aID, int32_t aGranularity, int32_t aStartOffset, int32_t aEndOffset,
26-
bool aForward, bool aSelect) {
25+
uint64_t aID, int32_t aGranularity, int32_t aStartOffset,
26+
int32_t aEndOffset, bool aForward, bool aSelect) {
2727
if (auto acc = IdToAccessibleWrap(aID)) {
2828
acc->NavigateText(aGranularity, aStartOffset, aEndOffset, aForward,
2929
aSelect);

accessible/xul/XULMenuAccessible.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ using namespace mozilla::a11y;
3636

3737
XULMenuitemAccessible::XULMenuitemAccessible(nsIContent* aContent,
3838
DocAccessible* aDoc)
39-
: AccessibleWrap(aContent, aDoc) {
40-
}
39+
: AccessibleWrap(aContent, aDoc) {}
4140

4241
uint64_t XULMenuitemAccessible::NativeState() const {
4342
uint64_t state = Accessible::NativeState();

docshell/base/nsDocShell.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,8 @@ void nsDocShell::TriggerParentCheckDocShellIsEmpty() {
21342134
if (RefPtr<nsDocShell> parent = GetInProcessParentDocshell()) {
21352135
parent->DocLoaderIsEmpty(true);
21362136
}
2137-
if (GetBrowsingContext()->IsContentSubframe() && !GetBrowsingContext()->GetParent()->IsInProcess()) {
2137+
if (GetBrowsingContext()->IsContentSubframe() &&
2138+
!GetBrowsingContext()->GetParent()->IsInProcess()) {
21382139
if (BrowserChild* browserChild = BrowserChild::GetFrom(this)) {
21392140
mozilla::Unused << browserChild->SendMaybeFireEmbedderLoadEvents(
21402141
/*aIsTrusted*/ true, /*aFireLoadAtEmbeddingElement*/ false);
@@ -3966,7 +3967,8 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
39663967
// because error documents do not result in a call to
39673968
// SendMaybeFireEmbedderLoadEvents via any of the normal call paths.
39683969
// (Obviously, we must do this before any of the returns below.)
3969-
if (GetBrowsingContext()->IsContentSubframe() && !GetBrowsingContext()->GetParent()->IsInProcess()) {
3970+
if (GetBrowsingContext()->IsContentSubframe() &&
3971+
!GetBrowsingContext()->GetParent()->IsInProcess()) {
39703972
if (BrowserChild* browserChild = BrowserChild::GetFrom(this)) {
39713973
mozilla::Unused << browserChild->SendMaybeFireEmbedderLoadEvents(
39723974
/*aIsTrusted*/ true, /*aFireLoadAtEmbeddingElement*/ false);

dom/base/UseCounter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ enum UseCounter : int16_t {
5151
eUseCounter_FirstCountedUnknownProperty = eUseCounter_EndCSSProperties,
5252
__reset_hack_2 = eUseCounter_FirstCountedUnknownProperty - 1,
5353

54-
#define COUNTED_UNKNOWN_PROPERTY(name_, method_) eUseCounter_unknown_property_##method_,
54+
#define COUNTED_UNKNOWN_PROPERTY(name_, method_) \
55+
eUseCounter_unknown_property_##method_,
5556
#include "mozilla/CountedUnknownProperties.h"
5657
#undef COUNTED_UNKNOWN_PROPERTY
5758

dom/base/nsDOMMutationObserver.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,8 @@ void nsDOMMutationObserver::Observe(
621621
if (!(childList || attributes || characterData || animations ||
622622
nativeAnonymousChildList)) {
623623
aRv.ThrowTypeError(
624-
u"One of 'childList', 'attributes', 'characterData' must not be false.");
624+
u"One of 'childList', 'attributes', 'characterData' must not be "
625+
u"false.");
625626
return;
626627
}
627628

dom/base/nsFrameLoaderOwner.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ void nsFrameLoaderOwner::ChangeRemoteness(
8383
// blocker until the process is complete.
8484
Document* doc = owner->OwnerDoc();
8585
doc->BlockOnload();
86-
auto cleanup = MakeScopeExit([&]() {
87-
doc->UnblockOnload(false);
88-
});
86+
auto cleanup = MakeScopeExit([&]() { doc->UnblockOnload(false); });
8987

9088
// If we already have a Frameloader, destroy it, possibly preserving its
9189
// browsing context.

dom/base/nsPlainTextSerializer.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,8 @@ nsresult nsPlainTextSerializer::DoOpenContainer(const nsAtom* aTag) {
776776
if (NS_SUCCEEDED(rv)) mOLStack[mOLStackIndex - 1] = valueAttrVal;
777777
}
778778
// This is what nsBulletFrame does for OLs:
779-
mCurrentLine.mIndentation.mHeader.AppendInt(mOLStack[mOLStackIndex - 1]++, 10);
779+
mCurrentLine.mIndentation.mHeader.AppendInt(
780+
mOLStack[mOLStackIndex - 1]++, 10);
780781
} else {
781782
mCurrentLine.mIndentation.mHeader.Append(char16_t('#'));
782783
}
@@ -1006,7 +1007,8 @@ nsresult nsPlainTextSerializer::DoCloseContainer(const nsAtom* aTag) {
10061007
bool isInCiteBlockquote = PopBool(mIsInCiteBlockquote);
10071008

10081009
if (isInCiteBlockquote) {
1009-
NS_ASSERTION(mCurrentLine.mCiteQuoteLevel, "CiteQuote level will be negative!");
1010+
NS_ASSERTION(mCurrentLine.mCiteQuoteLevel,
1011+
"CiteQuote level will be negative!");
10101012
mCurrentLine.mCiteQuoteLevel--;
10111013
mFloatingLines = 0;
10121014
mHasWrittenCiteBlockquote = true;
@@ -1595,17 +1597,16 @@ void nsPlainTextSerializer::Write(const nsAString& aStr) {
15951597
(mSpanLevel > 0 && mEmptyLines >= 0 && IsQuotedLine(str))) {
15961598
// No intelligent wrapping.
15971599

1598-
// This mustn't be mixed with intelligent wrapping without clearing
1599-
// the mCurrentLine.mContent buffer before!!!
1600-
NS_ASSERTION(
1601-
mCurrentLine.mContent.IsEmpty() ||
1602-
(IsElementPreformatted() && !mPreFormattedMail),
1603-
"Mixed wrapping data and nonwrapping data on the same line");
1604-
MOZ_ASSERT(mOutputManager);
1600+
// This mustn't be mixed with intelligent wrapping without clearing
1601+
// the mCurrentLine.mContent buffer before!!!
1602+
NS_ASSERTION(mCurrentLine.mContent.IsEmpty() ||
1603+
(IsElementPreformatted() && !mPreFormattedMail),
1604+
"Mixed wrapping data and nonwrapping data on the same line");
1605+
MOZ_ASSERT(mOutputManager);
16051606

1606-
if (!mCurrentLine.mContent.IsEmpty()) {
1607-
mOutputManager->Flush(mCurrentLine);
1608-
}
1607+
if (!mCurrentLine.mContent.IsEmpty()) {
1608+
mOutputManager->Flush(mCurrentLine);
1609+
}
16091610

16101611
ConvertToLinesAndOutput(str);
16111612
return;

0 commit comments

Comments
 (0)