From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../extensions/webidl-api/ExtensionAPIRequestForwarder.cpp | 6 +++--- toolkit/components/extensions/webidl-api/GenerateWebIDLBindings.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'toolkit/components/extensions/webidl-api') diff --git a/toolkit/components/extensions/webidl-api/ExtensionAPIRequestForwarder.cpp b/toolkit/components/extensions/webidl-api/ExtensionAPIRequestForwarder.cpp index 5f6a966fc8..2c36c10d7b 100644 --- a/toolkit/components/extensions/webidl-api/ExtensionAPIRequestForwarder.cpp +++ b/toolkit/components/extensions/webidl-api/ExtensionAPIRequestForwarder.cpp @@ -88,9 +88,9 @@ ExtensionAPIRequestForwarder::APIRequestHandler() { MOZ_ASSERT(NS_IsMainThread()); if (MOZ_UNLIKELY(!sAPIRequestHandler)) { - sAPIRequestHandler = - do_ImportModule("resource://gre/modules/ExtensionProcessScript.jsm", - "ExtensionAPIRequestHandler"); + sAPIRequestHandler = do_ImportESModule( + "resource://gre/modules/ExtensionProcessScript.sys.mjs", + "ExtensionAPIRequestHandler"); MOZ_RELEASE_ASSERT(sAPIRequestHandler); ClearOnShutdown(&sAPIRequestHandler); } diff --git a/toolkit/components/extensions/webidl-api/GenerateWebIDLBindings.py b/toolkit/components/extensions/webidl-api/GenerateWebIDLBindings.py index 3b31bd924d..6a4a404ac8 100644 --- a/toolkit/components/extensions/webidl-api/GenerateWebIDLBindings.py +++ b/toolkit/components/extensions/webidl-api/GenerateWebIDLBindings.py @@ -139,8 +139,8 @@ def read_json(json_file_path): """ Helper function used to read the WebExtensions API schema JSON files by ignoring the license comment on the top of some of those files. - Same helper as the one available in Schemas.jsm: - https://searchfox.org/mozilla-central/rev/3434a9df60373a997263107e6f124fb164ddebf2/toolkit/components/extensions/Schemas.jsm#70 + Same helper as the one available in Schemas.sys.mjs: + https://searchfox.org/mozilla-central/rev/b60cb73160843adb5a5a3ec8058e75a69b46acf7/toolkit/components/extensions/Schemas.sys.mjs#53 """ with open(json_file_path) as json_file: txt = json_file.read() -- cgit v1.2.3