Skip to content

Commit

Permalink
Bug 1519636 - Reformat recent changes to the Google coding style r=andi
Browse files Browse the repository at this point in the history
Updated with clang-format version 11.0.1 (taskcluster-B6bdwSKDRF-luRQWXBuzpA)

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D108334
  • Loading branch information
sylvestre committed Mar 15, 2021
1 parent 8565b0c commit 81b14e2
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 42 deletions.
4 changes: 2 additions & 2 deletions accessible/windows/msaa/AccessibleWrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -954,8 +954,8 @@ AccessibleWrap::accHitTest(

if (IsDefunct()) return CO_E_OBJNOTCONNECTED;

LocalAccessible* accessible =
LocalChildAtPoint(xLeft, yTop, Accessible::EWhichChildAtPoint::DirectChild);
LocalAccessible* accessible = LocalChildAtPoint(
xLeft, yTop, Accessible::EWhichChildAtPoint::DirectChild);

// if we got a child
if (accessible) {
Expand Down
5 changes: 2 additions & 3 deletions docshell/base/nsDocShell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4928,9 +4928,8 @@ nsDocShell::GetVisibility(bool* aVisibility) {
}

nsIFrame* frame = view ? view->GetFrame() : nullptr;
if (frame &&
!frame->IsVisibleConsideringAncestors(
nsIFrame::VISIBILITY_CROSS_CHROME_CONTENT_BOUNDARY)) {
if (frame && !frame->IsVisibleConsideringAncestors(
nsIFrame::VISIBILITY_CROSS_CHROME_CONTENT_BOUNDARY)) {
return NS_OK;
}

Expand Down
8 changes: 4 additions & 4 deletions gfx/layers/apz/src/APZUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ bool AboutToCheckerboard(const FrameMetrics& aPaintedMetrics,
const FrameMetrics& aCompositorMetrics);

/**
* Wrapper around StaticPrefs::layers_progressive_paint that takes into account
* whether the platform is supported or sandboxed. We should prefer this over
* using the StaticPrefs getter directly.
*/
* Wrapper around StaticPrefs::layers_progressive_paint that takes into account
* whether the platform is supported or sandboxed. We should prefer this over
* using the StaticPrefs getter directly.
*/
bool ShouldUseProgressivePaint();
} // namespace apz

Expand Down
6 changes: 3 additions & 3 deletions gfx/thebes/gfxDWriteFontList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1528,9 +1528,9 @@ void gfxDWriteFontList::InitSharedFontListForPlatform() {
TimeStamp start2 = TimeStamp::Now();
AppendFamiliesFromCollection(mBundledFonts, families);
TimeStamp end2 = TimeStamp::Now();
Telemetry::Accumulate(Telemetry::FONTLIST_BUNDLEDFONTS_ACTIVATE,
(end1 - start1).ToMilliseconds() +
(end2 - start2).ToMilliseconds());
Telemetry::Accumulate(
Telemetry::FONTLIST_BUNDLEDFONTS_ACTIVATE,
(end1 - start1).ToMilliseconds() + (end2 - start2).ToMilliseconds());
}
#endif
SharedFontList()->SetFamilyNames(families);
Expand Down
4 changes: 1 addition & 3 deletions js/src/gc/RootMarking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,7 @@ void StackShape::trace(JSTracer* trc) {
}
}

void StackBaseShape::trace(JSTracer* trc) {
proto.trace(trc);
}
void StackBaseShape::trace(JSTracer* trc) { proto.trace(trc); }

void PropertyDescriptor::trace(JSTracer* trc) {
if (obj) {
Expand Down
5 changes: 3 additions & 2 deletions js/src/jit/WarpBuilderShared.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ class MOZ_STACK_CLASS CallInfo {
setThis(thisVal);

MOZ_ASSERT(numActuals <= ArgumentsObject::MaxInlinedArgs);
static_assert(ArgumentsObject::MaxInlinedArgs <= decltype(args_)::InlineLength,
"Actual arguments can be infallibly stored inline");
static_assert(
ArgumentsObject::MaxInlinedArgs <= decltype(args_)::InlineLength,
"Actual arguments can be infallibly stored inline");
MOZ_ALWAYS_TRUE(args_.reserve(numActuals));
}

Expand Down
3 changes: 2 additions & 1 deletion js/src/wasm/WasmStubs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2852,7 +2852,8 @@ static bool GenerateThrowStub(MacroAssembler& masm, Label* throwLabel,
masm.loadPtr(Address(ReturnReg, offsetof(ResumeFromException, target)),
scratch);
// Now it's safe to reload stackPointer.
masm.loadStackPtr(Address(ReturnReg, offsetof(ResumeFromException, stackPointer)));
masm.loadStackPtr(
Address(ReturnReg, offsetof(ResumeFromException, stackPointer)));
// This move must come after the SP is reloaded because WasmExceptionReg may
// alias ReturnReg.
masm.movePtr(obj, WasmExceptionReg);
Expand Down
4 changes: 2 additions & 2 deletions netwerk/protocol/http/Http3Session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,8 @@ nsresult Http3Session::ProcessOutput(nsIUDPSocket* socket) {
nsAutoCString remoteAddrStr;
uint16_t port = 0;
uint64_t timeout = 0;
if (!mHttp3Connection->ProcessOutput(&remoteAddrStr, &port,
packetToSend, &timeout)) {
if (!mHttp3Connection->ProcessOutput(&remoteAddrStr, &port, packetToSend,
&timeout)) {
SetupTimer(timeout);
break;
}
Expand Down
3 changes: 1 addition & 2 deletions netwerk/socket/neqo_glue/NeqoHttp3Conn.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ class NeqoHttp3Conn final {
}

bool ProcessOutput(nsACString* aRemoteAddr, uint16_t* aPort,
nsTArray<uint8_t>& aData, uint64_t* aTimeout)
{
nsTArray<uint8_t>& aData, uint64_t* aTimeout) {
aData.TruncateLength(0);
return neqo_http3conn_process_output(this, aRemoteAddr, aPort, &aData,
aTimeout);
Expand Down
4 changes: 2 additions & 2 deletions widget/ScrollbarDrawingMac.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ class ScrollbarDrawingMac final {

using ScrollCornerRects = Array<FillRect, 7>;
static bool GetScrollCornerRects(const gfx::Rect& aRect,
const ScrollbarParams& aParams,
float aScale, ScrollCornerRects&);
const ScrollbarParams& aParams, float aScale,
ScrollCornerRects&);
};

} // namespace widget
Expand Down
35 changes: 17 additions & 18 deletions widget/cocoa/nsNativeBasicThemeCocoa.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,19 @@ class nsNativeBasicThemeCocoa : public nsNativeBasicTheme {
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aElementState,
const EventStates& aDocumentState,
DPIRatio);
const EventStates& aDocumentState, DPIRatio);
bool PaintScrollbarThumb(DrawTarget&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aElementState,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override;
bool PaintScrollbarThumb(WebRenderBackendData&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aElementState,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override;

template <typename PaintBackendData>
void DoPaintScrollbarTrack(PaintBackendData&, const LayoutDeviceRect& aRect,
Expand All @@ -55,27 +54,27 @@ class nsNativeBasicThemeCocoa : public nsNativeBasicTheme {
bool PaintScrollbarTrack(DrawTarget&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override;
bool PaintScrollbarTrack(WebRenderBackendData&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override;

bool PaintScrollbar(DrawTarget&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override {
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override {
// Draw nothing; the scrollbar track is drawn in PaintScrollbarTrack.
return true;
}
bool PaintScrollbar(WebRenderBackendData&, const LayoutDeviceRect& aRect,
bool aHorizontal, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio) override {
const EventStates& aDocumentState, UseSystemColors,
DPIRatio) override {
// Draw nothing; the scrollbar track is drawn in PaintScrollbarTrack.
return true;
}
Expand All @@ -88,12 +87,12 @@ class nsNativeBasicThemeCocoa : public nsNativeBasicTheme {

bool PaintScrollCorner(DrawTarget&, const LayoutDeviceRect& aRect,
nsIFrame* aFrame, const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio aDpiRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio aDpiRatio) override;
bool PaintScrollCorner(WebRenderBackendData&, const LayoutDeviceRect& aRect,
nsIFrame* aFrame, const ComputedStyle& aStyle,
const EventStates& aDocumentState,
UseSystemColors, DPIRatio aDpiRatio) override;
const EventStates& aDocumentState, UseSystemColors,
DPIRatio aDpiRatio) override;

ThemeGeometryType ThemeGeometryTypeForWidget(nsIFrame*,
StyleAppearance) override;
Expand Down

0 comments on commit 81b14e2

Please sign in to comment.