Backed out 3 changesets (bug 1948914, bug 1953517) for causing multiple failures CLOSED TREE

Backed out changeset cde84adde5f9 (bug 1953517) Backed out changeset a16bb0b1f7b4 (bug 1948914) Backed out changeset daf557f15c21 (bug 1948914)
2025-03-22 23:31:24 +02:00
parent 32dff95dcd
commit f8ede0ac21
7 changed files with 231 additions and 34 deletions
--- a/browser/base/content/test/performance/browser_startup_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -292,6 +292,12 @@ const startupPhases = {
      stat: 1,
      close: 1,
    },
+    {
+      path: "XREAppFeat:webcompat@mozilla.org.xpi",
+      condition: LINUX,
+      ignoreIfUnused: true, // Sometimes happens in the previous phase
+      close: 1,
+    },
    {
      // We only hit this for new profiles.
      path: "XREAppDist:distribution.ini",
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -112,9 +112,6 @@ var gExceptionPaths = [
  // The formautofill add-on.
  "resource://builtin-addons/formautofill/",

-  // The webcompat add-on.
-  "resource://builtin-addons/webcompat/",
-
  // The newtab add-on
  "resource://builtin-addons/newtab/",
  "resource://newtab/",
@@ -281,6 +278,8 @@ var allowlist = [
    file: "resource://app/localization/en-US/browser/touchbar/touchbar.ftl",
    platforms: ["linux", "win"],
  },
+  // Referenced by the webcompat system addon for localization
+  { file: "resource://gre/localization/en-US/toolkit/about/aboutCompat.ftl" },

  // dom/media/mediacontrol/MediaControlService.cpp
  { file: "resource://gre/localization/en-US/dom/media.ftl" },
--- a/browser/extensions/webcompat/jar.mn
+++ b/browser/extensions/webcompat/jar.mn
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# NOTE: the '*' on the run.js asset is required to ensure that it will be
-# preprocessed (and data/interventions.json content interpolated as expected)
-# by the `mach build` command.
-# See https://firefox-source-docs.mozilla.org/build/buildsystem/jar-manifests.html#asterisk-marker-preprocessing
-
-browser.jar:
-%   resource builtin-addons %builtin-addons/  contentaccessible=yes
-    builtin-addons/webcompat/about-compat/ (about-compat/**)
-    builtin-addons/webcompat/data/ (data/**)
-    builtin-addons/webcompat/experiment-apis/ (experiment-apis/**)
-    builtin-addons/webcompat/injections/ (injections/**)
-    builtin-addons/webcompat/shims/ (shims/**)
-    builtin-addons/webcompat/lib/ (lib/**)
-    builtin-addons/webcompat/manifest.json (manifest.json)
-*   builtin-addons/webcompat/run.js (run.js)
--- a/browser/extensions/webcompat/moz.build
+++ b/browser/extensions/webcompat/moz.build
@@ -4,7 +4,227 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-JAR_MANIFESTS += ["jar.mn"]
+DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
+DEFINES["MOZ_APP_MAXVERSION"] = CONFIG["MOZ_APP_MAXVERSION"]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"] += [
+    "manifest.json",
+]
+
+FINAL_TARGET_PP_FILES.features["webcompat@mozilla.org"] += [
+    "run.js",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["about-compat"] += [
+    "about-compat/aboutCompat.css",
+    "about-compat/aboutCompat.html",
+    "about-compat/aboutCompat.js",
+    "about-compat/AboutCompat.sys.mjs",
+    "about-compat/aboutPage.js",
+    "about-compat/aboutPage.json",
+    "about-compat/aboutPageProcessScript.js",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["data"] += [
+    "data/interventions.json",
+    "data/shims.js",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["experiment-apis"] += [
+    "experiment-apis/aboutConfigPrefs.js",
+    "experiment-apis/aboutConfigPrefs.json",
+    "experiment-apis/aboutConfigPrefsChild.js",
+    "experiment-apis/appConstants.js",
+    "experiment-apis/appConstants.json",
+    "experiment-apis/matchPatterns.js",
+    "experiment-apis/matchPatterns.json",
+    "experiment-apis/systemManufacturer.js",
+    "experiment-apis/systemManufacturer.json",
+    "experiment-apis/testUtils.js",
+    "experiment-apis/testUtils.json",
+    "experiment-apis/trackingProtection.js",
+    "experiment-apis/trackingProtection.json",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["injections"]["css"] += [
+    "injections/css/bug0000000-testbed-css-injection.css",
+    "injections/css/bug1575000-apply.lloydsbank.co.uk-radio-buttons-fix.css",
+    "injections/css/bug1610344-directv.com.co-hide-unsupported-message.css",
+    "injections/css/bug1644830-missingmail.usps.com-checkboxes-not-visible.css",
+    "injections/css/bug1694470-myvidster.com-content-not-shown.css",
+    "injections/css/bug1707795-office365-sheets-overscroll-disable.css",
+    "injections/css/bug1741234-patient.alphalabs.ca-height-fix.css",
+    "injections/css/bug1770962-coldwellbankerhomes.com-image-height.css",
+    "injections/css/bug1779908-play.google.com-scrollbar-fix.css",
+    "injections/css/bug1784199-entrata-platform-unsupported.css",
+    "injections/css/bug1819678-nppes.cms.hhs.gov-unsupported-banner.css",
+    "injections/css/bug1830752-afisha.ru-slider-pointer-events.css",
+    "injections/css/bug1830796-copyleaks.com-hide-unsupported.css",
+    "injections/css/bug1836103-autostar-novoross.ru-make-map-taller.css",
+    "injections/css/bug1836105-cnn.com-fix-blank-pages-when-printing.css",
+    "injections/css/bug1836872-docs.google.com-font-submenus-inaccessible.css",
+    "injections/css/bug1845299-docs.google.com-hide-extra-scrollbar-on-speaker-notes.css",
+    "injections/css/bug1848713-cleanrider.com-slider.css",
+    "injections/css/bug1848849-theaa.com-printing-mode-fix.css",
+    "injections/css/bug1856915-login.yahoo.com-unhide-password-button-fix.css",
+    "injections/css/bug1868345-tvmovie.de-scroll-fix.css",
+    "injections/css/bug1873166-nsandi.com-hide-unsupported-message.css",
+    "injections/css/bug1886293-futurePLC-sites-trending_scrollbars.css",
+    "injections/css/bug1886566-quezoncity.gov.ph-iframe-height.css",
+    "injections/css/bug1886591-la-vache-noire.com-cookie-banner-fix.css",
+    "injections/css/bug1886616-www.six-group.com-select-fix.css",
+    "injections/css/bug1892898-investopedia.com-fix-card-height.css",
+    "injections/css/bug1895051-www.zhihu.com-broken-button-fix.css",
+    "injections/css/bug1896349-vivaldi.com-selected-text-fix.css",
+    "injections/css/bug1896571-gracobaby.ca-unlock-scrolling.css",
+    "injections/css/bug1899937-plus.nhk.jp-hide-unsupported.css",
+    "injections/css/bug1901000-eyebuydirect.ca-fix-paypal-button.css",
+    "injections/css/bug1911253-qq.com-unhide-checkboxes.css",
+    "injections/css/bug1925508-developer-apple.com-transform-scale.css",
+    "injections/css/bug1925937-gazetasp.com.br-hide-extra-scrollbars.css",
+    "injections/css/bug1926506-aliexpress.com-hide-extra-scrollbars.css",
+    "injections/css/bug1931538-buzzfeed.com-card-game-fix.css",
+    "injections/css/bug1934567-www.port8.fi-scrolling-fix.css",
+    "injections/css/bug1941530-climate.rutgers.edu-fix-broken-images.css",
+    "injections/css/bug1942292-beterbed.nl-scrollbar-fix.css",
+    "injections/css/bug1943920-add.org-fix-overlapping-menu.css",
+    "injections/css/bug1944727-www.linkedin.com-fix-dark-overlay.css",
+    "injections/css/bug1945830-aliexpress.com-country-flags-fix.css",
+    "injections/css/bug1947105-pexels.com-nudge-thanks-popup-onscreen.css",
+    "injections/css/bug1947979-shazam.com-hide-extra-scrollbars.css",
+    "injections/css/bug1948047-lovers.cacaushow.com.br-nudge-login-popup-onscreen.css",
+    "injections/css/bug1950053-omegleapp.me-fix-scrollbars.css",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["injections"]["js"] += [
+    "injections/js/bug0000000-testbed-js-injection.js",
+    "injections/js/bug1448747-fastclick-shim.js",
+    "injections/js/bug1452707-window.controllers-shim-ib.absa.co.za.js",
+    "injections/js/bug1457335-histography.io-ua-change.js",
+    "injections/js/bug1472075-bankofamerica.com-ua-change.js",
+    "injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js",
+    "injections/js/bug1724868-news.yahoo.co.jp-ua-override.js",
+    "injections/js/bug1739489-draftjs-beforeinput.js",
+    "injections/js/bug1769762-tiktok.com-plugins-shim.js",
+    "injections/js/bug1774005-installtrigger-shim.js",
+    "injections/js/bug1799968-www.samsung.com-appVersion-linux-fix.js",
+    "injections/js/bug1799980-healow.com-infinite-loop-fix.js",
+    "injections/js/bug1815733-outlook365-clipboard-read-noop.js",
+    "injections/js/bug1818818-fastclick-legacy-shim.js",
+    "injections/js/bug1819450-cmbchina.com-ua-change.js",
+    "injections/js/bug1819476-axisbank.com-webkitSpeechRecognition-shim.js",
+    "injections/js/bug1819678-free4talk.com-window-chrome-shim.js",
+    "injections/js/bug1831007-nintendo-window-OnetrustActiveGroups.js",
+    "injections/js/bug1836157-thai-masszazs-niceScroll-disable.js",
+    "injections/js/bug1841730-www.korg.com-fix-broken-page-loads.js",
+    "injections/js/bug1842437-www.youtube.com-performance-now-precision.js",
+    "injections/js/bug1846742-microsoft.com-search-key-fix.js",
+    "injections/js/bug1849058-nicochannel.jp-picture-in-picture-shim.js",
+    "injections/js/bug1855014-eksiseyler.com.js",
+    "injections/js/bug1859617-installtrigger-removal-shim.js",
+    "injections/js/bug1889326-office365-email-handling-prompt-autohide.js",
+    "injections/js/bug1889505-bankmandiri.co.id-window.chrome.js",
+    "injections/js/bug1897120-turnjs-zoom-fix.js",
+    "injections/js/bug1898946-transcrib.io-chrome-shim.js",
+    "injections/js/bug1898952-digits.t-mobile.com.js",
+    "injections/js/bug1899937-plus.nhk.jp-request-picture-in-picture.js",
+    "injections/js/bug1901780-disable-legacy-mutation-events.js",
+    "injections/js/bug1902406-sp.hi.co.kr-window-chrome-shim.js",
+    "injections/js/bug1905069-one.geekie.com.br-chrome-shims.js",
+    "injections/js/bug1923286-bing.com-image-click-fix.js",
+    "injections/js/bug1924500-www.tiktok.com-fix-captcha-slider.js",
+    "injections/js/bug1927984-modules.sms-timing.com-chrome-shim.js",
+    "injections/js/bug1928216-voice.google.com-permissions.query.js",
+    "injections/js/bug1928941-oasis.decart.ai-window-chrome-shim.js",
+    "injections/js/bug1930440-online.singaporepools.com-prevent-unsupported-alert.js",
+    "injections/js/bug1939248-rosasthai.com-load-event-helper.js",
+    "injections/js/bug1943898-www.capital.gr-suppress-constant-reloading.js",
+    "injections/js/bug1944725-homedepot.com-innerWidth-fix.js",
+    "injections/js/bug1945019-order.mealkeyway.com-prevent-unsupported-message.js",
+    "injections/js/bug1950282-formula1.com-platform-linux-fix.js",
+    "injections/js/bug1950301-shamir.com-ua-overrides.js",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
+    "shims/addthis-angular.js",
+    "shims/adform.js",
+    "shims/adnexus-ast.js",
+    "shims/adnexus-prebid.js",
+    "shims/adsafeprotected-ima.js",
+    "shims/apstag.js",
+    "shims/blogger.js",
+    "shims/bloggerAccount.js",
+    "shims/bmauth.js",
+    "shims/botd.mjs",
+    "shims/branch.js",
+    "shims/chartbeat.js",
+    "shims/crave-ca.js",
+    "shims/criteo.js",
+    "shims/cxense.js",
+    "shims/doubleverify.js",
+    "shims/eluminate.js",
+    "shims/embed-test-shim.js",
+    "shims/empty-script.js",
+    "shims/empty-shim.txt",
+    "shims/everest.js",
+    "shims/facebook-sdk.js",
+    "shims/facebook.svg",
+    "shims/fastclick.js",
+    "shims/figshare.js",
+    "shims/firebase.js",
+    "shims/google-ads.js",
+    "shims/google-analytics-and-tag-manager.js",
+    "shims/google-analytics-ecommerce-plugin.js",
+    "shims/google-analytics-legacy.js",
+    "shims/google-ima.js",
+    "shims/google-page-ad.js",
+    "shims/google-publisher-tags.js",
+    "shims/history.js",
+    "shims/iam.js",
+    "shims/iaspet.js",
+    "shims/instagram-embed.js",
+    "shims/instagram.js",
+    "shims/instagram.svg",
+    "shims/kinja.js",
+    "shims/live-test-shim.js",
+    "shims/maxmind-geoip.js",
+    "shims/messengerLogin.js",
+    "shims/microsoftLogin.js",
+    "shims/microsoftVirtualAssistant.js",
+    "shims/moat.js",
+    "shims/mochitest-shim-1.js",
+    "shims/mochitest-shim-2.js",
+    "shims/mochitest-shim-3.js",
+    "shims/nielsen.js",
+    "shims/optimizely.js",
+    "shims/play.svg",
+    "shims/rambler-authenticator.js",
+    "shims/rich-relevance.js",
+    "shims/salesforce.js",
+    "shims/spotify-embed.js",
+    "shims/stackoverflow-login.js",
+    "shims/tiktok-embed.js",
+    "shims/tiktok.svg",
+    "shims/tracking-pixel.png",
+    "shims/tsn-ca.js",
+    "shims/vast2.xml",
+    "shims/vast3.xml",
+    "shims/vidible.js",
+    "shims/vmad.xml",
+    "shims/webtrends.js",
+]
+
+FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [
+    "lib/about_compat_broker.js",
+    "lib/custom_functions.js",
+    "lib/intervention_helpers.js",
+    "lib/interventions.js",
+    "lib/messaging_helper.js",
+    "lib/requestStorageAccess_helper.js",
+    "lib/shim_messaging_helper.js",
+    "lib/shims.js",
+    "lib/ua_helpers.js",
+]

 XPCOM_MANIFESTS += [
    "components.conf",
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -55,7 +55,7 @@ default.locale

 # Bug 1713693 - empty-shim.txt, an intentionally blank file used by SmartBlock (0 bytes)
 #ifdef MOZ_GTK
-browser/chrome/browser/builtin-addons/webcompat/shims/empty-shim.txt
+browser/features/webcompat@mozilla.org/shims/empty-shim.txt
 removed-files
 #endif

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -231,6 +231,7 @@
@RESPATH@/browser/chrome/icons/default/default64.png
@RESPATH@/browser/chrome/icons/default/default128.png
 #endif
+@RESPATH@/browser/features/*

 ; [DevTools Startup Files]
@RESPATH@/browser/chrome/devtools-startup@JAREXT@
--- a/build/valgrind/x86_64-pc-linux-gnu.sup
+++ b/build/valgrind/x86_64-pc-linux-gnu.sup
@@ -1073,13 +1073,3 @@
   fun:drop_in_place<core::option::Option<cssparser::cow_rc_str::CowRcStr>>
   fun:_ZN5style6values9specified5color5Color14parse_internal*
 }
-{
-   False positive Conditional jump or move depends on uninitialised value(s) at len_utf8 / encode_utf8_raw / encode_utf8 / push_char
-   Memcheck:Cond
-   fun:len_utf8
-   fun:encode_utf8_raw
-   fun:encode_utf8
-   fun:push_char
-   ...
-   fun:_ZN7mozilla10extensions13MatchGlobCoreC1ERK12nsTSubstringIcEbbRNS_11ErrorResultE
-}