Skip to content

Commit

Permalink
Bug 1884623 - Update more jsm references in production code and docs …
Browse files Browse the repository at this point in the history
…in misc code. r=mossop,necko-reviewers,profiler-reviewers,julienw,kershaw

Differential Revision: https://phabricator.services.mozilla.com/D204185
  • Loading branch information
Standard8 committed Mar 14, 2024
1 parent 852c4ba commit fcaf27c
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion dom/media/webvtt/WebVTTListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ nsresult WebVTTListener::LoadResource() {
if (IsCanceled()) {
return NS_OK;
}
// Exit if we failed to create the WebVTTParserWrapper (vtt.jsm)
// Exit if we failed to create the WebVTTParserWrapper (vtt.sys.mjs)
NS_ENSURE_SUCCESS(mParserWrapperError, mParserWrapperError);

mElement->SetReadyState(TextTrackReadyState::Loading);
Expand Down
2 changes: 1 addition & 1 deletion gfx/layers/apz/src/AutoscrollAnimation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace mozilla {
namespace layers {

// Helper function for AutoscrollAnimation::DoSample().
// Basically copied as-is from toolkit/actors/AutoScrollChild.jsm.
// Basically copied as-is from toolkit/actors/AutoScrollChild.sys.mjs.
static float Accelerate(ScreenCoord curr, ScreenCoord start) {
static const int speed = 12;
float val = (curr - start) / speed;
Expand Down
2 changes: 1 addition & 1 deletion gfx/layers/apz/util/APZEventState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void APZEventState::ProcessLongTap(PresShell* aPresShell,
false;
#elif defined(MOZ_WIDGET_ANDROID)
// On Android, GeckoView calls preventDefault() in a JSActor
// (ContentDelegateChild.jsm) when opening context menu so that we can
// (ContentDelegateChild.sys.mjs) when opening context menu so that we can
// tell whether contextmenu opens in response to the contextmenu event by
// checking where preventDefault() got called.
preventDefaultResult == PreventDefaultResult::ByChrome;
Expand Down
2 changes: 1 addition & 1 deletion intl/uconv/nsConverterInputStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ nsConverterInputStream::Init(nsIInputStream* aStream, const char* aCharset,
aBufferSize = CONVERTER_BUFFER_SIZE;
outputBufferSize = CONVERTER_BUFFER_SIZE;
} else {
// NetUtil.jsm assumes that if buffer size equals
// NetUtil.sys.mjs assumes that if buffer size equals
// the input size, the whole stream will be processed
// as one readString. This is not true with encoding_rs,
// because encoding_rs might want to see space for a
Expand Down
2 changes: 1 addition & 1 deletion js/src/gc/Statistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ UniqueChars Statistics::formatDetailedTotals() const {
void Statistics::formatJsonSlice(size_t sliceNum, JSONPrinter& json) const {
/*
* We number each of the slice properties to keep the code in
* GCTelemetry.jsm in sync. See MAX_SLICE_KEYS.
* GCTelemetry.sys.mjs in sync. See MAX_SLICE_KEYS.
*/
json.beginObject();
formatJsonSliceDescription(sliceNum, slices_[sliceNum], json); // # 1-11
Expand Down
2 changes: 1 addition & 1 deletion layout/forms/HTMLSelectEventListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static bool IsOptionInteractivelySelectable(HTMLSelectElement& aSelect,
// options in a display: contents subtree interactively.
// test_select_key_navigation_bug1498769.html tests for this and should
// probably be changed (and this loop removed) or alternatively
// SelectChild.jsm should be changed to match it.
// SelectChild.sys.mjs should be changed to match it.
for (Element* el = &aOption; el && el != &aSelect;
el = el->GetParentElement()) {
if (Servo_Element_IsDisplayContents(el)) {
Expand Down
2 changes: 1 addition & 1 deletion modules/libpref/init/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -4016,7 +4016,7 @@ pref("toolkit.osKeyStore.loglevel", "Warn");

pref("extensions.formautofill.supportRTL", false);

// Controls the log level for CookieBannerListService.jsm.
// Controls the log level for CookieBannerListService.sys.mjs.
pref("cookiebanners.listService.logLevel", "Error");

// Controls the log level for Cookie Banner Auto Clicking.
Expand Down
2 changes: 1 addition & 1 deletion netwerk/dns/nsEffectiveTLDService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ NS_IMETHODIMP nsEffectiveTLDService::Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) {
/**
* Signal sent from netwerk/dns/PublicSuffixList.jsm
* Signal sent from netwerk/dns/PublicSuffixList.sys.mjs
* aSubject is the nsIFile object for dafsa.bin
* aData is the absolute path to the dafsa.bin file (not used)
*/
Expand Down
2 changes: 1 addition & 1 deletion netwerk/docs/captive_portals.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The [CaptivePortalService](https://searchfox.org/mozilla-central/source/netwerk/
- A captive portal was detected, and internet connectivity is not currently available.
- A [captive portal notification bar](https://searchfox.org/mozilla-central/source/browser/base/content/browser-captivePortal.js) might be displayed to the user.

The Captive portal service uses [CaptiveDetect.sys.mjs](https://searchfox.org/mozilla-central/source/toolkit/components/captivedetect/CaptiveDetect.jsm) to perform the checks, which in turn uses XMLHttpRequest.
The Captive portal service uses [CaptiveDetect.sys.mjs](https://searchfox.org/mozilla-central/source/toolkit/components/captivedetect/CaptiveDetect.sys.mjs) to perform the checks, which in turn uses XMLHttpRequest.
This request needs to be exempted from HTTPS upgrades, DNS over HTTPS, and many new browser features in order to function as expected.

```{note}
Expand Down
2 changes: 1 addition & 1 deletion netwerk/docs/dns/dns-over-https-trr.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Some domains will never be resolved via TRR. This includes:


A small set of TRR providers are only available on certain networks.
Detection is performed in DoHHeuristics.jsm followed by a call to
Detection is performed in DoHHeuristics.sys.mjs followed by a call to
_TRRService::SetDetectedURI_. This causes Firefox to use the
network specific TRR provider until a network change occurs.

Expand Down
2 changes: 1 addition & 1 deletion netwerk/docs/url_parsers.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ To change a URI the consumer must call `nsIURI.mutate()` which returns a `nsIMut
- [nsStandardURL](https://searchfox.org/mozilla-central/source/netwerk/base/nsStandardURL.h)
- [SubstitutingURL](https://searchfox.org/mozilla-central/source/netwerk/protocol/res/SubstitutingURL.h)
- overrides nsStandardURL::GetFile to provide nsIFile resolution.
- This allows us to map URLs such as `resource://gre/actors/RemotePageChild.jsm` to the actual file on the disk.
- This allows us to map URLs such as `resource://gre/actors/RemotePageChild.sys.mjs` to the actual file on the disk.
- [nsMozIconURI](https://searchfox.org/mozilla-central/source/image/decoders/icon/nsIconURI.h)
- Used to represent icon URLs
- [nsSimpleURI](https://searchfox.org/mozilla-central/source/netwerk/base/nsSimpleURI.h)
Expand Down
3 changes: 2 additions & 1 deletion netwerk/protocol/http/nsHttpChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ nsresult nsHttpChannel::OnBeforeConnect() {
}
rv = sss->IsSecureURI(mURI, originAttributes, &isSecureURI);
NS_ENSURE_SUCCESS(rv, rv);
// Save that on the loadInfo so it can later be consumed by SecurityInfo.jsm
// Save that on the loadInfo so it can later be consumed by
// SecurityInfo.sys.mjs
mLoadInfo->SetHstsStatus(isSecureURI);

RefPtr<mozilla::dom::BrowsingContext> bc;
Expand Down
2 changes: 1 addition & 1 deletion netwerk/protocol/res/PageThumbProtocolHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ bool PageThumbProtocolHandler::ResolveSpecialCases(const nsACString& aHost,
const nsACString& aPath,
const nsACString& aPathname,
nsACString& aResult) {
// This should match the scheme in PageThumbs.jsm. We will only resolve
// This should match the scheme in PageThumbs.sys.mjs. We will only resolve
// URIs for thumbnails generated by PageThumbs here.
if (!aHost.EqualsLiteral(PAGE_THUMB_HOST) &&
!aHost.EqualsLiteral(PLACES_PREVIEWS_HOST)) {
Expand Down
2 changes: 1 addition & 1 deletion security/manager/ssl/RemoteSecuritySettings.sys.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ChromeUtils.defineLazyGetter(lazy, "log", () => {
"resource://gre/modules/Console.sys.mjs"
);
return new ConsoleAPI({
prefix: "RemoteSecuritySettings.jsm",
prefix: "RemoteSecuritySettings",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.sys.mjs for details.
maxLogLevel: "error",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ function compare_remote_settings_files {

# 5. Download attachments if needed.
if [ "${bucket}" = "blocklists" ] && [ "${collection}" = "addons-bloomfilters" ]; then
# Find the attachment with the most recent generation_time, like _updateMLBF in Blocklist.jsm.
# Find the attachment with the most recent generation_time, like _updateMLBF in Blocklist.sys.mjs.
# The server should return one "bloomfilter-base" record, but in case it returns multiple,
# return the most recent one. The server may send multiple entries if we ever decide to use
# the "filter_expression" feature of Remote Settings to send different records to specific
Expand Down Expand Up @@ -364,7 +364,7 @@ function update_remote_settings_attachment() {
# $4 is a jq filter on the arrays that should return one record with the attachment
local jq_attachment_selector=".data | map(select(.attachment)) | $4"

# These paths match _readAttachmentDump in services/settings/Attachments.jsm.
# These paths match _readAttachmentDump in services/settings/Attachments.sys.mjs.
local path_to_attachment="${bucket}/${collection}/${attachment_id}"
local path_to_meta="${bucket}/${collection}/${attachment_id}.meta.json"
local old_meta="$REMOTE_SETTINGS_INPUT/${path_to_meta}"
Expand Down
2 changes: 1 addition & 1 deletion tools/profiler/core/platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class GeckoJavaSampler
featureStringArray.length());

// 128 * 1024 * 1024 is the entries preset that is given in
// devtools/client/performance-new/shared/background.jsm.js
// devtools/client/performance-new/shared/background.sys.mjs
profiler_start(PowerOfTwo32(128 * 1024 * 1024), 5.0, features,
filtersTemp.begin(), filtersTemp.length(), 0, Nothing());
}
Expand Down
4 changes: 2 additions & 2 deletions uriloader/exthandler/nsExternalHelperAppService.h
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,8 @@ class nsExternalAppHandler final : public nsIStreamListener,
const nsString& path);

/**
* Set in HelperAppDlg.jsm. This is always null after the user has chosen an
* action.
* Set in HelperAppDlg.sys.mjs. This is always null after the user has chosen
* an action.
*/
nsCOMPtr<nsIWebProgressListener2> mDialogProgressListener;
/**
Expand Down

0 comments on commit fcaf27c

Please sign in to comment.