Skip to content

Commit 6d8bc2e

Browse files
eqrioneqrion
committed
Bug 1523969 part 23 - Move method definition inline comments to new line in 'toolkit/'. r=ehsan
Differential Revision: https://phabricator.services.mozilla.com/D21124 --HG-- extra : rebase_source : f44a8f1cd9e2e73b6bb2a994d9aeb42779d2d36f extra : histedit_source : f39b1350e24c58104047e65f14883ee3f710a295
1 parent 9a799db commit 6d8bc2e

File tree

23 files changed

+241
-161
lines changed

23 files changed

+241
-161
lines changed

‎toolkit/components/alerts/nsXULAlerts.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ nsXULAlertObserver::Observe(nsISupports* aSubject, const char* aTopic,
6666
NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb,
6767
nsIAlertsIconURI)
6868

69-
/* static */ already_AddRefed<nsXULAlerts> nsXULAlerts::GetInstance() {
69+
/* static */
70+
already_AddRefed<nsXULAlerts> nsXULAlerts::GetInstance() {
7071
// Gecko on Android does not fully support XUL windows.
7172
#ifndef MOZ_WIDGET_ANDROID
7273
if (!gXULAlerts) {

‎toolkit/components/antitracking/AntiTrackingCommon.cpp‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -926,8 +926,8 @@ AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
926926
return storePermission(false);
927927
}
928928

929-
/* static */ RefPtr<
930-
mozilla::AntiTrackingCommon::FirstPartyStorageAccessGrantPromise>
929+
/* static */
930+
RefPtr<mozilla::AntiTrackingCommon::FirstPartyStorageAccessGrantPromise>
931931
AntiTrackingCommon::SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
932932
nsIPrincipal* aParentPrincipal, nsIPrincipal* aTrackingPrincipal,
933933
const nsCString& aTrackingOrigin, const nsCString& aGrantedOrigin,
@@ -1507,7 +1507,8 @@ bool AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
15071507
return behavior != nsICookieService::BEHAVIOR_REJECT;
15081508
}
15091509

1510-
/* static */ bool AntiTrackingCommon::MaybeIsFirstPartyStorageAccessGrantedFor(
1510+
/* static */
1511+
bool AntiTrackingCommon::MaybeIsFirstPartyStorageAccessGrantedFor(
15111512
nsPIDOMWindowInner* aFirstPartyWindow, nsIURI* aURI) {
15121513
MOZ_ASSERT(aFirstPartyWindow);
15131514
MOZ_ASSERT(aURI);
@@ -1664,9 +1665,10 @@ nsresult AntiTrackingCommon::IsOnContentBlockingAllowList(
16641665
return NS_OK;
16651666
}
16661667

1667-
/* static */ void AntiTrackingCommon::NotifyBlockingDecision(
1668-
nsIChannel* aChannel, BlockingDecision aDecision,
1669-
uint32_t aRejectedReason) {
1668+
/* static */
1669+
void AntiTrackingCommon::NotifyBlockingDecision(nsIChannel* aChannel,
1670+
BlockingDecision aDecision,
1671+
uint32_t aRejectedReason) {
16701672
MOZ_ASSERT(
16711673
aRejectedReason == 0 ||
16721674
aRejectedReason ==
@@ -1729,9 +1731,10 @@ nsresult AntiTrackingCommon::IsOnContentBlockingAllowList(
17291731
aChannel, false, uri);
17301732
}
17311733

1732-
/* static */ void AntiTrackingCommon::NotifyBlockingDecision(
1733-
nsPIDOMWindowInner* aWindow, BlockingDecision aDecision,
1734-
uint32_t aRejectedReason) {
1734+
/* static */
1735+
void AntiTrackingCommon::NotifyBlockingDecision(nsPIDOMWindowInner* aWindow,
1736+
BlockingDecision aDecision,
1737+
uint32_t aRejectedReason) {
17351738
MOZ_ASSERT(aWindow);
17361739
MOZ_ASSERT(
17371740
aRejectedReason == 0 ||
@@ -1778,8 +1781,8 @@ nsresult AntiTrackingCommon::IsOnContentBlockingAllowList(
17781781
channel, false, uri);
17791782
}
17801783

1781-
/* static */ void AntiTrackingCommon::StoreUserInteractionFor(
1782-
nsIPrincipal* aPrincipal) {
1784+
/* static */
1785+
void AntiTrackingCommon::StoreUserInteractionFor(nsIPrincipal* aPrincipal) {
17831786
if (XRE_IsParentProcess()) {
17841787
nsCOMPtr<nsIURI> uri;
17851788
Unused << aPrincipal->GetURI(getter_AddRefs(uri));
@@ -1824,8 +1827,8 @@ nsresult AntiTrackingCommon::IsOnContentBlockingAllowList(
18241827
cc->SendStoreUserInteractionAsPermission(IPC::Principal(aPrincipal));
18251828
}
18261829

1827-
/* static */ bool AntiTrackingCommon::HasUserInteraction(
1828-
nsIPrincipal* aPrincipal) {
1830+
/* static */
1831+
bool AntiTrackingCommon::HasUserInteraction(nsIPrincipal* aPrincipal) {
18291832
nsPermissionManager* permManager = nsPermissionManager::GetInstance();
18301833
if (NS_WARN_IF(!permManager)) {
18311834
return false;
@@ -1876,8 +1879,9 @@ void AntiTrackingCommon::OnAntiTrackingSettingsChanged(
18761879
gSettingsChangedCallbacks->AppendElement(aCallback);
18771880
}
18781881

1879-
/* static */ already_AddRefed<nsIURI>
1880-
AntiTrackingCommon::MaybeGetDocumentURIBeingLoaded(nsIChannel* aChannel) {
1882+
/* static */
1883+
already_AddRefed<nsIURI> AntiTrackingCommon::MaybeGetDocumentURIBeingLoaded(
1884+
nsIChannel* aChannel) {
18811885
nsCOMPtr<nsIURI> uriBeingLoaded;
18821886
nsLoadFlags loadFlags = 0;
18831887
nsresult rv = aChannel->GetLoadFlags(&loadFlags);

‎toolkit/components/browser/nsWebBrowser.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ nsIWidget* nsWebBrowser::EnsureWidget() {
9999
return mInternalWidget;
100100
}
101101

102-
/* static */ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
102+
/* static */
103+
already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
103104
nsIWebBrowserChrome* aContainerWindow, nsIWidget* aParentWidget,
104105
const OriginAttributes& aOriginAttributes, mozIDOMWindowProxy* aOpener,
105106
int aItemType) {
@@ -373,7 +374,8 @@ nsWebBrowser::NameEquals(const nsAString& aName, bool* aResult) {
373374
return NS_OK;
374375
}
375376

376-
/* virtual */ int32_t nsWebBrowser::ItemType() { return mContentType; }
377+
/* virtual */
378+
int32_t nsWebBrowser::ItemType() { return mContentType; }
377379

378380
NS_IMETHODIMP
379381
nsWebBrowser::GetItemType(int32_t* aItemType) {

‎toolkit/components/clearsitedata/ClearSiteData.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ NS_INTERFACE_MAP_END
107107
NS_IMPL_ADDREF(ClearSiteData::PendingCleanupHolder)
108108
NS_IMPL_RELEASE(ClearSiteData::PendingCleanupHolder)
109109

110-
/* static */ void ClearSiteData::Initialize() {
110+
/* static */
111+
void ClearSiteData::Initialize() {
111112
MOZ_ASSERT(!gClearSiteData);
112113
MOZ_ASSERT(NS_IsMainThread());
113114

@@ -127,7 +128,8 @@ NS_IMPL_RELEASE(ClearSiteData::PendingCleanupHolder)
127128
gClearSiteData = service;
128129
}
129130

130-
/* static */ void ClearSiteData::Shutdown() {
131+
/* static */
132+
void ClearSiteData::Shutdown() {
131133
MOZ_ASSERT(NS_IsMainThread());
132134

133135
if (!gClearSiteData) {

‎toolkit/components/extensions/ExtensionPolicyService.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ static mozIExtensionProcessScript& ProcessScript() {
7676
* ExtensionPolicyService
7777
*****************************************************************************/
7878

79-
/* static */ bool ExtensionPolicyService::sRemoteExtensions;
79+
/* static */
80+
bool ExtensionPolicyService::sRemoteExtensions;
8081

8182
/* static */ ExtensionPolicyService& ExtensionPolicyService::GetSingleton() {
8283
static RefPtr<ExtensionPolicyService> sExtensionPolicyService;

‎toolkit/components/extensions/MatchPattern.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ const char* HOST_LOCATOR_SCHEMES[] = {
233233

234234
const char* WILDCARD_SCHEMES[] = {"http", "https", "ws", "wss", nullptr};
235235

236-
/* static */ already_AddRefed<MatchPattern> MatchPattern::Constructor(
236+
/* static */
237+
already_AddRefed<MatchPattern> MatchPattern::Constructor(
237238
dom::GlobalObject& aGlobal, const nsAString& aPattern,
238239
const MatchPatternOptions& aOptions, ErrorResult& aRv) {
239240
RefPtr<MatchPattern> pattern = new MatchPattern(aGlobal.GetAsSupports());
@@ -455,7 +456,8 @@ JSObject* MatchPattern::WrapObject(JSContext* aCx,
455456
return MatchPattern_Binding::Wrap(aCx, this, aGivenProto);
456457
}
457458

458-
/* static */ bool MatchPattern::MatchesAllURLs(const URLInfo& aURL) {
459+
/* static */
460+
bool MatchPattern::MatchesAllURLs(const URLInfo& aURL) {
459461
RefPtr<AtomSet> permittedSchemes = AtomSet::Get<PERMITTED_SCHEMES>();
460462
return permittedSchemes->Contains(aURL.Scheme());
461463
}
@@ -474,7 +476,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(MatchPattern)
474476
* MatchPatternSet
475477
*****************************************************************************/
476478

477-
/* static */ already_AddRefed<MatchPatternSet> MatchPatternSet::Constructor(
479+
/* static */
480+
already_AddRefed<MatchPatternSet> MatchPatternSet::Constructor(
478481
dom::GlobalObject& aGlobal,
479482
const nsTArray<dom::OwningStringOrMatchPattern>& aPatterns,
480483
const MatchPatternOptions& aOptions, ErrorResult& aRv) {
@@ -595,9 +598,11 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(MatchPatternSet)
595598

596599
MatchGlob::~MatchGlob() { mozilla::DropJSObjects(this); }
597600

598-
/* static */ already_AddRefed<MatchGlob> MatchGlob::Constructor(
599-
dom::GlobalObject& aGlobal, const nsAString& aGlob, bool aAllowQuestion,
600-
ErrorResult& aRv) {
601+
/* static */
602+
already_AddRefed<MatchGlob> MatchGlob::Constructor(dom::GlobalObject& aGlobal,
603+
const nsAString& aGlob,
604+
bool aAllowQuestion,
605+
ErrorResult& aRv) {
601606
RefPtr<MatchGlob> glob = new MatchGlob(aGlobal.GetAsSupports());
602607
glob->Init(aGlobal.Context(), aGlob, aAllowQuestion, aRv);
603608
if (aRv.Failed()) {

‎toolkit/components/extensions/WebExtensionPolicy.cpp‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,24 +197,27 @@ already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::Constructor(
197197
return policy.forget();
198198
}
199199

200-
/* static */ void WebExtensionPolicy::GetActiveExtensions(
200+
/* static */
201+
void WebExtensionPolicy::GetActiveExtensions(
201202
dom::GlobalObject& aGlobal,
202203
nsTArray<RefPtr<WebExtensionPolicy>>& aResults) {
203204
EPS().GetAll(aResults);
204205
}
205206

206-
/* static */ already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::GetByID(
207+
/* static */
208+
already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::GetByID(
207209
dom::GlobalObject& aGlobal, const nsAString& aID) {
208210
return do_AddRef(EPS().GetByID(aID));
209211
}
210212

211-
/* static */ already_AddRefed<WebExtensionPolicy>
212-
WebExtensionPolicy::GetByHostname(dom::GlobalObject& aGlobal,
213-
const nsACString& aHostname) {
213+
/* static */
214+
already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::GetByHostname(
215+
dom::GlobalObject& aGlobal, const nsACString& aHostname) {
214216
return do_AddRef(EPS().GetByHost(aHostname));
215217
}
216218

217-
/* static */ already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::GetByURI(
219+
/* static */
220+
already_AddRefed<WebExtensionPolicy> WebExtensionPolicy::GetByURI(
218221
dom::GlobalObject& aGlobal, nsIURI* aURI) {
219222
return do_AddRef(EPS().GetByURL(aURI));
220223
}
@@ -316,13 +319,13 @@ void WebExtensionPolicy::InjectContentScripts(ErrorResult& aRv) {
316319
}
317320
}
318321

319-
/* static */ bool WebExtensionPolicy::UseRemoteWebExtensions(
320-
GlobalObject& aGlobal) {
322+
/* static */
323+
bool WebExtensionPolicy::UseRemoteWebExtensions(GlobalObject& aGlobal) {
321324
return EPS().UseRemoteExtensions();
322325
}
323326

324-
/* static */ bool WebExtensionPolicy::IsExtensionProcess(
325-
GlobalObject& aGlobal) {
327+
/* static */
328+
bool WebExtensionPolicy::IsExtensionProcess(GlobalObject& aGlobal) {
326329
return EPS().IsExtensionProcess();
327330
}
328331

@@ -382,7 +385,8 @@ AtomSetPref::Observe(nsISupports* aSubject, const char* aTopic,
382385
NS_IMPL_ISUPPORTS(AtomSetPref, nsIObserver, nsISupportsWeakReference)
383386
}; // namespace
384387

385-
/* static */ bool WebExtensionPolicy::IsRestrictedDoc(const DocInfo& aDoc) {
388+
/* static */
389+
bool WebExtensionPolicy::IsRestrictedDoc(const DocInfo& aDoc) {
386390
// With the exception of top-level about:blank documents with null
387391
// principals, we never match documents that have non-codebase principals,
388392
// including those with null principals or system principals.
@@ -393,7 +397,8 @@ NS_IMPL_ISUPPORTS(AtomSetPref, nsIObserver, nsISupportsWeakReference)
393397
return IsRestrictedURI(aDoc.PrincipalURL());
394398
}
395399

396-
/* static */ bool WebExtensionPolicy::IsRestrictedURI(const URLInfo& aURI) {
400+
/* static */
401+
bool WebExtensionPolicy::IsRestrictedURI(const URLInfo& aURI) {
397402
static RefPtr<AtomSetPref> domains;
398403
if (!domains) {
399404
domains = AtomSetPref::Create(nsLiteralCString(kRestrictedDomainPref));
@@ -487,10 +492,10 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(WebExtensionPolicy)
487492
* WebExtensionContentScript / MozDocumentMatcher
488493
*****************************************************************************/
489494

490-
/* static */ already_AddRefed<MozDocumentMatcher>
491-
MozDocumentMatcher::Constructor(GlobalObject& aGlobal,
492-
const dom::MozDocumentMatcherInit& aInit,
493-
ErrorResult& aRv) {
495+
/* static */
496+
already_AddRefed<MozDocumentMatcher> MozDocumentMatcher::Constructor(
497+
GlobalObject& aGlobal, const dom::MozDocumentMatcherInit& aInit,
498+
ErrorResult& aRv) {
494499
RefPtr<MozDocumentMatcher> matcher =
495500
new MozDocumentMatcher(aGlobal, aInit, false, aRv);
496501
if (aRv.Failed()) {
@@ -499,7 +504,8 @@ MozDocumentMatcher::Constructor(GlobalObject& aGlobal,
499504
return matcher.forget();
500505
}
501506

502-
/* static */ already_AddRefed<WebExtensionContentScript>
507+
/* static */
508+
already_AddRefed<WebExtensionContentScript>
503509
WebExtensionContentScript::Constructor(GlobalObject& aGlobal,
504510
WebExtensionPolicy& aExtension,
505511
const ContentScriptInit& aInit,
@@ -659,7 +665,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(MozDocumentMatcher)
659665
* MozDocumentObserver
660666
*****************************************************************************/
661667

662-
/* static */ already_AddRefed<DocumentObserver> DocumentObserver::Constructor(
668+
/* static */
669+
already_AddRefed<DocumentObserver> DocumentObserver::Constructor(
663670
GlobalObject& aGlobal, dom::MozDocumentCallback& aCallbacks,
664671
ErrorResult& aRv) {
665672
RefPtr<DocumentObserver> matcher =

‎toolkit/components/extensions/webrequest/StreamFilter.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ void StreamFilter::ForgetActor() {
5050
}
5151
}
5252

53-
/* static */ already_AddRefed<StreamFilter> StreamFilter::Create(
54-
GlobalObject& aGlobal, uint64_t aRequestId, const nsAString& aAddonId) {
53+
/* static */
54+
already_AddRefed<StreamFilter> StreamFilter::Create(GlobalObject& aGlobal,
55+
uint64_t aRequestId,
56+
const nsAString& aAddonId) {
5557
nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aGlobal.GetAsSupports());
5658
MOZ_ASSERT(global);
5759

@@ -251,8 +253,8 @@ void StreamFilter::FireErrorEvent(const nsAString& aError) {
251253
* Glue
252254
*****************************************************************************/
253255

254-
/* static */ bool StreamFilter::IsAllowedInContext(JSContext* aCx,
255-
JSObject* /* unused */) {
256+
/* static */
257+
bool StreamFilter::IsAllowedInContext(JSContext* aCx, JSObject* /* unused */) {
256258
return nsContentUtils::CallerHasPermission(aCx,
257259
nsGkAtoms::webRequestBlocking);
258260
}

‎toolkit/components/extensions/webrequest/StreamFilterEvents.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
2828
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(StreamFilterDataEvent)
2929
NS_INTERFACE_MAP_END_INHERITING(Event)
3030

31-
/* static */ already_AddRefed<StreamFilterDataEvent>
32-
StreamFilterDataEvent::Constructor(EventTarget* aEventTarget,
33-
const nsAString& aType,
34-
const StreamFilterDataEventInit& aParam) {
31+
/* static */
32+
already_AddRefed<StreamFilterDataEvent> StreamFilterDataEvent::Constructor(
33+
EventTarget* aEventTarget, const nsAString& aType,
34+
const StreamFilterDataEventInit& aParam) {
3535
RefPtr<StreamFilterDataEvent> event = new StreamFilterDataEvent(aEventTarget);
3636

3737
bool trusted = event->Init(aEventTarget);

‎toolkit/components/extensions/webrequest/StreamFilterParent.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ bool StreamFilterParent::Create(dom::ContentParent* aContentParent,
144144
return true;
145145
}
146146

147-
/* static */ void StreamFilterParent::Attach(nsIChannel* aChannel,
148-
ParentEndpoint&& aEndpoint) {
147+
/* static */
148+
void StreamFilterParent::Attach(nsIChannel* aChannel,
149+
ParentEndpoint&& aEndpoint) {
149150
auto self = MakeRefPtr<StreamFilterParent>();
150151

151152
self->ActorThread()->Dispatch(

0 commit comments

Comments
 (0)