Skip to content

Commit 692bda1

Browse files
author
Butkovits Atila
committed
Backed out changeset c4b44c4ef15b (bug 1714307) for causing build bustages on nsHTTPCompressConv.h. CLOSED TREE
1 parent 98146ae commit 692bda1

File tree

201 files changed

+1248
-1457
lines changed

Some content is hidden

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

201 files changed

+1248
-1457
lines changed

netwerk/base/Dashboard.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,10 +1148,10 @@ nsresult Dashboard::TestNewConnection(ConnectionData* aConnectionData) {
11481148
return rv;
11491149
}
11501150

1151-
using ErrorEntry = struct {
1151+
typedef struct {
11521152
nsresult key;
11531153
const char* error;
1154-
};
1154+
} ErrorEntry;
11551155

11561156
#undef ERROR
11571157
#define ERROR(key, val) \

netwerk/base/EventTokenBucket.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond, uint32_t burstSize)
9090
nsresult rv;
9191
nsCOMPtr<nsIEventTarget> sts;
9292
nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
93-
if (NS_SUCCEEDED(rv)) {
93+
if (NS_SUCCEEDED(rv))
9494
sts = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
95-
}
9695
if (NS_SUCCEEDED(rv)) mTimer = NS_NewTimer(sts);
9796
SetRate(eventsPerSecond, burstSize);
9897
}
@@ -262,9 +261,8 @@ void EventTokenBucket::DispatchEvents() {
262261

263262
void EventTokenBucket::UpdateTimer() {
264263
MOZ_ASSERT(OnSocketThread(), "not on socket thread");
265-
if (mTimerArmed || mPaused || mStopped || !mEvents.GetSize() || !mTimer) {
264+
if (mTimerArmed || mPaused || mStopped || !mEvents.GetSize() || !mTimer)
266265
return;
267-
}
268266

269267
if (mCredit >= mUnitCost) return;
270268

@@ -275,11 +273,10 @@ void EventTokenBucket::UpdateTimer() {
275273
uint64_t deficit = mUnitCost - mCredit;
276274
uint64_t msecWait = (deficit + (kUsecPerMsec - 1)) / kUsecPerMsec;
277275

278-
if (msecWait < 4) { // minimum wait
276+
if (msecWait < 4) // minimum wait
279277
msecWait = 4;
280-
} else if (msecWait > 60000) { // maximum wait
278+
else if (msecWait > 60000) // maximum wait
281279
msecWait = 60000;
282-
}
283280

284281
#ifdef XP_WIN
285282
FineGrainTimers();

netwerk/base/EventTokenBucket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class EventTokenBucket : public nsITimerCallback,
103103
friend class RunNotifyEvent;
104104
friend class SetTimerEvent;
105105

106-
bool TryImmediateDispatch(TokenBucketCancelable* cancelable);
106+
bool TryImmediateDispatch(TokenBucketCancelable* event);
107107
void SetRate(uint32_t eventsPerSecond, uint32_t burstSize);
108108

109109
void DispatchEvents();

netwerk/base/IOActivityMonitor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace net {
2929

3030
#define IO_ACTIVITY_ENABLED_PREF "io.activity.enabled"
3131

32-
using Activities = nsTHashMap<nsCStringHashKey, dom::IOActivityDataDictionary>;
32+
typedef nsTHashMap<nsCStringHashKey, dom::IOActivityDataDictionary> Activities;
3333

3434
// IOActivityMonitor has several roles:
3535
// - maintains an IOActivity per resource and updates it

netwerk/base/LoadContextInfo.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ LoadContextInfo* GetLoadContextInfo(nsIChannel* aChannel);
4141
LoadContextInfo* GetLoadContextInfo(nsILoadContext* aLoadContext,
4242
bool aIsAnonymous);
4343

44-
LoadContextInfo* GetLoadContextInfo(nsIDOMWindow* aWindow, bool aIsAnonymous);
44+
LoadContextInfo* GetLoadContextInfo(nsIDOMWindow* aLoadContext,
45+
bool aIsAnonymous);
4546

4647
LoadContextInfo* GetLoadContextInfo(nsILoadContextInfo* aInfo);
4748

netwerk/base/LoadInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ nsIPrincipal* LoadInfo::FindPrincipalToInherit(nsIChannel* aChannel) {
832832
Unused << aChannel->GetOriginalURI(getter_AddRefs(uri));
833833
}
834834

835-
auto* prin = BasePrincipal::Cast(mTriggeringPrincipal);
835+
auto prin = BasePrincipal::Cast(mTriggeringPrincipal);
836836
return prin->PrincipalToInherit(uri);
837837
}
838838

netwerk/base/LoadInfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ nsresult LoadInfoArgsToLoadInfo(
4848

4949
namespace net {
5050

51-
using RedirectHistoryArray = nsTArray<nsCOMPtr<nsIRedirectHistoryEntry>>;
51+
typedef nsTArray<nsCOMPtr<nsIRedirectHistoryEntry>> RedirectHistoryArray;
5252

5353
/**
5454
* Class that provides an nsILoadInfo implementation.
@@ -280,7 +280,7 @@ class LoadInfo final : public nsILoadInfo {
280280
nsWeakPtr mContextForTopLevelLoad;
281281
nsSecurityFlags mSecurityFlags;
282282
uint32_t mSandboxFlags;
283-
uint32_t mTriggeringSandboxFlags = 0;
283+
uint32_t mTriggeringSandboxFlags;
284284
nsContentPolicyType mInternalContentPolicyType;
285285
LoadTainting mTainting = LoadTainting::Basic;
286286
bool mBlockAllMixedContent = false;

netwerk/base/MemoryDownloader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MemoryDownloader final : public nsIStreamListener {
2929
NS_DECL_NSIREQUESTOBSERVER
3030
NS_DECL_NSISTREAMLISTENER
3131

32-
using Data = mozilla::UniquePtr<FallibleTArray<uint8_t>>;
32+
typedef mozilla::UniquePtr<FallibleTArray<uint8_t>> Data;
3333

3434
class IObserver : public nsISupports {
3535
public:

netwerk/base/NetworkConnectivityService.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,13 @@ static inline bool NAT64PrefixFromPref(NetAddr* prefix) {
136136

137137
nsresult rv = Preferences::GetCString(
138138
"network.connectivity-service.nat64-prefix", nat64PrefixPref);
139-
return !(NS_FAILED(rv) || nat64PrefixPref.IsEmpty() ||
140-
NS_FAILED(prefix->InitFromString(nat64PrefixPref)) ||
141-
prefix->raw.family != PR_AF_INET6);
139+
if (NS_FAILED(rv) || nat64PrefixPref.IsEmpty() ||
140+
NS_FAILED(prefix->InitFromString(nat64PrefixPref)) ||
141+
prefix->raw.family != PR_AF_INET6) {
142+
return false;
143+
}
144+
145+
return true;
142146
}
143147

144148
static inline bool NAT64PrefixCompare(const NetAddr& prefix1,

netwerk/base/NetworkDataCountLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static PRIOMethods* sNetworkDataCountLayerMethodsPtr = nullptr;
1818

1919
class NetworkDataCountSecret {
2020
public:
21-
NetworkDataCountSecret() = default;
21+
NetworkDataCountSecret() {}
2222

2323
uint64_t mSentBytes = 0;
2424
uint64_t mReceivedBytes = 0;

0 commit comments

Comments
 (0)