Skip to content

Commit 2f3eb78

Browse files
valentingvalenting
committed
Bug 1596845 - Turn nsIDNSService dns flags into a cenum r=necko-reviewers,geckoview-reviewers,kershaw,m_kato
This allows us to use a consistent size for the dnsFlags field. across different files (previously some would use uint16_t and some uint32_t). It also improves type safety - making sure we don't pass in the wrong value to DNSFlags. Depends on D164856 Differential Revision: https://phabricator.services.mozilla.com/D164857
1 parent ff04cde commit 2f3eb78

Some content is hidden

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

42 files changed

+310
-282
lines changed

‎dom/html/HTMLDNSPrefetch.cpp

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class DeferredDNSPrefetches final : public nsIWebProgressListener,
9696
DeferredDNSPrefetches();
9797

9898
void Activate();
99-
nsresult Add(uint32_t flags, SupportsDNSPrefetch&, Element&);
99+
nsresult Add(nsIDNSService::DNSFlags flags, SupportsDNSPrefetch&, Element&);
100100

101101
void RemoveUnboundLinks();
102102

@@ -105,7 +105,7 @@ class DeferredDNSPrefetches final : public nsIWebProgressListener,
105105
void Flush();
106106

107107
void SubmitQueue();
108-
void SubmitQueueEntry(Element&, uint32_t aFlags);
108+
void SubmitQueueEntry(Element&, nsIDNSService::DNSFlags aFlags);
109109

110110
uint16_t mHead;
111111
uint16_t mTail;
@@ -119,7 +119,7 @@ class DeferredDNSPrefetches final : public nsIWebProgressListener,
119119
static const int sMaxDeferredMask = (sMaxDeferred - 1);
120120

121121
struct deferred_entry {
122-
uint32_t mFlags;
122+
nsIDNSService::DNSFlags mFlags;
123123
// SupportsDNSPrefetch clears this raw pointer in Destroyed().
124124
Element* mElement;
125125
} mEntries[sMaxDeferred];
@@ -184,25 +184,26 @@ bool HTMLDNSPrefetch::IsAllowed(Document* aDocument) {
184184
return aDocument->IsDNSPrefetchAllowed() && aDocument->GetWindow();
185185
}
186186

187-
static uint32_t GetDNSFlagsFromElement(Element& aElement) {
187+
static nsIDNSService::DNSFlags GetDNSFlagsFromElement(Element& aElement) {
188188
nsIChannel* channel = aElement.OwnerDoc()->GetChannel();
189189
if (!channel) {
190-
return 0;
190+
return nsIDNSService::RESOLVE_DEFAULT_FLAGS;
191191
}
192192
return nsIDNSService::GetFlagsFromTRRMode(channel->GetTRRMode());
193193
}
194194

195-
uint32_t HTMLDNSPrefetch::PriorityToDNSServiceFlags(Priority aPriority) {
195+
nsIDNSService::DNSFlags HTMLDNSPrefetch::PriorityToDNSServiceFlags(
196+
Priority aPriority) {
196197
switch (aPriority) {
197198
case Priority::Low:
198-
return uint32_t(nsIDNSService::RESOLVE_PRIORITY_LOW);
199+
return nsIDNSService::RESOLVE_PRIORITY_LOW;
199200
case Priority::Medium:
200-
return uint32_t(nsIDNSService::RESOLVE_PRIORITY_MEDIUM);
201+
return nsIDNSService::RESOLVE_PRIORITY_MEDIUM;
201202
case Priority::High:
202-
return 0u;
203+
return nsIDNSService::RESOLVE_DEFAULT_FLAGS;
203204
}
204205
MOZ_ASSERT_UNREACHABLE("Unknown priority");
205-
return 0u;
206+
return nsIDNSService::RESOLVE_DEFAULT_FLAGS;
206207
}
207208

208209
nsresult HTMLDNSPrefetch::Prefetch(SupportsDNSPrefetch& aSupports,
@@ -219,7 +220,7 @@ nsresult HTMLDNSPrefetch::Prefetch(SupportsDNSPrefetch& aSupports,
219220
nsresult HTMLDNSPrefetch::Prefetch(
220221
const nsAString& hostname, bool isHttps,
221222
const OriginAttributes& aPartitionedPrincipalOriginAttributes,
222-
uint32_t flags) {
223+
nsIDNSService::DNSFlags flags) {
223224
if (IsNeckoChild()) {
224225
// We need to check IsEmpty() because net_IsValidHostName()
225226
// considers empty strings to be valid hostnames
@@ -276,7 +277,7 @@ nsresult HTMLDNSPrefetch::CancelPrefetch(SupportsDNSPrefetch& aSupports,
276277
return NS_ERROR_NOT_AVAILABLE;
277278
}
278279

279-
uint32_t flags =
280+
nsIDNSService::DNSFlags flags =
280281
GetDNSFlagsFromElement(aElement) | PriorityToDNSServiceFlags(aPriority);
281282

282283
nsIURI* uri = aSupports.GetURIForDNSPrefetch(aElement);
@@ -301,7 +302,7 @@ nsresult HTMLDNSPrefetch::CancelPrefetch(SupportsDNSPrefetch& aSupports,
301302
nsresult HTMLDNSPrefetch::CancelPrefetch(
302303
const nsAString& hostname, bool isHttps,
303304
const OriginAttributes& aPartitionedPrincipalOriginAttributes,
304-
uint32_t flags, nsresult aReason) {
305+
nsIDNSService::DNSFlags flags, nsresult aReason) {
305306
// Forward this request to Necko Parent if we're a child process
306307
if (IsNeckoChild()) {
307308
// We need to check IsEmpty() because net_IsValidHostName()
@@ -409,7 +410,7 @@ void DeferredDNSPrefetches::Flush() {
409410
}
410411
}
411412

412-
nsresult DeferredDNSPrefetches::Add(uint32_t flags,
413+
nsresult DeferredDNSPrefetches::Add(nsIDNSService::DNSFlags flags,
413414
SupportsDNSPrefetch& aSupports,
414415
Element& aElement) {
415416
// The FIFO has no lock, so it can only be accessed on main thread
@@ -460,7 +461,7 @@ void DeferredDNSPrefetches::SubmitQueue() {
460461
}
461462

462463
void DeferredDNSPrefetches::SubmitQueueEntry(Element& aElement,
463-
uint32_t aFlags) {
464+
nsIDNSService::DNSFlags aFlags) {
464465
auto& supports = ToSupportsDNSPrefetch(aElement);
465466
supports.ClearIsInDNSPrefetch();
466467

‎dom/html/HTMLDNSPrefetch.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "nsCOMPtr.h"
1111
#include "nsIRequest.h"
1212
#include "nsString.h"
13+
#include "nsIDNSService.h"
1314

1415
class nsITimer;
1516
class nsIURI;
@@ -68,16 +69,16 @@ class HTMLDNSPrefetch {
6869
static void ElementDestroyed(Element&, SupportsDNSPrefetch&);
6970

7071
private:
71-
static uint32_t PriorityToDNSServiceFlags(Priority);
72+
static nsIDNSService::DNSFlags PriorityToDNSServiceFlags(Priority);
7273

7374
static nsresult Prefetch(
7475
const nsAString& host, bool isHttps,
7576
const OriginAttributes& aPartitionedPrincipalOriginAttributes,
76-
uint32_t flags);
77+
nsIDNSService::DNSFlags flags);
7778
static nsresult CancelPrefetch(
7879
const nsAString& hostname, bool isHttps,
7980
const OriginAttributes& aPartitionedPrincipalOriginAttributes,
80-
uint32_t flags, nsresult aReason);
81+
nsIDNSService::DNSFlags flags, nsresult aReason);
8182

8283
friend class net::NeckoParent;
8384
};

‎dom/media/webrtc/transport/nriceresolver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ int NrIceResolver::resolve(nr_resolver_resource* resource,
147147
MOZ_ASSERT(allocated_resolvers_ > 0);
148148
ASSERT_ON_THREAD(sts_thread_);
149149
RefPtr<PendingResolution> pr;
150-
uint32_t resolve_flags = 0;
150+
nsIDNSService::DNSFlags resolve_flags = nsIDNSService::RESOLVE_DEFAULT_FLAGS;
151151
OriginAttributes attrs;
152152

153153
if (resource->transport_protocol != IPPROTO_UDP &&
@@ -162,10 +162,10 @@ int NrIceResolver::resolve(nr_resolver_resource* resource,
162162

163163
switch (resource->address_family) {
164164
case AF_INET:
165-
resolve_flags |= nsIDNSService::RESOLVE_DISABLE_IPV6;
165+
resolve_flags = nsIDNSService::RESOLVE_DISABLE_IPV6;
166166
break;
167167
case AF_INET6:
168-
resolve_flags |= nsIDNSService::RESOLVE_DISABLE_IPV4;
168+
resolve_flags = nsIDNSService::RESOLVE_DISABLE_IPV4;
169169
break;
170170
default:
171171
ABORT(R_BAD_ARGS);

‎netwerk/base/Dashboard.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,8 @@ Dashboard::RequestDNSLookup(const nsACString& aHost,
943943
helper->mEventTarget = GetCurrentEventTarget();
944944
OriginAttributes attrs;
945945
rv = mDnsService->AsyncResolveNative(
946-
aHost, nsIDNSService::RESOLVE_TYPE_DEFAULT, 0, nullptr, helper.get(),
946+
aHost, nsIDNSService::RESOLVE_TYPE_DEFAULT,
947+
nsIDNSService::RESOLVE_DEFAULT_FLAGS, nullptr, helper.get(),
947948
NS_GetCurrentThread(), attrs, getter_AddRefs(helper->mCancel));
948949
return rv;
949950
}
@@ -966,7 +967,8 @@ Dashboard::RequestDNSHTTPSRRLookup(const nsACString& aHost,
966967
helper->mEventTarget = GetCurrentEventTarget();
967968
OriginAttributes attrs;
968969
rv = mDnsService->AsyncResolveNative(
969-
aHost, nsIDNSService::RESOLVE_TYPE_HTTPSSVC, 0, nullptr, helper.get(),
970+
aHost, nsIDNSService::RESOLVE_TYPE_HTTPSSVC,
971+
nsIDNSService::RESOLVE_DEFAULT_FLAGS, nullptr, helper.get(),
970972
NS_GetCurrentThread(), attrs, getter_AddRefs(helper->mCancel));
971973
return rv;
972974
}

‎netwerk/base/ProxyAutoConfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ bool ProxyAutoConfig::ResolveAddress(const nsACString& aHostName,
239239
// When the PAC script attempts to resolve a domain, we must make sure we
240240
// don't use TRR, otherwise the TRR channel might also attempt to resolve
241241
// a name and we'll have a deadlock.
242-
uint32_t flags =
242+
nsIDNSService::DNSFlags flags =
243243
nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
244244
nsIDNSService::GetFlagsFromTRRMode(nsIRequest::TRR_DISABLED_MODE);
245245

‎netwerk/base/nsDNSPrefetch.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ nsDNSPrefetch::nsDNSPrefetch(nsIURI* aURI,
5353
aURI->GetAsciiHost(mHostname);
5454
}
5555

56-
nsresult nsDNSPrefetch::Prefetch(uint32_t flags) {
56+
nsresult nsDNSPrefetch::Prefetch(nsIDNSService::DNSFlags flags) {
5757
if (mHostname.IsEmpty()) return NS_ERROR_NOT_AVAILABLE;
5858

5959
if (!sDNSService) return NS_ERROR_NOT_AVAILABLE;
@@ -77,16 +77,19 @@ nsresult nsDNSPrefetch::Prefetch(uint32_t flags) {
7777

7878
nsresult nsDNSPrefetch::PrefetchLow(bool refreshDNS) {
7979
return Prefetch(nsIDNSService::RESOLVE_PRIORITY_LOW |
80-
(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE : 0));
80+
(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE
81+
: nsIDNSService::RESOLVE_DEFAULT_FLAGS));
8182
}
8283

8384
nsresult nsDNSPrefetch::PrefetchMedium(bool refreshDNS) {
8485
return Prefetch(nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
85-
(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE : 0));
86+
(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE
87+
: nsIDNSService::RESOLVE_DEFAULT_FLAGS));
8688
}
8789

8890
nsresult nsDNSPrefetch::PrefetchHigh(bool refreshDNS) {
89-
return Prefetch(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE : 0);
91+
return Prefetch(refreshDNS ? nsIDNSService::RESOLVE_BYPASS_CACHE
92+
: nsIDNSService::RESOLVE_DEFAULT_FLAGS);
9093
}
9194

9295
namespace {
@@ -130,7 +133,7 @@ nsresult nsDNSPrefetch::FetchHTTPSSVC(
130133
}
131134

132135
nsCOMPtr<nsIEventTarget> target = mozilla::GetCurrentEventTarget();
133-
uint32_t flags = nsIDNSService::GetFlagsFromTRRMode(mTRRMode);
136+
nsIDNSService::DNSFlags flags = nsIDNSService::GetFlagsFromTRRMode(mTRRMode);
134137
if (aRefreshDNS) {
135138
flags |= nsIDNSService::RESOLVE_BYPASS_CACHE;
136139
}

‎netwerk/base/nsDNSPrefetch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include "nsIDNSListener.h"
1818
#include "nsIRequest.h"
19+
#include "nsIDNSService.h"
1920

2021
class nsIURI;
21-
class nsIDNSService;
2222
class nsIDNSHTTPSSVCRecord;
2323

2424
class nsDNSPrefetch final : public nsIDNSListener {
@@ -63,7 +63,7 @@ class nsDNSPrefetch final : public nsIDNSListener {
6363
mozilla::TimeStamp mEndTimestamp;
6464
nsWeakPtr mListener;
6565

66-
nsresult Prefetch(uint32_t flags);
66+
nsresult Prefetch(nsIDNSService::DNSFlags flags);
6767
};
6868

6969
#endif

‎netwerk/base/nsSocketTransport2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ nsresult nsSocketTransport::ResolveHost() {
987987

988988
mResolving = true;
989989

990-
uint32_t dnsFlags = 0;
990+
nsIDNSService::DNSFlags dnsFlags = nsIDNSService::RESOLVE_DEFAULT_FLAGS;
991991
if (mConnectionFlags & nsSocketTransport::BYPASS_CACHE) {
992992
dnsFlags = nsIDNSService::RESOLVE_BYPASS_CACHE;
993993
}

‎netwerk/base/nsUDPSocket.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ static nsresult ResolveHost(const nsACString& host,
6767
}
6868

6969
nsCOMPtr<nsICancelable> tmpOutstanding;
70-
return dns->AsyncResolveNative(host, nsIDNSService::RESOLVE_TYPE_DEFAULT, 0,
71-
nullptr, listener, nullptr, aOriginAttributes,
70+
return dns->AsyncResolveNative(host, nsIDNSService::RESOLVE_TYPE_DEFAULT,
71+
nsIDNSService::RESOLVE_DEFAULT_FLAGS, nullptr,
72+
listener, nullptr, aOriginAttributes,
7273
getter_AddRefs(tmpOutstanding));
7374
}
7475

‎netwerk/dns/ChildDNSService.cpp

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ ChildDNSService::ChildDNSService() {
6868

6969
void ChildDNSService::GetDNSRecordHashKey(
7070
const nsACString& aHost, const nsACString& aTrrServer, int32_t aPort,
71-
uint16_t aType, const OriginAttributes& aOriginAttributes, uint32_t aFlags,
72-
uintptr_t aListenerAddr, nsACString& aHashKey) {
71+
uint16_t aType, const OriginAttributes& aOriginAttributes,
72+
nsIDNSService::DNSFlags aFlags, uintptr_t aListenerAddr,
73+
nsACString& aHashKey) {
7374
aHashKey.Assign(aHost);
7475
aHashKey.Assign(aTrrServer);
7576
aHashKey.AppendInt(aPort);
@@ -84,7 +85,7 @@ void ChildDNSService::GetDNSRecordHashKey(
8485
}
8586

8687
nsresult ChildDNSService::AsyncResolveInternal(
87-
const nsACString& hostname, uint16_t type, uint32_t flags,
88+
const nsACString& hostname, uint16_t type, nsIDNSService::DNSFlags flags,
8889
nsIDNSAdditionalInfo* aInfo, nsIDNSListener* listener,
8990
nsIEventTarget* target_, const OriginAttributes& aOriginAttributes,
9091
nsICancelable** result) {
@@ -157,7 +158,7 @@ nsresult ChildDNSService::AsyncResolveInternal(
157158
}
158159

159160
nsresult ChildDNSService::CancelAsyncResolveInternal(
160-
const nsACString& aHostname, uint16_t aType, uint32_t aFlags,
161+
const nsACString& aHostname, uint16_t aType, nsIDNSService::DNSFlags aFlags,
161162
nsIDNSAdditionalInfo* aInfo, nsIDNSListener* aListener, nsresult aReason,
162163
const OriginAttributes& aOriginAttributes) {
163164
if (mDisablePrefetch && (aFlags & RESOLVE_SPECULATE)) {
@@ -185,7 +186,8 @@ nsresult ChildDNSService::CancelAsyncResolveInternal(
185186

186187
NS_IMETHODIMP
187188
ChildDNSService::AsyncResolve(const nsACString& hostname,
188-
nsIDNSService::ResolveType aType, uint32_t flags,
189+
nsIDNSService::ResolveType aType,
190+
nsIDNSService::DNSFlags flags,
189191
nsIDNSAdditionalInfo* aInfo,
190192
nsIDNSListener* listener, nsIEventTarget* target_,
191193
JS::Handle<JS::Value> aOriginAttributes,
@@ -204,13 +206,11 @@ ChildDNSService::AsyncResolve(const nsACString& hostname,
204206
}
205207

206208
NS_IMETHODIMP
207-
ChildDNSService::AsyncResolveNative(const nsACString& hostname,
208-
nsIDNSService::ResolveType aType,
209-
uint32_t flags, nsIDNSAdditionalInfo* aInfo,
210-
nsIDNSListener* listener,
211-
nsIEventTarget* target_,
212-
const OriginAttributes& aOriginAttributes,
213-
nsICancelable** result) {
209+
ChildDNSService::AsyncResolveNative(
210+
const nsACString& hostname, nsIDNSService::ResolveType aType,
211+
nsIDNSService::DNSFlags flags, nsIDNSAdditionalInfo* aInfo,
212+
nsIDNSListener* listener, nsIEventTarget* target_,
213+
const OriginAttributes& aOriginAttributes, nsICancelable** result) {
214214
return AsyncResolveInternal(hostname, aType, flags, aInfo, listener, target_,
215215
aOriginAttributes, result);
216216
}
@@ -226,7 +226,7 @@ ChildDNSService::NewAdditionalInfo(const nsACString& aTrrURL, int32_t aPort,
226226
NS_IMETHODIMP
227227
ChildDNSService::CancelAsyncResolve(const nsACString& aHostname,
228228
nsIDNSService::ResolveType aType,
229-
uint32_t aFlags,
229+
nsIDNSService::DNSFlags aFlags,
230230
nsIDNSAdditionalInfo* aInfo,
231231
nsIDNSListener* aListener, nsresult aReason,
232232
JS::Handle<JS::Value> aOriginAttributes,
@@ -246,22 +246,25 @@ ChildDNSService::CancelAsyncResolve(const nsACString& aHostname,
246246
NS_IMETHODIMP
247247
ChildDNSService::CancelAsyncResolveNative(
248248
const nsACString& aHostname, nsIDNSService::ResolveType aType,
249-
uint32_t aFlags, nsIDNSAdditionalInfo* aInfo, nsIDNSListener* aListener,
250-
nsresult aReason, const OriginAttributes& aOriginAttributes) {
249+
nsIDNSService::DNSFlags aFlags, nsIDNSAdditionalInfo* aInfo,
250+
nsIDNSListener* aListener, nsresult aReason,
251+
const OriginAttributes& aOriginAttributes) {
251252
return CancelAsyncResolveInternal(aHostname, aType, aFlags, aInfo, aListener,
252253
aReason, aOriginAttributes);
253254
}
254255

255256
NS_IMETHODIMP
256-
ChildDNSService::Resolve(const nsACString& hostname, uint32_t flags,
257+
ChildDNSService::Resolve(const nsACString& hostname,
258+
nsIDNSService::DNSFlags flags,
257259
JS::Handle<JS::Value> aOriginAttributes,
258260
JSContext* aCx, uint8_t aArgc, nsIDNSRecord** result) {
259261
// not planning to ever support this, since sync IPDL is evil.
260262
return NS_ERROR_NOT_AVAILABLE;
261263
}
262264

263265
NS_IMETHODIMP
264-
ChildDNSService::ResolveNative(const nsACString& hostname, uint32_t flags,
266+
ChildDNSService::ResolveNative(const nsACString& hostname,
267+
nsIDNSService::DNSFlags flags,
265268
const OriginAttributes& aOriginAttributes,
266269
nsIDNSRecord** result) {
267270
// not planning to ever support this, since sync IPDL is evil.
@@ -368,7 +371,8 @@ ChildDNSService::GetODoHActivated(bool* aResult) {
368371

369372
void ChildDNSService::NotifyRequestDone(DNSRequestSender* aDnsRequest) {
370373
// We need the original flags and listener for the pending requests hash.
371-
uint32_t originalFlags = aDnsRequest->mFlags & ~RESOLVE_OFFLINE;
374+
nsIDNSService::DNSFlags originalFlags =
375+
aDnsRequest->mFlags & ~RESOLVE_OFFLINE;
372376
uintptr_t originalListenerAddr =
373377
reinterpret_cast<uintptr_t>(aDnsRequest->mListener.get());
374378
RefPtr<DNSListenerProxy> wrapper = do_QueryObject(aDnsRequest->mListener);

‎netwerk/dns/ChildDNSService.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,19 @@ class ChildDNSService final : public DNSServiceBase, public nsPIDNSService {
4444
void MOZ_ALWAYS_INLINE GetDNSRecordHashKey(
4545
const nsACString& aHost, const nsACString& aTrrServer, int32_t aPort,
4646
uint16_t aType, const OriginAttributes& aOriginAttributes,
47-
uint32_t aFlags, uintptr_t aListenerAddr, nsACString& aHashKey);
47+
nsIDNSService::DNSFlags aFlags, uintptr_t aListenerAddr,
48+
nsACString& aHashKey);
4849
nsresult AsyncResolveInternal(const nsACString& hostname, uint16_t type,
49-
uint32_t flags, nsIDNSAdditionalInfo* aInfo,
50+
nsIDNSService::DNSFlags flags,
51+
nsIDNSAdditionalInfo* aInfo,
5052
nsIDNSListener* listener,
5153
nsIEventTarget* target_,
5254
const OriginAttributes& aOriginAttributes,
5355
nsICancelable** result);
5456
nsresult CancelAsyncResolveInternal(
55-
const nsACString& aHostname, uint16_t aType, uint32_t aFlags,
56-
nsIDNSAdditionalInfo* aInfo, nsIDNSListener* aListener, nsresult aReason,
57+
const nsACString& aHostname, uint16_t aType,
58+
nsIDNSService::DNSFlags aFlags, nsIDNSAdditionalInfo* aInfo,
59+
nsIDNSListener* aListener, nsresult aReason,
5760
const OriginAttributes& aOriginAttributes);
5861

5962
bool mODoHActivated = false;

0 commit comments

Comments
 (0)