diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/au/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/au/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/au/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/au/messages.json 2023-11-07 06:33:07.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.com.au Search" }, "searchUrl": { - "message": "https://www.amazon.com.au/exec/obidos/external-search/" + "message": "https://www.amazon.com.au/s" }, "searchForm": { - "message": "https://www.amazon.com.au/exec/obidos/external-search/" + "message": "https://www.amazon.com.au/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended" - }, - "suggestUrl": { - "message": "https://completion.amazon.com.au/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=111172" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/ca/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/ca/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/ca/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/ca/messages.json 2023-11-07 06:33:07.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.ca Search" }, "searchUrl": { - "message": "https://www.amazon.ca/exec/obidos/external-search/" + "message": "https://www.amazon.ca/s" }, "searchForm": { - "message": "https://www.amazon.ca/exec/obidos/external-search/" + "message": "https://www.amazon.ca/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillacanada-20&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.ca/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=7" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/de/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/de/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/de/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/de/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.de Suche" }, "searchUrl": { - "message": "https://www.amazon.de/exec/obidos/external-search/" + "message": "https://www.amazon.de/s" }, "searchForm": { "message": "https://www.amazon.de/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-de-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.de/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=4" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/en-GB/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/en-GB/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/en-GB/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/en-GB/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.co.uk Search" }, "searchUrl": { - "message": "https://www.amazon.co.uk/exec/obidos/external-search/" + "message": "https://www.amazon.co.uk/s" }, "searchForm": { "message": "https://www.amazon.co.uk/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-uk-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.co.uk/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=3" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/france/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/france/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/france/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/france/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Recherche Amazon.fr" }, "searchUrl": { - "message": "https://www.amazon.fr/exec/obidos/external-search/" + "message": "https://www.amazon.fr/s" }, "searchForm": { "message": "https://www.amazon.fr/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-fr-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.fr/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=5" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/in/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/in/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/in/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/in/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.in Search" }, "searchUrl": { - "message": "https://www.amazon.in/exec/obidos/external-search/" + "message": "https://www.amazon.in/s" }, "searchForm": { "message": "https://www.amazon.in/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.in/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=44571" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/it/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/it/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/it/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/it/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Ricerca Amazon.it" }, "searchUrl": { - "message": "https://www.amazon.it/exec/obidos/external-search/" + "message": "https://www.amazon.it/s" }, "searchForm": { "message": "https://www.amazon.it/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefoxit-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.it/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=35691" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/nl/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/nl/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/nl/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/nl/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.nl Search" }, "searchUrl": { - "message": "https://www.amazon.nl/gp/search" + "message": "https://www.amazon.nl/s" }, "searchForm": { "message": "https://www.amazon.nl/" }, "searchUrlGetParams": { - "message": "ie={inputEncoding}&tag=mozillanether-21&index=aps&keywords={searchTerms}" - }, - "suggestUrl": { - "message": "https://completion.amazon.nl/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=328451" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/spain/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/spain/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/spain/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/spain/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.es" }, "searchUrl": { - "message": "https://www.amazon.es/exec/obidos/external-search/" + "message": "https://www.amazon.es/s" }, "searchForm": { "message": "https://www.amazon.es/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillaspain-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.es/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=44551" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/sweden/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/sweden/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/_locales/sweden/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/_locales/sweden/messages.json 2023-11-07 06:33:07.000000000 +0000 @@ -6,18 +6,12 @@ "message": "Amazon.se" }, "searchUrl": { - "message": "https://www.amazon.se/exec/obidos/external-search/" + "message": "https://www.amazon.se/s" }, "searchForm": { "message": "https://www.amazon.se/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillasweede-21&sourceid=Mozilla-search" - }, - "suggestUrl": { - "message": "https://completion.amazon.se/search/complete" - }, - "suggestUrlGetParams": { - "message": "q={searchTerms}&search-alias=aps&mkt=704403121" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazon/manifest.json firefox-119.0.1+build1/browser/components/search/extensions/amazon/manifest.json --- firefox-119.0+build2/browser/components/search/extensions/amazon/manifest.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazon/manifest.json 2023-11-07 06:33:07.000000000 +0000 @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDescription__", "manifest_version": 2, - "version": "1.12", + "version": "1.13", "browser_specific_settings": { "gecko": { "id": "amazon@search.mozilla.org" @@ -20,9 +20,7 @@ "name": "__MSG_extensionName__", "search_url": "__MSG_searchUrl__", "search_form": "__MSG_searchForm__", - "search_url_get_params": "__MSG_searchUrlGetParams__", - "suggest_url": "__MSG_suggestUrl__", - "suggest_url_get_params": "__MSG_suggestUrlGetParams__" + "search_url_get_params": "__MSG_searchUrlGetParams__" } } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcn/_locales/default/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/_locales/default/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcn/_locales/default/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/_locales/default/messages.json 2023-11-07 06:33:07.000000000 +0000 @@ -1,8 +1,8 @@ { "searchUrl": { - "message": "https://www.amazon.cn/mn/searchApp" + "message": "https://www.amazon.cn/s" }, "searchUrlGetParams": { - "message": "ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0&keywords={searchTerms}" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -1,8 +1,8 @@ { "searchUrl": { - "message": "https://www.amazon.cn/gp/search" + "message": "https://www.amazon.cn/s" }, "searchUrlGetParams": { - "message": "ie=UTF8&camp=536&creative=3200&index=aps&linkCode=ur2&tag=mozilla&keywords={searchTerms}" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcn/manifest.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/manifest.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcn/manifest.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcn/manifest.json 2023-11-07 06:33:06.000000000 +0000 @@ -2,7 +2,7 @@ "name": "亚马逊", "description": "亚马逊搜索", "manifest_version": 2, - "version": "1.2", + "version": "1.3", "browser_specific_settings": { "gecko": { "id": "amazondotcn@search.mozilla.org" diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcom/_locales/en/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/_locales/en/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcom/_locales/en/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/_locales/en/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,15 +6,12 @@ "message": "Amazon.com Search" }, "searchUrl": { - "message": "https://www.amazon.com/exec/obidos/external-search/" + "message": "https://www.amazon.com/s" }, "searchForm": { - "message": "https://www.amazon.com/exec/obidos/external-search/" - }, - "suggestUrl": { - "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1" + "message": "https://www.amazon.com/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcom/_locales/us/messages.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/_locales/us/messages.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcom/_locales/us/messages.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/_locales/us/messages.json 2023-11-07 06:33:06.000000000 +0000 @@ -6,15 +6,12 @@ "message": "Amazon.com Search" }, "searchUrl": { - "message": "https://www.amazon.com/exec/obidos/external-search/" + "message": "https://www.amazon.com/s" }, "searchForm": { - "message": "https://www.amazon.com/exec/obidos/external-search/" - }, - "suggestUrl": { - "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1" + "message": "https://www.amazon.com/" }, "searchUrlGetParams": { - "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=moz-us-20&sourceid=Mozilla-search" + "message": "k={searchTerms}" } } diff -Nru firefox-119.0+build2/browser/components/search/extensions/amazondotcom/manifest.json firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/manifest.json --- firefox-119.0+build2/browser/components/search/extensions/amazondotcom/manifest.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/extensions/amazondotcom/manifest.json 2023-11-07 06:33:06.000000000 +0000 @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDescription__", "manifest_version": 2, - "version": "1.6", + "version": "1.7", "browser_specific_settings": { "gecko": { "id": "amazondotcom@search.mozilla.org" @@ -20,7 +20,6 @@ "name": "__MSG_extensionName__", "search_url": "__MSG_searchUrl__", "search_form": "__MSG_searchForm__", - "suggest_url": "__MSG_suggestUrl__", "search_url_get_params": "__MSG_searchUrlGetParams__" } } diff -Nru firefox-119.0+build2/browser/components/search/metrics.yaml firefox-119.0.1+build1/browser/components/search/metrics.yaml --- firefox-119.0+build2/browser/components/search/metrics.yaml 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/metrics.yaml 2023-11-07 06:33:07.000000000 +0000 @@ -215,9 +215,15 @@ target: description: > The target component used to trigger the action. - Possible values are `ad_carousel`, `ad_link`, `ad_sitelink`, - `ad_sidebar`, `shopping_tab`, `non_ads_link`, or - `incontent_searchbox`. + Possible values are: + `ad_carousel`, + `ad_image_row`, + `ad_link`, + `ad_sidebar`, + `ad_sitelink`, + `incontent_searchbox`, + `refined_search_buttons`, + `shopping_tab`. type: string ad_impression: @@ -241,11 +247,12 @@ description: > Type of components on a SERP. Possible values are: `ad_carousel`, + `ad_image_row`, `ad_link`, `ad_sidebar`, `ad_sitelink`, - `refined_search_buttons` - `shopping_tab`, + `refined_search_buttons`, + `shopping_tab`. Defaults to `ad_link`. type: string ads_loaded: diff -Nru firefox-119.0+build2/browser/components/search/schema/search-telemetry-schema.json firefox-119.0.1+build1/browser/components/search/schema/search-telemetry-schema.json --- firefox-119.0+build2/browser/components/search/schema/search-telemetry-schema.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/schema/search-telemetry-schema.json 2023-11-07 06:33:06.000000000 +0000 @@ -16,7 +16,15 @@ "queryParamName": { "type": "string", "title": "Search Query Parameter Name", - "description": "The name of the query parameter for the user's search string." + "description": "The name of the query parameter for the user's search string. This is deprecated, in preference to queryParamNames, but still defined for older clients (pre Firefox 121)." + }, + "queryParamNames": { + "type": "array", + "title": "Search Query Parameter Names", + "description": "An array of query parameters that may be used for the user's search string.", + "items": { + "type": "string" + } }, "codeParamName": { "type": "string", @@ -124,6 +132,7 @@ "type": { "enum": [ "ad_carousel", + "ad_image_row", "ad_link", "ad_sitelink", "ad_sidebar", @@ -163,6 +172,7 @@ "type": { "enum": [ "ad_carousel", + "ad_image_row", "ad_link", "ad_sitelink", "ad_sidebar", diff -Nru firefox-119.0+build2/browser/components/search/schema/search-telemetry-ui-schema.json firefox-119.0.1+build1/browser/components/search/schema/search-telemetry-ui-schema.json --- firefox-119.0+build2/browser/components/search/schema/search-telemetry-ui-schema.json 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/schema/search-telemetry-ui-schema.json 2023-11-07 06:33:06.000000000 +0000 @@ -2,6 +2,7 @@ "ui:order": [ "telemetryId", "searchPageRegexp", + "queryParamNames", "queryParamName", "codeParamName", "taggedCodes", diff -Nru firefox-119.0+build2/browser/components/search/test/browser/browser_searchEngine_behaviors.js firefox-119.0.1+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js --- firefox-119.0+build2/browser/components/search/test/browser/browser_searchEngine_behaviors.js 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js 2023-11-07 06:33:06.000000000 +0000 @@ -10,8 +10,7 @@ const SEARCH_ENGINE_DETAILS = [ { alias: "a", - baseURL: - "https://www.amazon.com/exec/obidos/external-search/?field-keywords=foo&ie=UTF-8&mode=blended&tag=moz-us-20&sourceid=Mozilla-search", + baseURL: "https://www.amazon.com/s?k=foo", codes: { context: "", keyword: "", diff -Nru firefox-119.0+build2/browser/config/version_display.txt firefox-119.0.1+build1/browser/config/version_display.txt --- firefox-119.0+build2/browser/config/version_display.txt 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/config/version_display.txt 2023-11-07 06:33:06.000000000 +0000 @@ -1 +1 @@ -119.0 +119.0.1 diff -Nru firefox-119.0+build2/browser/config/version.txt firefox-119.0.1+build1/browser/config/version.txt --- firefox-119.0+build2/browser/config/version.txt 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/config/version.txt 2023-11-07 06:33:07.000000000 +0000 @@ -1 +1 @@ -119.0 +119.0.1 diff -Nru firefox-119.0+build2/browser/installer/allowed-dupes.mn firefox-119.0.1+build1/browser/installer/allowed-dupes.mn --- firefox-119.0+build2/browser/installer/allowed-dupes.mn 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/installer/allowed-dupes.mn 2023-11-07 06:33:06.000000000 +0000 @@ -108,3 +108,9 @@ # Bug 1718144 - De-duplicate lightbulb icon browser/features/webcompat-reporter@mozilla.org/icons/lightbulb.svg chrome/toolkit/skin/classic/global/icons/lightbulb.svg + +# Bug 1861662 - These will be removed with new search config changes +browser/chrome/browser/search-extensions/amazondotcn/_locales/default/messages.json +browser/chrome/browser/search-extensions/amazondotcn/_locales/mozillaonline/messages.json +browser/chrome/browser/search-extensions/amazondotcom/_locales/en/messages.json +browser/chrome/browser/search-extensions/amazondotcom/_locales/us/messages.json diff -Nru firefox-119.0+build2/browser/themes/osx/browser.css firefox-119.0.1+build1/browser/themes/osx/browser.css --- firefox-119.0+build2/browser/themes/osx/browser.css 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/browser/themes/osx/browser.css 2023-11-07 06:33:07.000000000 +0000 @@ -9,6 +9,7 @@ :root { appearance: none; + background-color: transparent; --toolbar-non-lwt-bgcolor: -moz-dialog; --toolbar-non-lwt-textcolor: -moz-dialogtext; diff -Nru firefox-119.0+build2/BUILDID firefox-119.0.1+build1/BUILDID --- firefox-119.0+build2/BUILDID 2023-10-19 23:51:31.000000000 +0000 +++ firefox-119.0.1+build1/BUILDID 2023-11-07 06:40:38.000000000 +0000 @@ -1 +1 @@ -20231019122658 \ No newline at end of file +20231106151204 \ No newline at end of file diff -Nru firefox-119.0+build2/config/milestone.txt firefox-119.0.1+build1/config/milestone.txt --- firefox-119.0+build2/config/milestone.txt 2023-10-19 23:40:34.000000000 +0000 +++ firefox-119.0.1+build1/config/milestone.txt 2023-11-07 06:33:06.000000000 +0000 @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -119.0 +119.0.1 diff -Nru firefox-119.0+build2/debian/changelog firefox-119.0.1+build1/debian/changelog --- firefox-119.0+build2/debian/changelog 2023-10-20 06:52:24.000000000 +0000 +++ firefox-119.0.1+build1/debian/changelog 2023-11-07 06:22:32.000000000 +0000 @@ -1,3 +1,9 @@ +firefox (119.0.1+build1-0ubuntu0.23.04.1~mt1) lunar; urgency=medium + + * New upstream release (119.0.1+build1) + + -- Rico Tzschichholz Tue, 07 Nov 2023 07:22:32 +0100 + firefox (119.0+build2-0ubuntu0.23.04.1~mt1) lunar; urgency=medium * New upstream release (119.0+build2) diff -Nru firefox-119.0+build2/debian/control firefox-119.0.1+build1/debian/control --- firefox-119.0+build2/debian/control 2023-10-20 06:52:24.000000000 +0000 +++ firefox-119.0.1+build1/debian/control 2023-11-07 06:22:32.000000000 +0000 @@ -38,9 +38,9 @@ xvfb, python3 (>= 3.7), libffi-dev (>= 3.0.9) [powerpc ppc64el s390x], - clang-15 [!ppc64el] | clang-14 [!ppc64el] | clang-13 [!ppc64el] | clang-12 | clang-10, - libclang-15-dev [!ppc64el] | libclang-14-dev [!ppc64el] | libclang-13-dev [!ppc64el] | libclang-12-dev | libclang-10-dev, - llvm-15-dev [!ppc64el] | llvm-14-dev [!ppc64el] | llvm-13-dev [!ppc64el] | llvm-12-dev | llvm-10-dev, + clang-15 | clang-14 | clang-13 | clang-12 | clang-10, + libclang-15-dev | libclang-14-dev | libclang-13-dev | libclang-12-dev | libclang-10-dev, + llvm-15-dev | llvm-14-dev | llvm-13-dev | llvm-12-dev | llvm-10-dev, cargo (>= 0.67), rustc (>= 1.66.0), nodejs (>= 12.22.12) diff -Nru firefox-119.0+build2/debian/control.in firefox-119.0.1+build1/debian/control.in --- firefox-119.0+build2/debian/control.in 2023-10-20 06:52:24.000000000 +0000 +++ firefox-119.0.1+build1/debian/control.in 2023-11-07 06:22:32.000000000 +0000 @@ -38,9 +38,9 @@ xvfb, python3 (>= 3.7), libffi-dev (>= 3.0.9) [powerpc ppc64el s390x], - clang-15 [!ppc64el] | clang-14 [!ppc64el] | clang-13 [!ppc64el] | clang-12 | clang-10, - libclang-15-dev [!ppc64el] | libclang-14-dev [!ppc64el] | libclang-13-dev [!ppc64el] | libclang-12-dev | libclang-10-dev, - llvm-15-dev [!ppc64el] | llvm-14-dev [!ppc64el] | llvm-13-dev [!ppc64el] | llvm-12-dev | llvm-10-dev, + clang-15 | clang-14 | clang-13 | clang-12 | clang-10, + libclang-15-dev | libclang-14-dev | libclang-13-dev | libclang-12-dev | libclang-10-dev, + llvm-15-dev | llvm-14-dev | llvm-13-dev | llvm-12-dev | llvm-10-dev, cargo (>= 0.67), rustc (>= 1.66.0), nodejs (>= 12.22.12) diff -Nru firefox-119.0+build2/debian/patches/ppc64el-workaround-gcc-ice.patch firefox-119.0.1+build1/debian/patches/ppc64el-workaround-gcc-ice.patch --- firefox-119.0+build2/debian/patches/ppc64el-workaround-gcc-ice.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/debian/patches/ppc64el-workaround-gcc-ice.patch 2023-10-25 07:34:45.000000000 +0000 @@ -0,0 +1,33 @@ +From 8a50d84f9e9da47333d55f564cf44ba6769e9945 Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Tue, 11 Jul 2023 06:34:59 +0900 +Subject: [PATCH] Work around GCC ICE on ppc64el + +--- + gfx/skia/moz.build | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +index 1d92936263a..ac0e0b28127 100644 +--- a/gfx/skia/moz.build ++++ b/gfx/skia/moz.build +@@ -359,7 +359,15 @@ UNIFIED_SOURCES += [ + 'skia/src/sksl/SkSLConstantFolder.cpp', + 'skia/src/sksl/SkSLContext.cpp', + 'skia/src/sksl/SkSLErrorReporter.cpp', +- 'skia/src/sksl/SkSLInliner.cpp', ++] ++ ++# Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110606 ++if CONFIG['CC_TYPE'] == 'gcc' and CONFIG['CPU_ARCH'] == 'ppc64': ++ SOURCES += ['skia/src/sksl/SkSLInliner.cpp'] ++else: ++ UNIFIED_SOURCES += ['skia/src/sksl/SkSLInliner.cpp'] ++ ++UNIFIED_SOURCES += [ + 'skia/src/sksl/SkSLIntrinsicList.cpp', + 'skia/src/sksl/SkSLMangler.cpp', + 'skia/src/sksl/SkSLModuleLoader.cpp', +-- +GitLab + diff -Nru firefox-119.0+build2/debian/patches/series firefox-119.0.1+build1/debian/patches/series --- firefox-119.0+build2/debian/patches/series 2023-08-21 17:43:41.000000000 +0000 +++ firefox-119.0.1+build1/debian/patches/series 2023-11-07 06:22:32.000000000 +0000 @@ -10,6 +10,7 @@ armhf-reduce-linker-memory-use.patch armhf-rustc-thin-lto.patch ppc64el-workaround-bug-1555531.patch +ppc64el-workaround-gcc-ice.patch armhf-clang-no-integrated-as-for-neon.patch armhf-do-not-build-qcms-with-neon.patch armhf-do-not-build-pixman-with-neon.patch diff -Nru firefox-119.0+build2/dom/html/HTMLInputElement.cpp firefox-119.0.1+build1/dom/html/HTMLInputElement.cpp --- firefox-119.0+build2/dom/html/HTMLInputElement.cpp 2023-10-19 23:40:37.000000000 +0000 +++ firefox-119.0.1+build1/dom/html/HTMLInputElement.cpp 2023-11-07 06:33:08.000000000 +0000 @@ -2936,8 +2936,7 @@ nsAutoString name; GetAttr(nsGkAtoms::name, name); - HTMLInputElement* selected = container->GetCurrentRadioButton(name); - return selected; + return container->GetCurrentRadioButton(name); } void HTMLInputElement::MaybeSubmitForm(nsPresContext* aPresContext) { @@ -6269,6 +6268,7 @@ // Add the radio to the radio group container. // nsCOMPtr container = GetRadioGroupContainer(); + bool indeterminate = !mChecked; if (container) { nsAutoString name; GetAttr(nsGkAtoms::name, name); @@ -6278,7 +6278,9 @@ // because we assume UpdateValueMissingState() will be called after. SetValidityState(VALIDITY_STATE_VALUE_MISSING, container->GetValueMissingState(name)); + indeterminate = indeterminate && !container->GetCurrentRadioButton(name); } + SetStates(ElementState::INDETERMINATE, indeterminate, notify); } void HTMLInputElement::WillRemoveFromRadioGroup() { @@ -6296,6 +6298,8 @@ container->SetCurrentRadioButton(name, nullptr); nsCOMPtr visitor = new nsRadioUpdateStateVisitor(this); VisitGroup(visitor); + } else { + AddStates(ElementState::INDETERMINATE); } // Remove this radio from its group in the container. diff -Nru firefox-119.0+build2/gfx/layers/RemoteTextureMap.cpp firefox-119.0.1+build1/gfx/layers/RemoteTextureMap.cpp --- firefox-119.0+build2/gfx/layers/RemoteTextureMap.cpp 2023-10-19 23:40:40.000000000 +0000 +++ firefox-119.0.1+build1/gfx/layers/RemoteTextureMap.cpp 2023-11-07 06:33:09.000000000 +0000 @@ -926,8 +926,8 @@ auto* owner = GetTextureOwner(lock, aInfo.mOwnerId, aInfo.mForPid); if (!owner || owner->mIsContextLost) { - // Owner is already removed or context lost. - return false; + // Owner is already removed or context lost. No need to wait texture ready. + return true; } const auto key = std::pair(aInfo.mForPid, aInfo.mTextureId); diff -Nru firefox-119.0+build2/layout/forms/nsTextControlFrame.cpp firefox-119.0.1+build1/layout/forms/nsTextControlFrame.cpp --- firefox-119.0+build2/layout/forms/nsTextControlFrame.cpp 2023-10-19 23:40:51.000000000 +0000 +++ firefox-119.0.1+build1/layout/forms/nsTextControlFrame.cpp 2023-11-07 06:33:13.000000000 +0000 @@ -131,8 +131,7 @@ // Unbind the text editor state object from the frame. The editor will live // on, but things like controllers will be released. - RefPtr textControlElement = TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); + RefPtr textControlElement = ControlElement(); if (mMutationObserver) { textControlElement->UnbindFromFrame(this); mRootNode->RemoveMutationObserver(mMutationObserver); @@ -267,9 +266,7 @@ // Make sure that editor init doesn't do things that would kill us off // (especially off the script blockers it'll create for its DOM mutations). { - RefPtr textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); + RefPtr textControlElement = ControlElement(); // Hide selection changes during the initialization, as webpages should not // be aware of these initializations @@ -385,9 +382,7 @@ AddStateBits(NS_FRAME_INDEPENDENT_SELECTION); - RefPtr textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); + RefPtr textControlElement = ControlElement(); mRootNode = MakeAnonElement(PseudoStyleType::mozTextControlEditingRoot); if (NS_WARN_IF(!mRootNode)) { return NS_ERROR_FAILURE; @@ -448,9 +443,7 @@ // Also, input elements which have a cached selection should get eager // editor initialization. - TextControlElement* textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); + TextControlElement* textControlElement = ControlElement(); if (textControlElement->HasCachedSelection()) { return true; } @@ -536,13 +529,9 @@ } void nsTextControlFrame::CreatePreviewIfNeeded() { - RefPtr textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - if (!textControlElement->IsPreviewEnabled()) { + if (!ControlElement()->IsPreviewEnabled()) { return; } - mPreviewDiv = MakeAnonDivWithTextNode(PseudoStyleType::mozTextControlPreview); } @@ -798,17 +787,13 @@ // IMPLEMENTING NS_IFORMCONTROLFRAME void nsTextControlFrame::SetFocus(bool aOn, bool aRepaint) { - TextControlElement* textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - // If 'dom.placeholeder.show_on_focus' preference is 'false', focusing or // blurring the frame can have an impact on the placeholder visibility. if (!aOn) { return; } - nsISelectionController* selCon = textControlElement->GetSelectionController(); + nsISelectionController* selCon = GetSelectionController(); if (!selCon) { return; } @@ -877,22 +862,15 @@ if (NS_WARN_IF(NS_FAILED(EnsureEditorInitialized()))) { return nullptr; } - - RefPtr textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - RefPtr textEditor = textControlElement->GetTextEditor(); - return textEditor.forget(); + RefPtr el = ControlElement(); + return do_AddRef(el->GetTextEditor()); } nsresult nsTextControlFrame::SetSelectionInternal( nsINode* aStartNode, uint32_t aStartOffset, nsINode* aEndNode, uint32_t aEndOffset, SelectionDirection aDirection) { // Get the selection, clear it and add the new range to it! - TextControlElement* textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - nsISelectionController* selCon = textControlElement->GetSelectionController(); + nsISelectionController* selCon = GetSelectionController(); NS_ENSURE_TRUE(selCon, NS_ERROR_FAILURE); RefPtr selection = @@ -905,7 +883,7 @@ direction = selection->GetDirection(); } else { direction = - (aDirection == SelectionDirection::Backward) ? eDirPrevious : eDirNext; + aDirection == SelectionDirection::Backward ? eDirPrevious : eDirNext; } MOZ_TRY(selection->SetStartAndEndInLimiter(*aStartNode, aStartOffset, @@ -916,9 +894,7 @@ void nsTextControlFrame::ScrollSelectionIntoViewAsync( ScrollAncestors aScrollAncestors) { - auto* textControlElement = TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - nsISelectionController* selCon = textControlElement->GetSelectionController(); + nsISelectionController* selCon = GetSelectionController(); if (!selCon) { return; } @@ -1051,52 +1027,49 @@ nsresult nsTextControlFrame::AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute, int32_t aModType) { - auto* textControlElement = TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - nsISelectionController* selCon = textControlElement->GetSelectionController(); - const bool needEditor = - nsGkAtoms::maxlength == aAttribute || nsGkAtoms::readonly == aAttribute || - nsGkAtoms::disabled == aAttribute || nsGkAtoms::spellcheck == aAttribute; - RefPtr textEditor = needEditor ? GetTextEditor() : nullptr; - if ((needEditor && !textEditor) || !selCon) { - return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, - aModType); + if (aAttribute == nsGkAtoms::value && !mEditorHasBeenInitialized) { + UpdateValueDisplay(true); + return NS_OK; } - if (nsGkAtoms::maxlength == aAttribute) { - if (textEditor) { - textEditor->SetMaxTextLength(textControlElement->UsedMaxLength()); + if (aAttribute == nsGkAtoms::maxlength) { + if (RefPtr textEditor = GetTextEditor()) { + textEditor->SetMaxTextLength(ControlElement()->UsedMaxLength()); + return NS_OK; } - return NS_OK; } + return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); +} - if (nsGkAtoms::readonly == aAttribute || nsGkAtoms::disabled == aAttribute) { - if (AttributeExists(aAttribute)) { - if (nsContentUtils::IsFocusedContent(mContent)) { - selCon->SetCaretEnabled(false); - } - textEditor->AddFlags(nsIEditor::eEditorReadonlyMask); - } else { - if (!AttributeExists(aAttribute == nsGkAtoms::readonly - ? nsGkAtoms::disabled - : nsGkAtoms::readonly)) { - if (nsContentUtils::IsFocusedContent(mContent)) { - selCon->SetCaretEnabled(true); - } - textEditor->RemoveFlags(nsIEditor::eEditorReadonlyMask); - } +void nsTextControlFrame::HandleReadonlyOrDisabledChange() { + RefPtr el = ControlElement(); + RefPtr editor = el->GetTextEditorWithoutCreation(); + if (!editor) { + return; + } + nsISelectionController* selCon = el->GetSelectionController(); + if (!selCon) { + return; + } + if (el->IsDisabledOrReadOnly()) { + if (nsContentUtils::IsFocusedContent(el)) { + selCon->SetCaretEnabled(false); } - return NS_OK; + editor->AddFlags(nsIEditor::eEditorReadonlyMask); + } else { + if (nsContentUtils::IsFocusedContent(el)) { + selCon->SetCaretEnabled(true); + } + editor->RemoveFlags(nsIEditor::eEditorReadonlyMask); } +} - if (!mEditorHasBeenInitialized && nsGkAtoms::value == aAttribute) { - UpdateValueDisplay(true); - return NS_OK; +void nsTextControlFrame::ElementStateChanged(dom::ElementState aStates) { + if (aStates.HasAtLeastOneOfStates(dom::ElementState::READONLY | + dom::ElementState::DISABLED)) { + HandleReadonlyOrDisabledChange(); } - - // Allow the base class to handle common attributes supported by all form - // elements... - return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); + return nsContainerFrame::ElementStateChanged(aStates); } /// END NSIFRAME OVERLOADS @@ -1129,9 +1102,7 @@ if (nsIFrame* frame = FindRootNodeFrame(PrincipalChildList(), mRootNode)) { frame->AddStateBits(NS_FRAME_REFLOW_ROOT); - auto* textControlElement = TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - textControlElement->InitializeKeyboardEventListeners(); + ControlElement()->InitializeKeyboardEventListeners(); bool hasProperty; nsPoint contentScrollPos = TakeProperty(ContentScrollPos(), &hasProperty); @@ -1179,16 +1150,12 @@ NS_ENSURE_TRUE(textContent, NS_ERROR_UNEXPECTED); - TextControlElement* textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - // Get the current value of the textfield from the content. nsAutoString value; if (aValue) { value = *aValue; } else { - textControlElement->GetTextEditorValue(value); + ControlElement()->GetTextEditorValue(value); } return textContent->SetText(value, aNotify); @@ -1198,23 +1165,10 @@ nsTextControlFrame::GetOwnedSelectionController( nsISelectionController** aSelCon) { NS_ENSURE_ARG_POINTER(aSelCon); - - TextControlElement* textControlElement = - TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - - *aSelCon = textControlElement->GetSelectionController(); - NS_IF_ADDREF(*aSelCon); - + NS_IF_ADDREF(*aSelCon = GetSelectionController()); return NS_OK; } -nsFrameSelection* nsTextControlFrame::GetOwnedFrameSelection() { - auto* textControlElement = TextControlElement::FromNode(GetContent()); - MOZ_ASSERT(textControlElement); - return textControlElement->GetConstFrameSelection(); -} - UniquePtr nsTextControlFrame::SaveState() { if (nsIStatefulFrame* scrollStateFrame = do_QueryFrame(GetScrollTargetFrame())) { @@ -1294,16 +1248,13 @@ if (NS_SUCCEEDED( dragSession->GetSourceNode(getter_AddRefs(sourceNode))) && mFrame->GetContent() == sourceNode) { - if (TextControlElement* textControlElement = - TextControlElement::FromNode(mFrame->GetContent())) { - if (TextEditor* textEditor = - textControlElement->GetTextEditorWithoutCreation()) { - if (Element* anonymousDivElement = textEditor->GetRoot()) { - if (anonymousDivElement && anonymousDivElement->GetFirstChild()) { - MOZ_ASSERT(anonymousDivElement->GetFirstChild()->IsText()); - dragSession->UpdateSource(anonymousDivElement->GetFirstChild(), - textEditor->GetSelection()); - } + if (TextEditor* textEditor = + mFrame->ControlElement()->GetTextEditorWithoutCreation()) { + if (Element* anonymousDivElement = textEditor->GetRoot()) { + if (anonymousDivElement && anonymousDivElement->GetFirstChild()) { + MOZ_ASSERT(anonymousDivElement->GetFirstChild()->IsText()); + dragSession->UpdateSource(anonymousDivElement->GetFirstChild(), + textEditor->GetSelection()); } } } @@ -1311,8 +1262,8 @@ } } // Otherwise, EventStateManager may be tracking gesture to start a drag. - else if (TextControlElement* textControlElement = - TextControlElement::FromNode(mFrame->GetContent())) { + else { + TextControlElement* textControlElement = mFrame->ControlElement(); if (nsPresContext* presContext = textControlElement->GetPresContext(Element::eForComposedDoc)) { if (TextEditor* textEditor = diff -Nru firefox-119.0+build2/layout/forms/nsTextControlFrame.h firefox-119.0.1+build1/layout/forms/nsTextControlFrame.h --- firefox-119.0+build2/layout/forms/nsTextControlFrame.h 2023-10-19 23:40:51.000000000 +0000 +++ firefox-119.0.1+build1/layout/forms/nsTextControlFrame.h 2023-11-07 06:33:13.000000000 +0000 @@ -138,7 +138,12 @@ SelectionDirection = SelectionDirection::None) override; NS_IMETHOD GetOwnedSelectionController( nsISelectionController** aSelCon) override; - nsFrameSelection* GetOwnedFrameSelection() override; + nsFrameSelection* GetOwnedFrameSelection() override { + return ControlElement()->GetConstFrameSelection(); + } + nsISelectionController* GetSelectionController() { + return ControlElement()->GetSelectionController(); + } void PlaceholderChanged(const nsAttrValue* aOld, const nsAttrValue* aNew); @@ -163,6 +168,7 @@ /** handler for attribute changes to mContent */ MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult AttributeChanged( int32_t aNameSpaceID, nsAtom* aAttribute, int32_t aModType) override; + void ElementStateChanged(mozilla::dom::ElementState aStates) override; nsresult PeekOffset(mozilla::PeekOffsetStruct* aPos) override; @@ -174,6 +180,8 @@ void ScrollSelectionIntoViewAsync(ScrollAncestors = ScrollAncestors::No); protected: + MOZ_CAN_RUN_SCRIPT_BOUNDARY void HandleReadonlyOrDisabledChange(); + /** * Launch the reflow on the child frames - see nsTextControlFrame::Reflow() */ @@ -199,13 +207,14 @@ nsresult MaybeBeginSecureKeyboardInput(); void MaybeEndSecureKeyboardInput(); -#define DEFINE_TEXTCTRL_CONST_FORWARDER(type, name) \ - type name() const { \ - mozilla::TextControlElement* textControlElement = \ - mozilla::TextControlElement::FromNode(GetContent()); \ - return textControlElement->name(); \ + mozilla::TextControlElement* ControlElement() const { + MOZ_ASSERT(mozilla::TextControlElement::FromNode(GetContent())); + return static_cast(GetContent()); } +#define DEFINE_TEXTCTRL_CONST_FORWARDER(type, name) \ + type name() const { return ControlElement()->name(); } + DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsSingleLineTextControl) DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsTextArea) DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsPasswordTextControl) diff -Nru firefox-119.0+build2/layout/reftests/forms/select/arrow-color.html firefox-119.0.1+build1/layout/reftests/forms/select/arrow-color.html --- firefox-119.0+build2/layout/reftests/forms/select/arrow-color.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/layout/reftests/forms/select/arrow-color.html 2023-11-07 06:33:14.000000000 +0000 @@ -0,0 +1,4 @@ + + diff -Nru firefox-119.0+build2/layout/reftests/forms/select/arrow-color-notref.html firefox-119.0.1+build1/layout/reftests/forms/select/arrow-color-notref.html --- firefox-119.0+build2/layout/reftests/forms/select/arrow-color-notref.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/layout/reftests/forms/select/arrow-color-notref.html 2023-11-07 06:33:13.000000000 +0000 @@ -0,0 +1,4 @@ + + diff -Nru firefox-119.0+build2/layout/reftests/forms/select/reftest.list firefox-119.0.1+build1/layout/reftests/forms/select/reftest.list --- firefox-119.0+build2/layout/reftests/forms/select/reftest.list 2023-10-19 23:40:53.000000000 +0000 +++ firefox-119.0.1+build1/layout/reftests/forms/select/reftest.list 2023-11-07 06:33:13.000000000 +0000 @@ -28,3 +28,4 @@ == 1769580.html 1769580-ref.html == no-padding.html no-padding-ref.html +!= arrow-color.html arrow-color-notref.html diff -Nru firefox-119.0+build2/layout/style/res/forms.css firefox-119.0.1+build1/layout/style/res/forms.css --- firefox-119.0+build2/layout/style/res/forms.css 2023-10-19 23:40:53.000000000 +0000 +++ firefox-119.0.1+build1/layout/style/res/forms.css 2023-11-07 06:33:14.000000000 +0000 @@ -274,6 +274,9 @@ block-size: 100%; box-sizing: border-box; + /* Draw the arrow in the select's color */ + color: inherit; + /* Make sure to align properly with the display frame. Note that we want the baseline of the combobox to match the baseline of the diff -Nru firefox-119.0+build2/media/libcubeb/moz.yaml firefox-119.0.1+build1/media/libcubeb/moz.yaml --- firefox-119.0+build2/media/libcubeb/moz.yaml 2023-10-19 23:40:54.000000000 +0000 +++ firefox-119.0.1+build1/media/libcubeb/moz.yaml 2023-11-07 06:33:14.000000000 +0000 @@ -9,8 +9,8 @@ description: "Cross platform audio library" url: https://github.com/mozilla/cubeb license: ISC - release: f1bfefbbd412eaa0fe89f5afb3c11b427dc2446a (2023-09-26T02:23:21Z). - revision: f1bfefbbd412eaa0fe89f5afb3c11b427dc2446a + release: 5f0d17373b8913aaa583041857f086e8b54217bd (2023-10-26T09:43:35Z). + revision: 5f0d17373b8913aaa583041857f086e8b54217bd vendoring: url: https://github.com/mozilla/cubeb diff -Nru firefox-119.0+build2/media/libcubeb/src/cubeb_aaudio.cpp firefox-119.0.1+build1/media/libcubeb/src/cubeb_aaudio.cpp --- firefox-119.0+build2/media/libcubeb/src/cubeb_aaudio.cpp 2023-10-19 23:40:53.000000000 +0000 +++ firefox-119.0.1+build1/media/libcubeb/src/cubeb_aaudio.cpp 2023-11-07 06:33:14.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#include using namespace std; @@ -157,7 +158,7 @@ // changing device. std::mutex mutex; - std::unique_ptr in_buf; + std::vector in_buf; unsigned in_frame_size{}; // size of one input frame unique_ptr output_stream_params; @@ -702,13 +703,16 @@ return AAUDIO_CALLBACK_RESULT_CONTINUE; } + if (num_frames * stm->in_frame_size > stm->in_buf.size()) { + stm->in_buf.resize(num_frames * stm->in_frame_size); + } // The aaudio docs state that AAudioStream_read must not be called on // the stream associated with a callback. But we call it on the input stream // while this callback is for the output stream so this is ok. // We also pass timeout 0, giving us strong non-blocking guarantees. // This is exactly how it's done in the aaudio duplex example code snippet. long in_num_frames = - WRAP(AAudioStream_read)(stm->istream, stm->in_buf.get(), num_frames, 0); + WRAP(AAudioStream_read)(stm->istream, stm->in_buf.data(), num_frames, 0); if (in_num_frames < 0) { // error stm->state.store(stream_state::ERROR); LOG("AAudioStream_read: %s", @@ -729,13 +733,13 @@ // LOG("AAudioStream_read returned not enough frames: %ld instead of %d", // in_num_frames, num_frames); unsigned left = num_frames - in_num_frames; - char * buf = stm->in_buf.get() + in_num_frames * stm->in_frame_size; + uint8_t * buf = stm->in_buf.data() + in_num_frames * stm->in_frame_size; std::memset(buf, 0x0, left * stm->in_frame_size); in_num_frames = num_frames; } long done_frames = - cubeb_resampler_fill(stm->resampler, stm->in_buf.get(), &in_num_frames, + cubeb_resampler_fill(stm->resampler, stm->in_buf.data(), &in_num_frames, audio_data, num_frames); if (done_frames < 0 || done_frames > num_frames) { @@ -1160,7 +1164,7 @@ WRAP(AAudioStream_getBufferSizeInFrames)(stm->istream)); LOG("AAudio input stream buffer rate: %d", rate); - stm->in_buf.reset(new char[bcap * frame_size]()); + stm->in_buf.resize(bcap * frame_size); assert(!stm->sample_rate || stm->sample_rate == stm->input_stream_params->rate); diff -Nru firefox-119.0+build2/media/libcubeb/src/cubeb_opensl.cpp firefox-119.0.1+build1/media/libcubeb/src/cubeb_opensl.cpp --- firefox-119.0+build2/media/libcubeb/src/cubeb_opensl.cpp 2023-10-19 23:40:54.000000000 +0000 +++ firefox-119.0.1+build1/media/libcubeb/src/cubeb_opensl.cpp 2023-11-07 06:33:14.000000000 +0000 @@ -1056,6 +1056,11 @@ LOG("Failed to create recorder. Error code: %lu", res); return CUBEB_ERROR; } + } else { + LOG("Failed to create recorder, not trying other input" + " rate. Error code: %lu", + res); + return CUBEB_ERROR; } // It's always possible to use int16 regardless of the Android version. // However if compiling for older Android version, it's possible to diff -Nru firefox-119.0+build2/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java firefox-119.0.1+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java --- firefox-119.0+build2/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java 2023-10-19 23:40:54.000000000 +0000 +++ firefox-119.0.1+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java 2023-11-07 06:33:14.000000000 +0000 @@ -56,6 +56,7 @@ import androidx.annotation.Nullable; import androidx.collection.SimpleArrayMap; import androidx.core.content.res.ResourcesCompat; +import java.net.InetSocketAddress; import java.net.Proxy; import java.nio.ByteBuffer; import java.util.List; @@ -1300,11 +1301,14 @@ return "DIRECT"; } + final InetSocketAddress proxyAddress = (InetSocketAddress) proxy.address(); + final String proxyString = proxyAddress.getHostString() + ":" + proxyAddress.getPort(); + switch (proxy.type()) { case HTTP: - return "PROXY " + proxy.address().toString(); + return "PROXY " + proxyString; case SOCKS: - return "SOCKS " + proxy.address().toString(); + return "SOCKS " + proxyString; } return "DIRECT"; diff -Nru firefox-119.0+build2/services/settings/dumps/blocklists/addons-bloomfilters.json firefox-119.0.1+build1/services/settings/dumps/blocklists/addons-bloomfilters.json --- firefox-119.0+build2/services/settings/dumps/blocklists/addons-bloomfilters.json 2023-10-19 23:40:57.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/blocklists/addons-bloomfilters.json 2023-11-07 06:33:15.000000000 +0000 @@ -3,6 +3,63 @@ { "stash": { "blocked": [ + "{1c9c86f0-f78e-4dad-93b8-acdc1c562cdc}:1.2", + "{1c9c86f0-f78e-4dad-93b8-acdc1c562cdc}:1.0" + ], + "unblocked": [] + }, + "schema": 1698410186722, + "key_format": "{guid}:{version}", + "stash_time": 1698842110267, + "id": "3d897432-fedb-4c5c-91a3-230cea844cb7", + "last_modified": 1698842179125 + }, + { + "stash": { + "blocked": [ + "{84239464-dbc0-48f4-a88c-8e0045e85fde}:0.0.0.1", + "{2f536ac3-2f1e-40ab-849d-431d9f7cf5ce}:4.65.1945", + "{84239464-dbc0-48f4-a88c-8e0045e85fde}:0.0.0.2", + "{2f536ac3-2f1e-40ab-849d-431d9f7cf5ce}:4.65.1946" + ], + "unblocked": [] + }, + "schema": 1698333341043, + "key_format": "{guid}:{version}", + "stash_time": 1698410111146, + "id": "32190872-b782-4a10-8616-6f31f32e2987", + "last_modified": 1698410186530 + }, + { + "stash": { + "blocked": [ + "assinador@quicksoft.com.br:0.4.3", + "assinador@quicksoft.com.br:0.4.0", + "addonY143@manualslibrary.co:1.23.918", + "{df235bcf-c888-4cd8-948c-368ad1f21f31}:4.1.57", + "assinador@quicksoft.com.br:0.4.4", + "{bff3f372-c165-41d9-bf56-7e2c03f8d3ac}:0.8", + "{bff3f372-c165-41d9-bf56-7e2c03f8d3ac}:0.9", + "{93f2cbe2-9794-400a-a5d9-3ca61c1a7245}:1.65.0", + "{be27f84b-b03d-48e4-9a1c-36fbd0d2c800}:1.0.5", + "{4f4437b3-9602-48be-94f8-5d4260eedac2}:5.2", + "{4f4437b3-9602-48be-94f8-5d4260eedac2}:5.1", + "{4f4437b3-9602-48be-94f8-5d4260eedac2}:5.3", + "assinador@quicksoft.com.br:0.4.1", + "{4f4437b3-9602-48be-94f8-5d4260eedac2}:5.3.1", + "assinador@quicksoft.com.br:0.4.2" + ], + "unblocked": [] + }, + "schema": 1697632578853, + "key_format": "{guid}:{version}", + "stash_time": 1698150908561, + "id": "565e0e99-b036-4bd6-88fc-7c51b312fe0b", + "last_modified": 1698150973785 + }, + { + "stash": { + "blocked": [ "adguard-vpn@adguard.com:0.6.20", "adguard-vpn@adguard.com:0.8.21" ], @@ -2559,5 +2616,5 @@ "last_modified": 1690223886167 } ], - "timestamp": 1697632578677 + "timestamp": 1698842179125 } diff -Nru firefox-119.0+build2/services/settings/dumps/main/cookie-banner-rules-list.json firefox-119.0.1+build1/services/settings/dumps/main/cookie-banner-rules-list.json --- firefox-119.0+build2/services/settings/dumps/main/cookie-banner-rules-list.json 2023-10-19 23:40:57.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/main/cookie-banner-rules-list.json 2023-11-07 06:33:15.000000000 +0000 @@ -1,45 +1,324 @@ { "data": [ { - "schema": 1696497904676, + "click": { + "optIn": ".fc-cta-consent", + "optOut": ".fc-cta-do-not-consent", + "presence": ".fc-dialog-container" + }, + "schema": 1697557061727, + "domains": [ + "accuweather.com" + ], + "id": "10B17126-C30B-4EE5-9CF5-A4CAFD361AEB", + "last_modified": 1697710931649 + }, + { + "click": { + "optIn": ".js-disc-cp-accept-all", + "optOut": ".js-disc-cp-deny-all", + "presence": ".disc-cp-modal__modal" + }, + "schema": 1697557061727, "cookies": { "optOut": [ { - "name": "c24consent", - "value": "f" + "name": "obiConsent", + "value": "c1-1|c2-0|c3-0|c4-0|c5-0|ts-4127464398701|consent-true" + }, + { + "name": "miCookieOptOut", + "value": "1" } ] }, "domains": [ - "check24.de" + "obi.de" ], - "id": "d4f2492e-c801-4687-84c8-e2cd17b4f115", - "last_modified": 1696579709256 + "id": "02BB875E-D588-4C12-9BE8-FD467C050B86", + "last_modified": 1697710931646 }, { "click": { - "optIn": ".qc-cmp2-summary-buttons > :nth-child(3)", - "optOut": ".qc-cmp2-summary-buttons > :nth-child(2)", - "presence": "#qc-cmp2-container" + "optIn": "#cmpwelcomebtnyes a", + "presence": "#cmpbox" }, - "schema": 1696497904676, + "schema": 1697557061727, + "domains": [ + "mail.ru", + "blic.rs", + "hrt.hr", + "eventim.de" + ], + "id": "EA3C8C1C-8B1A-46A4-8631-750ECC29425A", + "last_modified": 1697710931642 + }, + { + "click": { + "optIn": "#cmpwelcomebtnyes a", + "optOut": "#cmpwelcomebtnno a", + "presence": "#cmpbox" + }, + "schema": 1697557061727, + "domains": [ + "adac.de" + ], + "id": "E46708B7-B378-4AA5-A700-12D7221537A0", + "last_modified": 1697710931639 + }, + { + "schema": 1697557061727, + "cookies": { + "optOut": [ + { + "name": "cookie_consent", + "value": "denied" + }, + { + "name": "marketing_consent", + "value": "denied" + }, + { + "name": "personalization_consent", + "value": "denied" + } + ] + }, + "domains": [ + "arbeitsagentur.de" + ], + "id": "A04DD123-A10F-4665-9C2B-2FB5CC293F42", + "last_modified": 1697710931635 + }, + { + "click": { + "optIn": "button[data-test=\"pwa-consent-layer-accept-all\"]", + "optOut": "button[data-test=\"pwa-consent-layer-deny-all\"]", + "presence": "#mms-consent-portal-container" + }, + "schema": 1697557061727, + "cookies": { + "optOut": [ + { + "name": "pwaconsent", + "value": "v:1.0~required:1&clf:1,cli:1,gfb:1,gtm:1,jot:1,ocx:1|comfort:0&baz:0,cne:0,con:0,fix:0,gfa:0,goa:0,gom:0,grc:0,grv:0,inm:0,lib:0,lob:0,opt:0,orc:0,ore:0,pcl:0,sen:0,sis:0,spe:0,sst:0,swo:0,twi:0,usw:0,usz:0,yte:0|marketing:0&cri:0,eam:0,fab:0,fbc:0,fcm:0,gac:0,gad:0,gcl:0,gcm:0,gdv:0,gos:0,gse:0,msb:0,omp:0,pin:0,ttd:0,twt:0|" + } + ] + }, + "domains": [ + "mediamarkt.de", + "saturn.de" + ], + "id": "2A2B8102-D276-4ECE-AFBD-005E8E917D18", + "last_modified": 1697710931632 + }, + { + "click": { + "optIn": "div[data-tracking-opt-in-accept=\"true\"]", + "presence": "div[data-tracking-opt-in-overlay=\"true\"]" + }, + "schema": 1697557061727, + "domains": [ + "fandom.com" + ], + "id": "D168AF87-F481-4AD7-BE78-28A59F798406", + "last_modified": 1697710931628 + }, + { + "click": { + "optIn": "#consentAcceptAll", + "optOut": "#rejectAll", + "presence": "#__tealiumGDPRecModal" + }, + "schema": 1697557061727, + "domains": [ + "telekom.com", + "telekom.de" + ], + "id": "8907164E-17D8-4D27-B0A3-EDDA59F53DBE", + "last_modified": 1697710931625 + }, + { + "click": { + "optIn": "#dip-consent-summary-accept-all", + "optOut": "#dip-consent-summary-reject-all", + "presence": "#dip-consent" + }, + "schema": 1697557061727, "cookies": {}, "domains": [ - "ign.com" + "vodafone.de" ], - "id": "FB43FF71-9546-43D1-8B52-D208D1347095", - "last_modified": 1696579709252 + "id": "B85F7D67-D6D4-40EE-8472-A32B6CD01E0E", + "last_modified": 1697710931621 + }, + { + "schema": 1697557061727, + "cookies": { + "optOut": [ + { + "name": "CONSENTMGR", + "value": "c1:1%7Cc2:0%7Cc3:0%7Cc4:0%7Cc5:0%7Cc6:0%7Cc7:0%7Cc8:0%7Cc9:0%7Cc10:0%7Cc11:0%7Cc12:0%7Cc13:0%7Cc14:0%7Cc15:0%7Cts:111697211775123%7Cconsent:true" + }, + { + "name": "request_consent_v", + "value": "3" + } + ] + }, + "domains": [ + "bahn.de" + ], + "id": "D4AD5843-DDBD-4D93-BFBA-F53DD8B53111", + "last_modified": 1697710931618 + }, + { + "schema": 1697557061727, + "cookies": { + "optIn": [ + { + "name": "consent_status", + "value": "true" + } + ], + "optOut": [ + { + "name": "consent_status", + "value": "false" + } + ] + }, + "domains": [ + "immobilienscout24.de" + ], + "id": "3BD1F0DA-BABB-4F75-9B56-C92A1CFD114B", + "last_modified": 1697710931613 }, { "click": { - "optIn": "button#onetrust-accept-btn-handler", - "optOut": ".ot-pc-refuse-all-handler, #onetrust-reject-all-handler", - "presence": "div#onetrust-consent-sdk" + "optIn": ".cmpboxbtnyes", + "optOut": ".cmpboxbtnsave", + "presence": "#cmpwrapper" }, - "schema": 1696497904676, - "domains": [], - "id": "onetrust", - "last_modified": 1696579709242 + "schema": 1697557061727, + "domains": [ + "gls-pakete.de" + ], + "id": "1D4DDA28-C6FC-489F-B2F3-07EAAB4F5AFE", + "last_modified": 1697710931609 + }, + { + "click": { + "optIn": "button[data-test-id=\"cookie-notice-accept\"]", + "optOut": "button[data-test-id=\"cookie-notice-reject\"]", + "presence": ".cookie-notice" + }, + "schema": 1697557061727, + "cookies": { + "optOut": [ + { + "name": "ECCC", + "value": "e" + } + ] + }, + "domains": [ + "ecosia.org" + ], + "id": "7BA8E4AF-438A-40FE-8941-F921AA1FEA2A", + "last_modified": 1697710931606 + }, + { + "click": { + "optIn": "button#didomi-notice-agree-button", + "presence": "div#didomi-host" + }, + "schema": 1697557061727, + "cookies": {}, + "domains": [ + "echo24.cz", + "jeuxvideo.com", + "24sata.hr", + "nova.cz", + "lidovky.cz", + "jutarnji.hr", + "vecernji.hr", + "sport.es", + "elespanol.com", + "in-pocasi.cz", + "20minutes.fr", + "actu.fr", + "hbvl.be", + "naszemiasto.pl", + "leboncoin.fr", + "rtbf.be", + "20minutos.es", + "sudinfo.be", + "elpais.com", + "sinoptik.bg", + "lequipe.fr", + "abc.es", + "gva.be", + "eltiempo.es", + "eldiario.es", + "larazon.es", + "extra.cz", + "ladepeche.fr", + "marmiton.org", + "poslovni.hr", + "softonic.com", + "sydsvenskan.se", + "telecinco.es", + "giphy.com", + "filmstarts.de", + "moviepilot.de" + ], + "id": "af4c5b38-d210-472b-9a07-21cbe53c85ab", + "last_modified": 1697710931601 + }, + { + "click": { + "optIn": ".sp_choice_type_11", + "presence": ".message-container > #notice", + "runContext": "child", + "skipPresenceVisibilityCheck": true + }, + "schema": 1697557061727, + "cookies": {}, + "domains": [ + "hln.be", + "nu.nl", + "vg.no", + "aftonbladet.se", + "ad.nl", + "finn.no", + "sporza.be", + "derstandard.at", + "tori.fi", + "vrt.be", + "spiegel.de", + "aftenposten.no", + "vglive.no", + "oikotie.fi", + "klart.se", + "zeit.de", + "gala.de", + "gala.fr", + "volkskrant.nl", + "tek.no", + "omni.se", + "dpgmediagroup.com", + "economist.com", + "chefkoch.de", + "sport1.de", + "tagesspiegel.de", + "stern.de", + "sport.de", + "giga.de", + "handelsblatt.com" + ], + "id": "c58a0bac-3a5f-43af-93e9-8b5462a6bcb5", + "last_modified": 1697710931594 }, { "click": { @@ -47,7 +326,7 @@ "optOut": ".ot-pc-refuse-all-handler, #onetrust-reject-all-handler", "presence": "div#onetrust-consent-sdk" }, - "schema": 1696497904676, + "schema": 1697557061727, "cookies": {}, "domains": [ "espncricinfo.com", @@ -144,7 +423,6 @@ "people.com", "branch.io", "tv2.dk", - "disneyplus.com", "criteo.com", "trustpilot.com", "hm.com", @@ -273,10 +551,175 @@ "vol.at", "plotek.pl", "nypost.com", - "howstuffworks.com" + "howstuffworks.com", + "otto.de", + "kaufland.de", + "lidl.de", + "tripadvisor.de" + ], + "id": "6c7366a0-4762-47b9-8eeb-04e86cc7a0cc", + "last_modified": 1697710931590 + }, + { + "click": { + "optIn": ".sp_choice_type_11", + "presence": ".message-container > #notice", + "runContext": "child" + }, + "schema": 1697557061727, + "cookies": {}, + "domains": [ + "thetimes.co.uk", + "qz.com", + "privacy-mgmt.com", + "independent.co.uk", + "gizmodo.com", + "e24.no", + "thesun.co.uk", + "thesun.ie", + "focus.de", + "bild.de", + "computerbild.de", + "bloomberg.com", + "t-online.de", + "wetteronline.de", + "chip.de", + "n-tv.de", + "newsnow.co.uk", + "telegraph.co.uk", + "theguardian.com", + "faz.net", + "sueddeutsche.de", + "rtl.de", + "gutefrage.net", + "express.de", + "tvspielfilm.de", + "finanzen.net", + "tag24.de", + "kino.de", + "heise.de", + "bunte.de" + ], + "id": "d42bbaee-f96e-47e7-8e81-efc642518e97", + "last_modified": 1697710931583 + }, + { + "click": { + "optIn": "button[data-testid=\"cookie-banner-strict-accept-all\"]", + "optOut": "button[data-testid=\"cookie-banner-strict-accept-selected\"]", + "presence": "div[data-testid=\"dl-cookieBanner\"]" + }, + "schema": 1697557061727, + "cookies": { + "optOut": [ + { + "name": "privacySettings", + "value": "%7B%22v%22%3A%221%22%2C%22t%22%3A4127362064%2C%22m%22%3A%22STRICT%22%2C%22consent%22%3A%5B%22NECESSARY%22%5D%7D" + } + ] + }, + "domains": [ + "deepl.com" + ], + "id": "e3968548-ebca-4d6b-b8cf-5707e90fb612", + "last_modified": 1697710931573 + }, + { + "click": { + "optIn": "button#uc-btn-accept-banner", + "optOut": "button#uc-btn-deny-banner", + "presence": "div#uc-banner-modal" + }, + "schema": 1697557061727, + "cookies": {}, + "domains": [ + "zalando.ch", + "zalando.dk", + "zalando.be", + "zalando.de", + "zalando.at", + "zalando.co.uk", + "zalando.com", + "zalando.cz", + "zalando.ee", + "zalando.es", + "zalando.fi", + "zalando.fr", + "zalando.hr" + ], + "id": "3203ac4e-2454-4022-90fb-d4f51467ce20", + "last_modified": 1697710931567 + }, + { + "click": { + "optIn": "button.cb_accept", + "presence": "[data-module=\"cookieBanner\"]" + }, + "schema": 1697557061727, + "cookies": { + "optIn": [ + { + "host": "ok.ru", + "name": "cookieChoice", + "value": "\"PRIVACY,1,2,3\"", + "unsetValue": "\"\"" + } + ], + "optOut": [ + { + "host": "ok.ru", + "name": "cookieChoice", + "value": "\"PRIVACY\"", + "unsetValue": "\"\"" + } + ] + }, + "domains": [ + "ok.ru" ], - "id": "6c7366a0-4762-47b9-8eeb-04e86cc7a0cc", - "last_modified": 1696579709232 + "id": "384b70c3-2458-4dc9-ac6f-d9c5e90cc62a", + "last_modified": 1697710931560 + }, + { + "schema": 1696497904676, + "cookies": { + "optOut": [ + { + "name": "c24consent", + "value": "f" + } + ] + }, + "domains": [ + "check24.de" + ], + "id": "d4f2492e-c801-4687-84c8-e2cd17b4f115", + "last_modified": 1696579709256 + }, + { + "click": { + "optIn": ".qc-cmp2-summary-buttons > :nth-child(3)", + "optOut": ".qc-cmp2-summary-buttons > :nth-child(2)", + "presence": "#qc-cmp2-container" + }, + "schema": 1696497904676, + "cookies": {}, + "domains": [ + "ign.com" + ], + "id": "FB43FF71-9546-43D1-8B52-D208D1347095", + "last_modified": 1696579709252 + }, + { + "click": { + "optIn": "button#onetrust-accept-btn-handler", + "optOut": ".ot-pc-refuse-all-handler, #onetrust-reject-all-handler", + "presence": "div#onetrust-consent-sdk" + }, + "schema": 1696497904676, + "domains": [], + "id": "onetrust", + "last_modified": 1696579709242 }, { "click": { @@ -405,52 +848,6 @@ }, { "click": { - "optIn": "button#didomi-notice-agree-button", - "presence": "div#didomi-host" - }, - "schema": 1690070404721, - "cookies": {}, - "domains": [ - "echo24.cz", - "jeuxvideo.com", - "24sata.hr", - "nova.cz", - "lidovky.cz", - "jutarnji.hr", - "vecernji.hr", - "sport.es", - "elespanol.com", - "in-pocasi.cz", - "20minutes.fr", - "actu.fr", - "hbvl.be", - "naszemiasto.pl", - "leboncoin.fr", - "rtbf.be", - "20minutos.es", - "sudinfo.be", - "elpais.com", - "sinoptik.bg", - "lequipe.fr", - "abc.es", - "gva.be", - "eltiempo.es", - "eldiario.es", - "larazon.es", - "extra.cz", - "ladepeche.fr", - "marmiton.org", - "poslovni.hr", - "softonic.com", - "sydsvenskan.se", - "telecinco.es", - "giphy.com" - ], - "id": "af4c5b38-d210-472b-9a07-21cbe53c85ab", - "last_modified": 1690359097306 - }, - { - "click": { "optIn": "#acceptAllButton", "optOut": "#rejectAllButton", "presence": "#cookiePrefPopup" @@ -627,42 +1024,6 @@ }, { "click": { - "optIn": ".sp_choice_type_11", - "presence": ".message-container > #notice", - "runContext": "child", - "skipPresenceVisibilityCheck": true - }, - "schema": 1678092903414, - "cookies": {}, - "domains": [ - "hln.be", - "nu.nl", - "vg.no", - "aftonbladet.se", - "ad.nl", - "finn.no", - "sporza.be", - "derstandard.at", - "tori.fi", - "vrt.be", - "spiegel.de", - "aftenposten.no", - "vglive.no", - "oikotie.fi", - "klart.se", - "zeit.de", - "gala.fr", - "volkskrant.nl", - "tek.no", - "omni.se", - "dpgmediagroup.com", - "economist.com" - ], - "id": "c58a0bac-3a5f-43af-93e9-8b5462a6bcb5", - "last_modified": 1678276263328 - }, - { - "click": { "optIn": "button#hs-eu-confirmation-button", "optOut": "button#hs-eu-decline-button", "presence": "div#hs-eu-cookie-confirmation" @@ -1072,37 +1433,6 @@ }, { "click": { - "optIn": ".sp_choice_type_11", - "presence": ".message-container > #notice", - "runContext": "child" - }, - "schema": 1678236486316, - "cookies": {}, - "domains": [ - "thetimes.co.uk", - "qz.com", - "privacy-mgmt.com", - "independent.co.uk", - "gizmodo.com", - "e24.no", - "thesun.co.uk", - "thesun.ie", - "focus.de", - "bild.de", - "bloomberg.com", - "t-online.de", - "wetteronline.de", - "chip.de", - "n-tv.de", - "newsnow.co.uk", - "telegraph.co.uk", - "theguardian.com" - ], - "id": "d42bbaee-f96e-47e7-8e81-efc642518e97", - "last_modified": 1678276263224 - }, - { - "click": { "optIn": "button.figma-mraqo7", "optOut": "button.figma-1lvfxnf", "presence": "div.figma-rmmjza" @@ -1201,33 +1531,6 @@ }, { "click": { - "optIn": "a.cmptxt_btn_yes", - "optOut": "a.cmptxt_btn_no", - "presence": "div#cmpbox" - }, - "schema": 1676828360243, - "cookies": {}, - "domains": [ - "hrt.hr" - ], - "id": "e735b61a-3a3f-418e-b2ff-93e3f8984d1b", - "last_modified": 1676903765547 - }, - { - "click": { - "optIn": "button.js-cb_accept", - "presence": "div.__cookies" - }, - "schema": 1676828360243, - "cookies": {}, - "domains": [ - "ok.ru" - ], - "id": "384b70c3-2458-4dc9-ac6f-d9c5e90cc62a", - "last_modified": 1676903765543 - }, - { - "click": { "optIn": "a.dismiss", "presence": "div#cookie-disclaimer" }, @@ -1819,22 +2122,6 @@ }, { "click": { - "optIn": "button#uc-btn-accept-banner", - "optOut": "button#uc-btn-deny-banner", - "presence": "div#uc-banner-modal" - }, - "schema": 1676900250688, - "cookies": {}, - "domains": [ - "zalando.ch", - "zalando.dk", - "zalando.be" - ], - "id": "3203ac4e-2454-4022-90fb-d4f51467ce20", - "last_modified": 1676903765390 - }, - { - "click": { "optIn": "button.css-1euwp1t", "presence": "div#qc-cmp2-container" }, @@ -3166,47 +3453,6 @@ }, { "click": { - "optIn": "div.policy-accept", - "presence": "div#privacy-policy-banner" - }, - "schema": 1676900248923, - "cookies": { - "optIn": [ - { - "name": ".AspNet.Consent", - "value": "yes" - } - ] - }, - "domains": [ - "accuweather.com" - ], - "id": "60f526aa-abb2-4930-bec4-7113af7481ae", - "last_modified": 1676903765005 - }, - { - "click": { - "optIn": "button.js_cookieBannerPermissionButton", - "optOut": "span.js_cookieBannerProhibitionButton", - "presence": "section#cookieBanner" - }, - "schema": 1676900249813, - "cookies": { - "optOut": [ - { - "name": "cb", - "value": "0" - } - ] - }, - "domains": [ - "otto.de" - ], - "id": "c9adac7f-74db-4eab-9b97-114ff5954226", - "last_modified": 1676903764994 - }, - { - "click": { "optIn": "button#didomi-notice-agree-button", "presence": "div#didomi-host" }, @@ -3269,25 +3515,6 @@ "last_modified": 1676903764990 }, { - "schema": 1676900247175, - "cookies": { - "optOut": [ - { - "name": "MSCC", - "value": "cid=qx7ft7mavj0leq4vylbl40vv-c1=1-c2=1-c3=1" - } - ] - }, - "domains": [ - "skype.com", - "microsoft.com", - "office.com", - "xbox.com" - ], - "id": "0c43a914-8bc7-4872-89f2-f1ad213d2a7f", - "last_modified": 1676903764976 - }, - { "click": { "optIn": "span.a-button-inner", "optOut": "a#sp-cc-rejectall-link", @@ -3707,19 +3934,6 @@ }, { "click": { - "optIn": "a.cmptxt_btn_yes", - "presence": "div#cmpbox" - }, - "schema": 1674146203493, - "cookies": {}, - "domains": [ - "blic.rs" - ], - "id": "3ecc13da-b0ee-487a-9af2-8cb166cf30ba", - "last_modified": 1674560738297 - }, - { - "click": { "optIn": "button.css-1tdle7a", "presence": "div#qc-cmp2-container" }, @@ -5626,20 +5840,6 @@ }, { "click": { - "optIn": ".cmpboxbtnyes", - "optOut": ".cmpboxbtnno", - "presence": "div#cmpbox" - }, - "schema": 1670460527205, - "cookies": {}, - "domains": [ - "mail.ru" - ], - "id": "77424a06-c47f-4b06-9925-e4d5afc7c61a", - "last_modified": 1670498157371 - }, - { - "click": { "optIn": "div.uiLayer div > button[type=submit]", "optOut": "div.uiLayer div > button + button[type=submit]", "presence": "div#cookie-banner" @@ -6001,20 +6201,6 @@ }, { "click": { - "optIn": "button.dl_cookieBanner--buttonAll", - "optOut": "button.dl_cookieBanner--buttonSelected", - "presence": "div#dl_cookieBanner" - }, - "schema": 1670460540364, - "cookies": {}, - "domains": [ - "deepl.com" - ], - "id": "e3968548-ebca-4d6b-b8cf-5707e90fb612", - "last_modified": 1670498157143 - }, - { - "click": { "optIn": "button.btn-primary", "presence": "div.alert-secondary" }, @@ -7791,5 +7977,5 @@ "last_modified": 1670498155641 } ], - "timestamp": 1696579709256 + "timestamp": 1697710931649 } diff -Nru firefox-119.0+build2/services/settings/dumps/main/devtools-compatibility-browsers.json firefox-119.0.1+build1/services/settings/dumps/main/devtools-compatibility-browsers.json --- firefox-119.0+build2/services/settings/dumps/main/devtools-compatibility-browsers.json 2023-10-19 23:40:57.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/main/devtools-compatibility-browsers.json 2023-11-07 06:33:15.000000000 +0000 @@ -1,6 +1,51 @@ { "data": [ { + "name": "Opera", + "schema": 1698451506980, + "status": "beta", + "version": "105", + "browserid": "opera", + "id": "2d0a87f2-bc88-43d1-9b46-9ebd16e3fb66", + "last_modified": 1698661473899 + }, + { + "name": "Opera", + "schema": 1698451506782, + "status": "current", + "version": "104", + "browserid": "opera", + "id": "513fd25f-3df1-4785-875b-766683e3445b", + "last_modified": 1698661473890 + }, + { + "name": "Edge", + "schema": 1698192307176, + "status": "nightly", + "version": "120", + "browserid": "edge", + "id": "74e217cb-3eb9-44b3-82d4-c14d54e78187", + "last_modified": 1698223476280 + }, + { + "name": "Edge", + "schema": 1698192307005, + "status": "current", + "version": "118", + "browserid": "edge", + "id": "36c856c4-dd23-4793-9bb0-827e7a56697c", + "last_modified": 1698223476277 + }, + { + "name": "Edge", + "schema": 1698192307072, + "status": "beta", + "version": "119", + "browserid": "edge", + "id": "eff1cf87-5add-4876-95db-5b84238437ab", + "last_modified": 1698223476272 + }, + { "name": "Chrome", "schema": 1696637108664, "status": "nightly", @@ -19,15 +64,6 @@ "last_modified": 1696863920657 }, { - "name": "Opera", - "schema": 1696637108907, - "status": "beta", - "version": "104", - "browserid": "opera", - "id": "513fd25f-3df1-4785-875b-766683e3445b", - "last_modified": 1696863920654 - }, - { "name": "Safari", "schema": 1696637108964, "status": "beta", @@ -64,15 +100,6 @@ "last_modified": 1696863920636 }, { - "name": "Opera", - "schema": 1696637108846, - "status": "current", - "version": "103", - "browserid": "opera", - "id": "aa7dd3da-4f83-4dce-84de-784409ffeed7", - "last_modified": 1696863920633 - }, - { "name": "Firefox for Android", "schema": 1696377903863, "status": "nightly", @@ -163,33 +190,6 @@ "last_modified": 1695880503534 }, { - "name": "Edge", - "schema": 1695859508246, - "status": "nightly", - "version": "119", - "browserid": "edge", - "id": "eff1cf87-5add-4876-95db-5b84238437ab", - "last_modified": 1695880503526 - }, - { - "name": "Edge", - "schema": 1695859508121, - "status": "current", - "version": "117", - "browserid": "edge", - "id": "ca91473a-c03b-4e16-8008-b9cec23ce674", - "last_modified": 1695880503520 - }, - { - "name": "Edge", - "schema": 1695859508183, - "status": "beta", - "version": "118", - "browserid": "edge", - "id": "36c856c4-dd23-4793-9bb0-827e7a56697c", - "last_modified": 1695880503515 - }, - { "name": "Node.js", "schema": 1695216243625, "status": "esr", @@ -271,15 +271,6 @@ "last_modified": 1692814731119 }, { - "name": "Edge", - "schema": 1691241843053, - "status": "planned", - "version": "120", - "browserid": "edge", - "id": "74e217cb-3eb9-44b3-82d4-c14d54e78187", - "last_modified": 1691389490462 - }, - { "name": "Samsung Internet", "schema": 1690982642139, "status": "current", @@ -343,5 +334,5 @@ "last_modified": 1645448267500 } ], - "timestamp": 1696863920660 + "timestamp": 1698661473899 } diff -Nru firefox-119.0+build2/services/settings/dumps/main/search-telemetry-v2.json firefox-119.0.1+build1/services/settings/dumps/main/search-telemetry-v2.json --- firefox-119.0+build2/services/settings/dumps/main/search-telemetry-v2.json 2023-10-19 23:40:56.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/main/search-telemetry-v2.json 2023-11-07 06:33:15.000000000 +0000 @@ -1,7 +1,241 @@ { "data": [ { - "schema": 1693526406093, + "schema": 1698656464939, + "taggedCodes": [ + "monline_dg", + "monline_3_dg", + "monline_4_dg", + "monline_7_dg" + ], + "telemetryId": "baidu", + "organicCodes": [], + "codeParamName": "tn", + "queryParamName": "wd", + "queryParamNames": [ + "wd", + "word" + ], + "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)", + "followOnParamNames": [ + "oq" + ], + "extraAdServersRegexps": [ + "^https?://www\\.baidu\\.com/baidu\\.php?" + ], + "id": "19c434a3-d173-4871-9743-290ac92a3f6a", + "last_modified": 1698666532326 + }, + { + "schema": 1698656463945, + "components": [ + { + "type": "ad_carousel", + "included": { + "parent": { + "selector": ".product-ads-carousel" + }, + "related": { + "selector": ".snippet__control" + }, + "children": [ + { + "selector": ".product-ads-carousel__item", + "countChildren": true + } + ] + } + }, + { + "type": "ad_link", + "included": { + "parent": { + "selector": ".ad-result" + }, + "children": [ + { + "type": "ad_sitelink", + "selector": ".result__extra-content .deep-links--descriptions" + } + ] + } + }, + { + "type": "incontent_searchbox", + "topDown": true, + "included": { + "parent": { + "selector": "form.search-form" + }, + "related": { + "selector": ".search-form__suggestions" + }, + "children": [ + { + "selector": ".search-form__input, .search-form__submit" + } + ] + } + }, + { + "type": "ad_link", + "default": true + } + ], + "shoppingTab": { + "regexp": "/shopping?", + "selector": "nav li[data-test-id='search-navigation-item-shopping'] a" + }, + "taggedCodes": [ + "mzl", + "813cf1dd", + "16eeffc4" + ], + "telemetryId": "ecosia", + "organicCodes": [], + "codeParamName": "tt", + "queryParamName": "q", + "queryParamNames": [ + "q" + ], + "searchPageRegexp": "^https://www\\.ecosia\\.org/", + "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0", + "expectedOrganicCodes": [], + "extraAdServersRegexps": [ + "^https://www\\.bing\\.com/acli?c?k" + ], + "id": "9a487171-3a06-4647-8866-36250ec84f3a", + "last_modified": 1698666532324 + }, + { + "schema": 1698656462833, + "components": [ + { + "type": "ad_carousel", + "included": { + "parent": { + "selector": ".adsMvCarousel" + }, + "related": { + "selector": ".cr" + }, + "children": [ + { + "selector": ".pa_item", + "countChildren": true + } + ] + } + }, + { + "type": "ad_link", + "excluded": { + "parent": { + "selector": "aside" + } + }, + "included": { + "parent": { + "selector": ".sb_adTA" + }, + "children": [ + { + "type": "ad_sitelink", + "selector": ".b_vlist2col" + } + ] + } + }, + { + "type": "ad_sidebar", + "included": { + "parent": { + "selector": "aside" + }, + "children": [ + { + "selector": ".pa_item, .sb_adTA", + "countChildren": true + } + ] + } + }, + { + "type": "incontent_searchbox", + "topDown": true, + "included": { + "parent": { + "selector": "form#sb_form" + }, + "related": { + "selector": "#sw_as" + }, + "children": [ + { + "selector": "input[name='q']" + } + ] + } + }, + { + "type": "ad_link", + "default": true + } + ], + "shoppingTab": { + "regexp": "^/shop?", + "selector": "#b-scopeListItem-shop a" + }, + "taggedCodes": [ + "MOZ2", + "MOZ4", + "MOZ5", + "MOZA", + "MOZB", + "MOZD", + "MOZE", + "MOZI", + "MOZL", + "MOZM", + "MOZO", + "MOZR", + "MOZT", + "MOZW", + "MOZX", + "MZSL01", + "MZSL02", + "MZSL03" + ], + "telemetryId": "bing", + "organicCodes": [], + "codeParamName": "pc", + "queryParamName": "q", + "followOnCookies": [ + { + "host": "www.bing.com", + "name": "SRCHS", + "codeParamName": "PC", + "extraCodePrefixes": [ + "QBRE" + ], + "extraCodeParamName": "form" + } + ], + "queryParamNames": [ + "q" + ], + "searchPageRegexp": "^https://www\\.bing\\.com/search", + "nonAdsLinkRegexps": [ + "^https://www.bing.com/ck/a" + ], + "extraAdServersRegexps": [ + "^https://www\\.bing\\.com/acli?c?k" + ], + "id": "e1eec461-f1f3-40de-b94b-3b670b78108c", + "last_modified": 1698666532321 + }, + { + "schema": 1698656461540, "components": [ { "type": "ad_carousel", @@ -100,6 +334,9 @@ "organicCodes": [], "codeParamName": "t", "queryParamName": "q", + "queryParamNames": [ + "q" + ], "searchPageRegexp": "^https://duckduckgo\\.com/", "expectedOrganicCodes": [ "h_", @@ -135,10 +372,10 @@ "^https://www\\.amazon\\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)" ], "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca", - "last_modified": 1694014137037 + "last_modified": 1698666532318 }, { - "schema": 1690815534466, + "schema": 1698333339811, "components": [ { "type": "ad_carousel", @@ -151,7 +388,7 @@ }, "children": [ { - "selector": ".pla-unit", + "selector": "[data-dtld]", "countChildren": true } ] @@ -228,6 +465,25 @@ } }, { + "type": "ad_image_row", + "excluded": { + "parent": { + "selector": ".pla-exp-container" + } + }, + "included": { + "parent": { + "selector": ".top-pla-group-inner" + }, + "children": [ + { + "selector": "[data-dtld]", + "countChildren": true + } + ] + } + }, + { "type": "ad_link", "default": true } @@ -268,9 +524,12 @@ "organicCodes": [], "codeParamName": "client", "queryParamName": "q", + "queryParamNames": [ + "q" + ], "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search", "nonAdsLinkRegexps": [ - "^https://www\\.google\\.(?:.+)/url?(?:.+)&url=" + "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url=" ], "adServerAttributes": [ "rw" @@ -281,235 +540,11 @@ "ei" ], "extraAdServersRegexps": [ - "^https://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk" + "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk" ], "id": "635a3325-1995-42d6-be09-dbe4b2a95453", - "last_modified": 1690923607449 - }, - { - "schema": 1690813466651, - "components": [ - { - "type": "ad_carousel", - "included": { - "parent": { - "selector": ".adsMvCarousel" - }, - "related": { - "selector": ".cr" - }, - "children": [ - { - "selector": ".pa_item", - "countChildren": true - } - ] - } - }, - { - "type": "ad_link", - "excluded": { - "parent": { - "selector": "aside" - } - }, - "included": { - "parent": { - "selector": ".sb_adTA" - }, - "children": [ - { - "type": "ad_sitelink", - "selector": ".b_vlist2col" - } - ] - } - }, - { - "type": "ad_sidebar", - "included": { - "parent": { - "selector": "aside" - }, - "children": [ - { - "selector": ".pa_item, .sb_adTA", - "countChildren": true - } - ] - } - }, - { - "type": "incontent_searchbox", - "topDown": true, - "included": { - "parent": { - "selector": "form#sb_form" - }, - "related": { - "selector": "#sw_as" - }, - "children": [ - { - "selector": "input[name='q']" - } - ] - } - }, - { - "type": "ad_link", - "default": true - } - ], - "shoppingTab": { - "regexp": "^/shop?", - "selector": "#b-scopeListItem-shop a" - }, - "taggedCodes": [ - "MOZ2", - "MOZ4", - "MOZ5", - "MOZA", - "MOZB", - "MOZD", - "MOZE", - "MOZI", - "MOZL", - "MOZM", - "MOZO", - "MOZR", - "MOZT", - "MOZW", - "MOZX", - "MOZSL01", - "MOZSL02", - "MOZSL03" - ], - "telemetryId": "bing", - "organicCodes": [], - "codeParamName": "pc", - "queryParamName": "q", - "followOnCookies": [ - { - "host": "www.bing.com", - "name": "SRCHS", - "codeParamName": "PC", - "extraCodePrefixes": [ - "QBRE" - ], - "extraCodeParamName": "form" - } - ], - "searchPageRegexp": "^https://www\\.bing\\.com/search", - "nonAdsLinkRegexps": [ - "^https://www.bing.com/ck/a" - ], - "extraAdServersRegexps": [ - "^https://www\\.bing\\.com/acli?c?k" - ], - "id": "e1eec461-f1f3-40de-b94b-3b670b78108c", - "last_modified": 1690923607446 - }, - { - "schema": 1684859718822, - "components": [ - { - "type": "ad_carousel", - "included": { - "parent": { - "selector": ".product-ads-carousel" - }, - "related": { - "selector": ".snippet__control" - }, - "children": [ - { - "selector": ".product-ads-carousel__item", - "countChildren": true - } - ] - } - }, - { - "type": "ad_link", - "included": { - "parent": { - "selector": ".ad-result" - }, - "children": [ - { - "type": "ad_sitelink", - "selector": ".result__extra-content .deep-links--descriptions" - } - ] - } - }, - { - "type": "incontent_searchbox", - "topDown": true, - "included": { - "parent": { - "selector": "form.search-form" - }, - "related": { - "selector": ".search-form__suggestions" - }, - "children": [ - { - "selector": ".search-form__input, .search-form__submit" - } - ] - } - }, - { - "type": "ad_link", - "default": true - } - ], - "shoppingTab": { - "regexp": "/shopping?", - "selector": "nav li[data-test-id='search-navigation-item-shopping'] a" - }, - "taggedCodes": [ - "mzl", - "813cf1dd", - "16eeffc4" - ], - "telemetryId": "ecosia", - "organicCodes": [], - "codeParamName": "tt", - "queryParamName": "q", - "searchPageRegexp": "^https://www\\.ecosia\\.org/", - "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0", - "expectedOrganicCodes": [], - "extraAdServersRegexps": [ - "^https://www\\.bing\\.com/acli?c?k" - ], - "id": "9a487171-3a06-4647-8866-36250ec84f3a", - "last_modified": 1684879440533 - }, - { - "schema": 1643107838909, - "taggedCodes": [ - "monline_dg", - "monline_3_dg", - "monline_4_dg", - "monline_7_dg" - ], - "telemetryId": "baidu", - "organicCodes": [], - "codeParamName": "tn", - "queryParamName": "wd", - "searchPageRegexp": "^https://www\\.baidu\\.com/(?:s|baidu)", - "followOnParamNames": [ - "oq" - ], - "extraAdServersRegexps": [ - "^https?://www\\.baidu\\.com/baidu\\.php?" - ], - "id": "19c434a3-d173-4871-9743-290ac92a3f6a", - "last_modified": 1643136933989 + "last_modified": 1698666532316 } ], - "timestamp": 1694014137037 + "timestamp": 1698666532326 } diff -Nru firefox-119.0+build2/services/settings/dumps/main/translations-models.json firefox-119.0.1+build1/services/settings/dumps/main/translations-models.json --- firefox-119.0+build2/services/settings/dumps/main/translations-models.json 2023-10-19 23:40:57.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/main/translations-models.json 2023-11-07 06:33:15.000000000 +0000 @@ -1,6 +1,60 @@ { "data": [ { + "name": "lex.50.50.enhu.s2t.bin", + "schema": 1698157791873, + "toLang": "hu", + "version": "0.1", + "fileType": "lex", + "fromLang": "en", + "attachment": { + "hash": "cd5f4424ab156b158c57707a1491a17922e1b2498e6af47ee324264834e4f319", + "size": 4167800, + "filename": "lex.50.50.enhu.s2t.bin", + "location": "main-workspace/translations-models/f24a9d9e-9749-4c1c-a0c2-27691aad5337.bin", + "mimetype": "application/octet-stream" + }, + "filter_expression": "env.channel == 'nightly' || env.channel == 'default'", + "id": "3fc12fec-6f4b-4eeb-9c70-f4c9367cb6d7", + "last_modified": 1698173965395 + }, + { + "name": "model.enhu.intgemm.alphas.bin", + "schema": 1698173725483, + "toLang": "hu", + "version": "0.1", + "fileType": "model", + "fromLang": "en", + "attachment": { + "hash": "3c639b9cf912049e4f6bc8cb612ae9d7a8e3a0e7879591b82c644a41dd527c45", + "size": 17140898, + "filename": "model.enhu.intgemm.alphas.bin", + "location": "main-workspace/translations-models/9ad83f77-510d-4646-947c-878369a4644f.bin", + "mimetype": "application/octet-stream" + }, + "filter_expression": "env.channel == 'nightly' || env.channel == 'default'", + "id": "84cc8410-3477-485e-b667-acb1f2cb5b3c", + "last_modified": 1698173965392 + }, + { + "name": "vocab.enhu.spm", + "schema": 1698173737909, + "toLang": "hu", + "version": "0.1", + "fileType": "vocab", + "fromLang": "en", + "attachment": { + "hash": "7c29d374a73886fac74a205c6a30dcd3dd7b3199126bee48312c55481b2cf505", + "size": 822969, + "filename": "vocab.enhu.spm", + "location": "main-workspace/translations-models/c947a0f3-0d30-470a-aacd-b4f6be9cc4a2.spm", + "mimetype": "application/x-source-rpm" + }, + "filter_expression": "env.channel == 'nightly' || env.channel == 'default'", + "id": "024f3696-0f97-43b6-9d09-249821ec83ea", + "last_modified": 1698173965388 + }, + { "name": "lex.50.50.caen.s2t.bin", "schema": 1697655965028, "toLang": "en", @@ -1783,5 +1837,5 @@ "last_modified": 1681500416031 } ], - "timestamp": 1697661153378 + "timestamp": 1698173965395 } diff -Nru firefox-119.0+build2/services/settings/dumps/security-state/intermediates.json firefox-119.0.1+build1/services/settings/dumps/security-state/intermediates.json --- firefox-119.0+build2/services/settings/dumps/security-state/intermediates.json 2023-10-19 23:40:57.000000000 +0000 +++ firefox-119.0.1+build1/services/settings/dumps/security-state/intermediates.json 2023-11-07 06:33:15.000000000 +0000 @@ -1,6 +1,132 @@ { "data": [ { + "schema": 1698353584270, + "derHash": "+OEat/gzu+k70Tu+0+MKPqup40pFEONEq8k0BMJtGAE=", + "subject": "CN=ZDNS ECC EV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgRUNDIEVWIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "d291fcf4b9c3dd7899d290b91c081c37d5f4f584a63641e836692513914462b9", + "size": 1264, + "filename": "E7KBGe5PvuRcg4hyZXb7k2MMDyymhBAYfQXlw7k4cAY=.pem", + "location": "security-state-staging/intermediates/bc6d3f60-6e18-45f1-9d40-ed6769c89232.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "E7KBGe5PvuRcg4hyZXb7k2MMDyymhBAYfQXlw7k4cAY=", + "crlite_enrolled": false, + "id": "11175cc2-4531-4e0d-8748-bd38f286ac37", + "last_modified": 1698353823411 + }, + { + "schema": 1698353583950, + "derHash": "PcJyve5ORgTUmHMsKMAmlj48sh3xmKKduUKFeLJEfaE=", + "subject": "CN=ZDNS ECC OV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgRUNDIE9WIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "9394a57b26e72b76fbcbe9bba73d69c34fc799c820b378b3b3082c3403dc143d", + "size": 1288, + "filename": "b4DdPS37e4mvyYbxFyRE322pWS7bjNGkMZCHChWzDz8=.pem", + "location": "security-state-staging/intermediates/f4423699-fdd3-4667-b927-945b76a6d94a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "b4DdPS37e4mvyYbxFyRE322pWS7bjNGkMZCHChWzDz8=", + "crlite_enrolled": false, + "id": "c5399ab9-36c4-42d2-8a9b-9e7183badb83", + "last_modified": 1698353823408 + }, + { + "schema": 1698353583663, + "derHash": "QcKfgLkY75YFzdzr29smg8MQxc8Kp9jr9niDk1AekLk=", + "subject": "CN=ZDNS RSA EV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgUlNBIEVWIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "ed6b1b93a3d3c74cf05119369cd7e778ff80f551bbf26b70eb5fc197558682d6", + "size": 2280, + "filename": "nsJxQPXGOMFqBzDqAsZFph87o95exDDQI8Fn87kP8ow=.pem", + "location": "security-state-staging/intermediates/a5f11967-825b-461c-ad33-dc72b92a6cec.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "nsJxQPXGOMFqBzDqAsZFph87o95exDDQI8Fn87kP8ow=", + "crlite_enrolled": false, + "id": "1cd3d46c-8877-43c9-a021-e649445e51b7", + "last_modified": 1698353823406 + }, + { + "schema": 1698353582759, + "derHash": "PMLBMvwjtaxnX4n4GXQQUgjR6qP7YbQGFf6ipoaOffk=", + "subject": "CN=ZDNS RSA DV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgUlNBIERWIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "5c4b66bee6cee9f123e3a30f4f551b0d58d4b8d64d8f573b677153f55cf9ceea", + "size": 2300, + "filename": "wsmLMLMBzij4PyD0NLtZjfvmy8w2zz3tsKaERPVIO58=.pem", + "location": "security-state-staging/intermediates/5b3aac97-9e80-4021-9262-6bbc930f6dda.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "wsmLMLMBzij4PyD0NLtZjfvmy8w2zz3tsKaERPVIO58=", + "crlite_enrolled": false, + "id": "2ef2f30a-3142-4813-994a-4c329c2bf3df", + "last_modified": 1698353823403 + }, + { + "schema": 1698353584579, + "derHash": "JNBy3qXvVP1qs6+18nujN3J95xKNAJ4H7m/T/xny2Js=", + "subject": "CN=ZDNS RSA OV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgUlNBIE9WIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "2f17bb4f9cb8e285224267a39b0f0ec978584fb37379675b04a8666a849399b8", + "size": 2300, + "filename": "N1qCCBXJIUydOQU7PWh2D2HOy0uJcolRGqd-CnBypX0=.pem", + "location": "security-state-staging/intermediates/a37a57d8-376e-4ccb-8626-d4a402aae5af.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "N1qCCBXJIUydOQU7PWh2D2HOy0uJcolRGqd+CnBypX0=", + "crlite_enrolled": false, + "id": "23a6f955-da53-45f9-bec5-04e95ba09a53", + "last_modified": 1698353823400 + }, + { + "schema": 1698353583372, + "derHash": "6V7yx0cUxPVXt27yz+vDd59QEc31cqIxbUM1fMvzSJY=", + "subject": "CN=ZDNS ECC DV SSL CA,O=互联网域名系统北京市工程研究中心有限公司,C=CN", + "subjectDN": "MHExCzAJBgNVBAYTAkNOMUUwQwYDVQQKDDzkupLogZTnvZHln5/lkI3ns7vnu5/ljJfkuqzluILlt6XnqIvnoJTnqbbkuK3lv4PmnInpmZDlhazlj7gxGzAZBgNVBAMTElpETlMgRUNDIERWIFNTTCBDQQ==", + "whitelist": false, + "attachment": { + "hash": "0f4a1a16129cf0e8fdae10260b682d7537819ef5ee23753a3c51f3b4152766be", + "size": 1288, + "filename": "hN8j8JnaY8WoonJHdr9CWMFJ_fEh8xq7ZeNGnaNUq0M=.pem", + "location": "security-state-staging/intermediates/0c76c999-ac7b-47dc-a29b-ec6dbb694cf1.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "hN8j8JnaY8WoonJHdr9CWMFJ/fEh8xq7ZeNGnaNUq0M=", + "crlite_enrolled": false, + "id": "58e90694-bb6f-4dbb-a80a-dcb0c5941377", + "last_modified": 1698353823396 + }, + { + "schema": 1697726891469, + "derHash": "Gix1/QluBJnp/2rHTlJvYequPt/IwupENv7gwk2LfQ4=", + "subject": "CN=TWCA Secure SSL Certification Authority,O=TAIWAN-CA,C=TW", + "subjectDN": "MFMxCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExMDAuBgNVBAMTJ1RXQ0EgU2VjdXJlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==", + "whitelist": false, + "attachment": { + "hash": "6915db4e2c315f0ef561152eb43c24a83ff0b2a53b17f99b0016401498bd9a2d", + "size": 2060, + "filename": "9VZ7Yd685RTXsE6rL_puuMbnejYaXwaZasGL7c-Uolc=.pem", + "location": "security-state-staging/intermediates/47927f74-196f-42a4-a2a8-51f6c9298cd2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "9VZ7Yd685RTXsE6rL/puuMbnejYaXwaZasGL7c+Uolc=", + "crlite_enrolled": false, + "id": "8fe8f35b-1038-4072-85b5-c2e317a0be57", + "last_modified": 1697727423154 + }, + { "schema": 1697644096445, "derHash": "Ag7smKPB7S1b4hGTNJrLl1HeBx1rRSpImmqGfOm2M+k=", "subject": "CN=GlobalSign Atlas R6 EV TLS CA 2024 Q1,O=GlobalSign nv-sa,C=BE", @@ -23581,150 +23707,6 @@ "last_modified": 1648695444528 }, { - "schema": 1648111717634, - "derHash": "+RIKcdUGl7mZKnNXoKmg3cS/w1mPy08BZClkgk088nY=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2023Q1,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjNRMQ==", - "whitelist": false, - "attachment": { - "hash": "55b021920e8c5ede7d6276ecd04c19991d898f6e51bf0b3fa08bf1ba9c248d76", - "size": 1158, - "filename": "1LpfjVSH8hoztBgfd_gZFjiC7v6eaAkVkgVTeL6pRpE=.pem", - "location": "security-state-staging/intermediates/09ea17e8-1bcd-4681-ae0a-939f779f73f5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "1LpfjVSH8hoztBgfd/gZFjiC7v6eaAkVkgVTeL6pRpE=", - "crlite_enrolled": false, - "id": "d3ec162b-c1f0-4f2e-9614-fb27671a17d5", - "last_modified": 1648112256044 - }, - { - "schema": 1648111716671, - "derHash": "QwsXKm9xRrFqdbzFv6HWDGHe6qKrrGG0OU5KaykcSMw=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2023Q3,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjNRMw==", - "whitelist": false, - "attachment": { - "hash": "40b0a9828f0b77973e246b7191d21a16f9d6c06c204f416a697608d3d700bba6", - "size": 1158, - "filename": "optwe1ocGkg7DXck7jODG5z_v8Zt72fvYBoDzURXOiY=.pem", - "location": "security-state-staging/intermediates/b3076cf4-85f5-4d34-9510-ccbf6447dd9b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "optwe1ocGkg7DXck7jODG5z/v8Zt72fvYBoDzURXOiY=", - "crlite_enrolled": false, - "id": "8997acb0-7a65-451b-a771-31209f4b4920", - "last_modified": 1648112256036 - }, - { - "schema": 1648111715739, - "derHash": "p9z9PQk3fDm6On9jDgUuxZPpcm0dpXIp5ZnRWtbcyns=", - "subject": "CN=GlobalSign Atlas R46 EV QWAC CA 2023Q1,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBRV0FDIENBIDIwMjNRMQ==", - "whitelist": false, - "attachment": { - "hash": "fc8007f8fd12fae7c462817756a3e12831260d0dde7d99df37fcee4450ed101a", - "size": 2304, - "filename": "c6w0LUIRbkLD8fbDDHL4ho_7XkZ8zf-WWqAOlcGpo0M=.pem", - "location": "security-state-staging/intermediates/26ee5bc1-166e-4810-a513-c2d03f359dcd.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "c6w0LUIRbkLD8fbDDHL4ho/7XkZ8zf+WWqAOlcGpo0M=", - "crlite_enrolled": false, - "id": "828f577c-a1ed-4ffa-823c-6216c3661d68", - "last_modified": 1648112256027 - }, - { - "schema": 1648111714755, - "derHash": "tR2FoI+ssG+X/fWFY3SQAwM+533Vg5hiBEmRl8qOcHc=", - "subject": "CN=GlobalSign Atlas R46 EV QWAC CA 2023Q4,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBRV0FDIENBIDIwMjNRNA==", - "whitelist": false, - "attachment": { - "hash": "b70bccb91e1382127d552db2218d3a4b5e694b6e46ae394de9c13a65ed772ebb", - "size": 2304, - "filename": "tZABsMMctDxN2dVCN6e8jDISb-XBcMxhQzt38VfbuDA=.pem", - "location": "security-state-staging/intermediates/198954ce-3ffd-4df5-a2d7-24ae0c2dbb7a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tZABsMMctDxN2dVCN6e8jDISb+XBcMxhQzt38VfbuDA=", - "crlite_enrolled": false, - "id": "d0055faf-7e7a-4a03-84ca-236e7e150355", - "last_modified": 1648112256018 - }, - { - "schema": 1648111713814, - "derHash": "9MXzlWN5STgw3nRW4KVdb7wbjqCLdWSI/wBbbDlKacc=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2023Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjNRMg==", - "whitelist": false, - "attachment": { - "hash": "12544f05eaffecc66cfb2fd647c6958cb03982233cd8545c013c9e090e9f5dd2", - "size": 1158, - "filename": "EBZTs8K9zMMECCBtTU0HgF-x0sx96tVwP0f33u8CVo0=.pem", - "location": "security-state-staging/intermediates/88ba5f96-66e2-4cd3-bc6e-d3081fefa6ae.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "EBZTs8K9zMMECCBtTU0HgF+x0sx96tVwP0f33u8CVo0=", - "crlite_enrolled": false, - "id": "7a907fba-b773-47d5-8980-b6cd09c503c8", - "last_modified": 1648112256010 - }, - { - "schema": 1648111712861, - "derHash": "LaUid2Ytwcd54kOfr1j4X4fbpz4PFvGw6zEKSRnPw7o=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2023Q4,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjNRNA==", - "whitelist": false, - "attachment": { - "hash": "a12414bc2af80f20737582694f4b964c09b82a8a591161834841e526e2b81b1a", - "size": 1158, - "filename": "DfmbgsrIxe8_N5Um3tZ6V_47ptPmpy9zNMbCxXcTx4A=.pem", - "location": "security-state-staging/intermediates/4cd1861b-a0c2-4b30-b872-3a0486efe22e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "DfmbgsrIxe8/N5Um3tZ6V/47ptPmpy9zNMbCxXcTx4A=", - "crlite_enrolled": false, - "id": "128d47d0-7ee8-4a5b-a937-07239a7df9b7", - "last_modified": 1648112256001 - }, - { - "schema": 1648111711870, - "derHash": "pAyR5GbWLNsytxOeh0jw61qBf2u4qfmZp6m/QwbW1dU=", - "subject": "CN=GlobalSign Atlas R46 EV QWAC CA 2023Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBRV0FDIENBIDIwMjNRMg==", - "whitelist": false, - "attachment": { - "hash": "89bfa9e3815fb5f762d3f1a7dda4de7cab2aba8f41b814e8507ab9ca1852bed0", - "size": 2304, - "filename": "3ZySFXFHb5Plo7dM_NSw8nKNUlgm3wVrp1r970Tmy9I=.pem", - "location": "security-state-staging/intermediates/1120dfd8-15c7-44a1-86a4-3c4e97f1ab63.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3ZySFXFHb5Plo7dM/NSw8nKNUlgm3wVrp1r970Tmy9I=", - "crlite_enrolled": false, - "id": "672ee5db-ce74-426e-90b7-b7dc55c91fc6", - "last_modified": 1648112255993 - }, - { - "schema": 1648111710874, - "derHash": "KchA0GKshi200gko0q79g7NaRr1FM5lf8u/T4+6M/9k=", - "subject": "CN=GlobalSign Atlas R46 EV QWAC CA 2023Q3,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBRV0FDIENBIDIwMjNRMw==", - "whitelist": false, - "attachment": { - "hash": "76651c35cbddf6690564ab5eca531b747c955d30a7cfaa53c117394757cb101a", - "size": 2304, - "filename": "RQ8YAl2HjeVi53YGXKYDqOxAqWE8GxAl626WJwuAffU=.pem", - "location": "security-state-staging/intermediates/5748ec6c-c33e-4b62-9fc6-b745dc8e5611.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RQ8YAl2HjeVi53YGXKYDqOxAqWE8GxAl626WJwuAffU=", - "crlite_enrolled": false, - "id": "eb1340fa-a150-40a9-af2e-a3bdd28002a1", - "last_modified": 1648112255984 - }, - { "schema": 1648025321155, "derHash": "B0hA46Z9zSYAtrAE4Rh6yAvf6JbK9JPflMw9mjymiBQ=", "subject": "CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW", @@ -24067,24 +24049,6 @@ "last_modified": 1645578268720 }, { - "schema": 1645577338494, - "derHash": "JQr6ULYNMNEhfQDn3YzOa1H1wLamNpMkhCw33rRPlxU=", - "subject": "CN=GlobalSign Atlas R3 EV QWAC CA 2022Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIEVWIFFXQUMgQ0EgMjAyMlEy", - "whitelist": false, - "attachment": { - "hash": "cff78244ab26e56b5e483f99e0aed0e0311dc636fd96d257b29926744a6dc6b5", - "size": 1963, - "filename": "LC6FP_nCl4VodRD45_zlvw8dX_dh1YzWJuNbo8QdMS0=.pem", - "location": "security-state-staging/intermediates/c4d837bc-e1d0-403d-ba4d-a6ff8a19568d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LC6FP/nCl4VodRD45/zlvw8dX/dh1YzWJuNbo8QdMS0=", - "crlite_enrolled": false, - "id": "23d91633-cdd3-4e38-a8e1-ed279a2f5845", - "last_modified": 1645578268699 - }, - { "schema": 1645577339845, "derHash": "ttVvPdJqyETlfIv+kFT1cGE1CpCJS5nNmBHppUX8hMU=", "subject": "CN=SwissSign RSA SMIME Root CA 2021 - 1,O=SwissSign AG,C=CH", @@ -24103,24 +24067,6 @@ "last_modified": 1645578268688 }, { - "schema": 1645577342520, - "derHash": "RR+joYBktN0Drf6Li78WJYy5ihpv7l1rCjfJigteba4=", - "subject": "CN=GlobalSign Atlas R3 EV QWAC CA 2022Q4,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIEVWIFFXQUMgQ0EgMjAyMlE0", - "whitelist": false, - "attachment": { - "hash": "fe92651abf55682a49b2236e7ff9d8836009622c7e297c52898897b83d226038", - "size": 1963, - "filename": "aIsqGvSMskHZ0L8v036H9jAIm-bd92TA5I_QGE0X9dw=.pem", - "location": "security-state-staging/intermediates/a7156ea9-590b-4766-bcd2-bc524dcf023c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "aIsqGvSMskHZ0L8v036H9jAIm+bd92TA5I/QGE0X9dw=", - "crlite_enrolled": false, - "id": "0dc34415-ce03-44e3-aa22-8f7364b54060", - "last_modified": 1645578268665 - }, - { "schema": 1645577343844, "derHash": "2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=", "subject": "CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ", @@ -24157,24 +24103,6 @@ "last_modified": 1645578268568 }, { - "schema": 1645577360091, - "derHash": "DaWCD9/k/Pm5+UwUDbDwbWcNhvyxvdlZe8qHMVMvNTw=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2022Q3,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjJRMw==", - "whitelist": false, - "attachment": { - "hash": "e9f7cf118bf8eb814bbbbd3c6051143988df04f75449edeba292e14a4ed68a5b", - "size": 1158, - "filename": "MZzMneI7SnySeEGP9Azna74KVCSVyd8Y4I4b0tkHtLI=.pem", - "location": "security-state-staging/intermediates/eb036943-a32f-4760-89c7-f6b41a4ea4b8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MZzMneI7SnySeEGP9Azna74KVCSVyd8Y4I4b0tkHtLI=", - "crlite_enrolled": false, - "id": "bdf72262-6812-4fce-aa9f-8a7a2d68ef29", - "last_modified": 1645578268527 - }, - { "schema": 1645577377719, "derHash": "vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=", "subject": "CN=GlobalSign Atlas R6 EV TLS CA 2020,O=GlobalSign nv-sa,C=BE", @@ -24301,24 +24229,6 @@ "last_modified": 1645578268188 }, { - "schema": 1645577407059, - "derHash": "7Stsb2xmnuxsFYsP1h5EVBhcQoQlI4ZvOz7psfD2KII=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2022Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjJRMg==", - "whitelist": false, - "attachment": { - "hash": "e96bd736e0a92c76fa064fa072262d7ff36e4513629861f6efee106de04b979a", - "size": 1158, - "filename": "rWexWDTKAICJTdJ_qPQnC7qVB05XEkpjwEDXGmHE3a8=.pem", - "location": "security-state-staging/intermediates/f4cf151f-36c5-40ff-ab06-aa85908a4c91.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "rWexWDTKAICJTdJ/qPQnC7qVB05XEkpjwEDXGmHE3a8=", - "crlite_enrolled": false, - "id": "4ec278c9-4fc7-48bd-9aae-1833cdd31cbe", - "last_modified": 1645578268168 - }, - { "schema": 1645577412454, "derHash": "GGJqO3IREo1WNGnGVFV9E8k2bX/OyLlNtPCqfgWUQEE=", "subject": "CN=Trustwave Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US", @@ -24427,24 +24337,6 @@ "last_modified": 1645578267856 }, { - "schema": 1645577458278, - "derHash": "8rw3mx70ViTY+CK241lQLUcPOE5TwIL3riGGnBOl00U=", - "subject": "CN=GlobalSign Atlas R3 EV QWAC CA 2022Q1,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIEVWIFFXQUMgQ0EgMjAyMlEx", - "whitelist": false, - "attachment": { - "hash": "5523fb67ae8ff11453b90dc3ca83b50472d41586bfbb5ccf8c0dde8f635b8f6a", - "size": 1963, - "filename": "26N20SHnSgcXvfI3VgyG02EeOlaqQQzhteiNlN6jqmw=.pem", - "location": "security-state-staging/intermediates/3db62490-3f0e-45c1-b32e-72a8327a43d8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "26N20SHnSgcXvfI3VgyG02EeOlaqQQzhteiNlN6jqmw=", - "crlite_enrolled": false, - "id": "55f0fec1-fce0-4b97-a48f-5d65ebeaaef3", - "last_modified": 1645578267783 - }, - { "schema": 1645577462286, "derHash": "Wr5YGPbQLwUQbGw1VUDhviF8I1S1Nc8lB7+FFeGmBEo=", "subject": "CN=e-Szigno Qualified CA 2017,O=Microsec Ltd.,L=Budapest,C=HU", @@ -24643,24 +24535,6 @@ "last_modified": 1645578267065 }, { - "schema": 1645577555224, - "derHash": "TYHRjVfNqWRAy/0PoFzDh7fGneOp5otANuEWjuK3vSE=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2022Q1,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjJRMQ==", - "whitelist": false, - "attachment": { - "hash": "75b0c649ffa3eddcd7af7acb6d84ada814147f170c7fc733d9a9bb75db8744a5", - "size": 1158, - "filename": "RyNVhV1C5-xXlpHR5ULqzOutN2wlUTNVMaW4DIZEnpI=.pem", - "location": "security-state-staging/intermediates/1c8c86d1-02d5-4709-837a-501f5fccecd6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RyNVhV1C5+xXlpHR5ULqzOutN2wlUTNVMaW4DIZEnpI=", - "crlite_enrolled": false, - "id": "1ca9d1f2-d790-410c-9cc3-03796bf2d9c7", - "last_modified": 1645578267045 - }, - { "schema": 1645577557948, "derHash": "Z63RFmsCCuYbj1/JaBPATCqliZYHloZVcqPH5zdhPf0=", "subject": "CN=R3,O=Let's Encrypt,C=US", @@ -24895,24 +24769,6 @@ "last_modified": 1645578266763 }, { - "schema": 1645577597113, - "derHash": "nVHcJ1ChO9Yn2Z/cxyDRkE/oEFkRC7neEbA5pLLspTE=", - "subject": "CN=GlobalSign Atlas R3 EV QWAC CA 2022Q3,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIEVWIFFXQUMgQ0EgMjAyMlEz", - "whitelist": false, - "attachment": { - "hash": "455a59c7f0cc18e5465e32a727030ffe82dee17147419daa6e1ce5a0aa2be7dd", - "size": 1963, - "filename": "HsaiS7rZzMDqaWnwW9Yzu-FKNTzibOKBw0sgXsj44II=.pem", - "location": "security-state-staging/intermediates/2fa11d0c-0ac4-48a7-8170-73714379ed7e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HsaiS7rZzMDqaWnwW9Yzu+FKNTzibOKBw0sgXsj44II=", - "crlite_enrolled": false, - "id": "efa8b88c-e123-4d66-9be0-624573773bba", - "last_modified": 1645578266743 - }, - { "schema": 1645577614499, "derHash": "ugMS97cva2S0zO40tfYoz2Wh87nxa43+etqQxU5HWhw=", "subject": "CN=HARICA QWAC ECC SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),L=Athens,C=GR", @@ -25075,24 +24931,6 @@ "last_modified": 1645578266284 }, { - "schema": 1645577665545, - "derHash": "TvmeaosU9pk4cVNxsdhTRyU0y/WVp0POmT57OG+ZuJU=", - "subject": "CN=GlobalSign Atlas E46 EV QWAC CA 2022Q4,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBRV0FDIENBIDIwMjJRNA==", - "whitelist": false, - "attachment": { - "hash": "f98af2e42c56f6a4473891c4156bddc8368905af06fb3ca10ed31101887d0533", - "size": 1158, - "filename": "7tQTps_FyNq84m772RNWbg0YtohVhTi87YZahsdnoc4=.pem", - "location": "security-state-staging/intermediates/07fece26-4fa6-4e1f-a7ab-08f03750954b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "7tQTps/FyNq84m772RNWbg0YtohVhTi87YZahsdnoc4=", - "crlite_enrolled": false, - "id": "1a25d233-42a5-4da8-b64f-a49818f0f72c", - "last_modified": 1645578266223 - }, - { "schema": 1645577666924, "derHash": "urvKmGlGNSz5vzguiAZS9OlNvE/t0PHMIfqZc8ltZas=", "subject": "CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN", @@ -26155,24 +25993,6 @@ "last_modified": 1601517444135 }, { - "schema": 1601376769580, - "derHash": "rY6zLJ2pHdyFXzgnRZkBR9xvI9n7sE/J1Hax7iD8cdg=", - "subject": "CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBHNA==", - "whitelist": false, - "attachment": { - "hash": "12cc0d0e07a0ce9a1fae8bc81a3c9918619e6044dedda6d70c56fec58c5aa0d5", - "size": 2024, - "filename": "Wd8xe_qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=.pem", - "location": "security-state-staging/intermediates/40ac2caf-9799-41cc-9949-62fe94bd7c8f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Wd8xe/qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=", - "crlite_enrolled": false, - "id": "9702b5ab-ac3b-478f-8641-763a8b97d8df", - "last_modified": 1601517444080 - }, - { "schema": 1601376755836, "derHash": "joxuv3fcc9s+OOk/SAPmK2tZM761HuQVL2jXqhRCazE=", "subject": "CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU", @@ -26659,24 +26479,6 @@ "last_modified": 1591199862208 }, { - "schema": 1591166926812, - "derHash": "yYFBK1WBDDfBgm0kZn0ayos21uvwmm2MjlRZBT/hweU=", - "subject": "CN=CrazySSL ECC CA,O=TrustOcean Limited,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIEVDQyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "747b534a20d09d3120dad524bafdfbf5cb11711b35f79294ed033004fb14560b", - "size": 1232, - "filename": "ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe-OCri6lbwMZgQ=.pem", - "location": "security-state-staging/intermediates/36d8be0c-e7bf-47dc-9c16-a44982c5b45a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe+OCri6lbwMZgQ=", - "crlite_enrolled": false, - "id": "fac0b4a6-912b-4c27-9d25-3f313e16c85e", - "last_modified": 1591199862202 - }, - { "schema": 1591166909159, "derHash": "f4FM0UVJAKwTMTZLa23ga4fMjLmTbsWDEAgichBX06M=", "subject": "CN=Sectigo SHA-256 DV Secure Server CA,O=Sectigo Limited,C=GB", @@ -26713,24 +26515,6 @@ "last_modified": 1591199862121 }, { - "schema": 1591166882853, - "derHash": "abCFmqwMqRvCm0IqPQS5/5D4e4Wje8BtuFMV9d5AvZU=", - "subject": "CN=CrazySSL RSA CA,O=TrustOcean Limited,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIFJTQSBDQQ==", - "whitelist": false, - "attachment": { - "hash": "adc25f98c021da162cd92cb4b92db565ba5e5a23ac8adb3a819e65bfdb69adb9", - "size": 2073, - "filename": "oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=.pem", - "location": "security-state-staging/intermediates/2ce09943-1a2f-4726-b421-a52c2d8f6a91.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=", - "crlite_enrolled": false, - "id": "4934e39d-e79f-478e-a9b9-339c5922e0b8", - "last_modified": 1591199862107 - }, - { "schema": 1591166876495, "derHash": "T/V3/d4o5h5/XKT19CvLsSvheXAKT+8kSJznaEigg0Y=", "subject": "CN=TrustCor OV SSL CA - G2,O=TrustCor Systems S. de R.L.,C=PA", @@ -29179,5 +28963,5 @@ "last_modified": 1559865884636 } ], - "timestamp": 1697644623321 + "timestamp": 1698379023347 } diff -Nru firefox-119.0+build2/servo/components/style/invalidation/element/state_and_attributes.rs firefox-119.0.1+build1/servo/components/style/invalidation/element/state_and_attributes.rs --- firefox-119.0+build2/servo/components/style/invalidation/element/state_and_attributes.rs 2023-10-19 23:40:56.000000000 +0000 +++ firefox-119.0.1+build1/servo/components/style/invalidation/element/state_and_attributes.rs 2023-11-07 06:33:15.000000000 +0000 @@ -239,7 +239,7 @@ let wrapper = ElementWrapper::new(element, &*self.shared_context.snapshot_map); let state_changes = wrapper.state_changes(); - let snapshot = wrapper.snapshot().expect("has_snapshot lied"); + let Some(snapshot) = wrapper.snapshot() else { return false }; if !snapshot.has_attrs() && state_changes.is_empty() { return false; diff -Nru firefox-119.0+build2/SOURCE_CHANGESET firefox-119.0.1+build1/SOURCE_CHANGESET --- firefox-119.0+build2/SOURCE_CHANGESET 2023-10-19 23:41:28.000000000 +0000 +++ firefox-119.0.1+build1/SOURCE_CHANGESET 2023-11-07 06:33:34.000000000 +0000 @@ -1 +1 @@ -6a78abe63b7e7aa191341b42ef4f2168bdf0fc89 \ No newline at end of file +b8f0d32ac6a5c34db8692ed382c3018e6309ea09 \ No newline at end of file diff -Nru firefox-119.0+build2/testing/web-platform/tests/html/semantics/forms/the-input-element/input-disabled-fieldset-dynamic.html firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/forms/the-input-element/input-disabled-fieldset-dynamic.html --- firefox-119.0+build2/testing/web-platform/tests/html/semantics/forms/the-input-element/input-disabled-fieldset-dynamic.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/forms/the-input-element/input-disabled-fieldset-dynamic.html 2023-11-07 06:33:19.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + + + +
+ +
+ diff -Nru firefox-119.0+build2/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group.html firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group.html --- firefox-119.0+build2/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group.html 2023-11-07 06:33:19.000000000 +0000 @@ -0,0 +1,28 @@ + + +:indeterminate and input type=radio + + + + + +
+ + + + + + + + + + + +
diff -Nru firefox-119.0+build2/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group-ref.html firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group-ref.html --- firefox-119.0+build2/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group-ref.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-119.0.1+build1/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio-group-ref.html 2023-11-07 06:33:19.000000000 +0000 @@ -0,0 +1,21 @@ + + +Test reference + +
+ + + + + + + + + + + +
diff -Nru firefox-119.0+build2/third_party/dump_syms/.cargo-checksum.json firefox-119.0.1+build1/third_party/dump_syms/.cargo-checksum.json --- firefox-119.0+build2/third_party/dump_syms/.cargo-checksum.json 2023-10-19 23:42:51.000000000 +0000 +++ firefox-119.0.1+build1/third_party/dump_syms/.cargo-checksum.json 2023-11-07 06:34:18.000000000 +0000 @@ -1 +1 @@ -{"files":{".github/dependabot.yml":"b3c743aa114d08f175badc60d3a071e5c77bcc471c28e3320b29b22d3df2c6da",".taskcluster.yml":"95cdf88304dd1fb6df2322413e5aa17dc9e14540838c63a1baf0d700d810ab2c","CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"2c6c71f3dca8aecc22549cf91f9db0fd5d89e863f4a1655f40af21603aff93a8","Cargo.toml":"b5c00883c7c35657f953dc0cbb3c082a57b94f8757966e19a8d2eab5e59ddc49","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"52943eaec10fc609760b0cc0f141b5ea6b9a99e412089acb94df4702b5fe890e","src/action.rs":"1b2b2fecf9680b458745f0a24631795b375c7149375ddffd1683d0e86c470707","src/cache.rs":"c2e5b1837e9f24683e1e59d84d40c5fba8e603bb0cf4cc6c640061d469178682","src/common.rs":"0310eb658a8674c216974bf79a3fc6c1db39bbb8056eeea28b2139c8c841d3ad","src/dumper.rs":"df2d294912a9df3042d60ab45ce7bcfb547371fc89ea524ec50a33272c7f199c","src/line.rs":"f3183f24532e0acca5aa0b67ab404e940481b3bc38fc4c1ef45999eeee611fa5","src/linux/elf.rs":"123fece07affe5a49b1e05f177dc2b6b0a6642642a7c4345c33fda7f25155371","src/linux/lines.rs":"37d6946d93022072a414e65a98a4e75bfa776a055b3db30c10831c917e4c6db1","src/linux/mod.rs":"8b59d998a9c3390c523a0ed5e550c9bbd746e16c5bb2625811449877795e6b45","src/linux/source.rs":"956c3b4462a1cc2ea99f23e765bd0c04c65fb9cdbdfbaff8c0ed1e1464e7b522","src/linux/symbol.rs":"6740d7a74adc2a7c6fc1b8adfb58be745f967e79aec1120fdc8da3330d99cb6d","src/mac/macho.rs":"99faffc4c24b294661a9eb29537d2da82b7c2e948d9b32bc68a6830d053fe2c5","src/mac/mod.rs":"3ac83be905af817edbf52b6ca4e1e84a3b5902d9f6d3d30739c73d836d7cdaa4","src/main.rs":"cb8e31fd4508382451c49b04583c62fd25cfb5c01149c24768680c2da19d1b24","src/mapping.rs":"ea7cb54ddca809c2221967883f34f170baf271bc7d747f56eab270198d5c10f1","src/utils.rs":"6aa3cfea871d01cb6abee201fbd7cbb540f111c0672977bb80870f13215e4787","src/windows/lines.rs":"831c0af2174ee3cecc2910924fc9ea8527c6a3136d63fdf34e53373215a34b43","src/windows/mod.rs":"96faf55699b8906df9ae36ffe676e260eb86e3c8f4634e5549a54dfd142d576d","src/windows/pdb.rs":"0e7ddec5dbbf80862a6dbac03fe6170c92410f70266089b3790204913c53e348","src/windows/source.rs":"824dad820c7ee12d4bbe098dd98a1b37ab84f3bfbcd6eba62029cbf25733cce5","src/windows/symbol.rs":"1bcaaa390a24fa3ed780d59631b5a355331662653a64d73c2743d81d619dcfde","src/windows/types.rs":"672428c218b5f5e9dcab86f2b381af03539c6c189048769d859e45ab8c7f1f82","src/windows/utils.rs":"4f0843eff9c94e0fe62cf4f5ef2fb7e196d6b89704757c3aa5c8249f1a6bd112","test_data/linux/Makefile":"3432b81e94615cef431c105d011570026a4ac51800f11d9ee5546258a72c92d6","test_data/linux/basic.cpp":"6d5d0ae32014a45f8ebe08fe22c69fe699b8be617a07950945baa9ff39f38f39","test_data/linux/basic.dbg":"5a91bac375c17d505c8902546ea55eb463fd63f666f2abb405fdd358b8e36039","test_data/linux/basic.dbg.sym":"49e4b8517b839a236e4143fb65f572b80278643e08bb33949387ab79dd8b3481","test_data/linux/basic.full":"1bbd131f5646885019384cd264ed48f3d12f73fe0c3f56ed4d5e8424310895f4","test_data/linux/basic.full.sym":"eff0a95963b7ac844792ea3642cbb574505783ba01b731e7f32edf9f1a6bdef7","test_data/linux/basic.stripped":"87726d48f5cfb0442df2f716d8e1e25246991d4c71c8a3e6d515929c6f7b9626","test_data/mapping.json":"dd2e691208636aac2083f4e0c9fc129eb92d1ece58eb7c4066f5c23db8890397","test_data/mapping/aaa.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/bbb.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/ccc.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/windows/Makefile":"48e211d35721ed553958c0202e99814f6493ae86ca1a64900c325a835f617351","test_data/windows/basic-opt32.dll":"5156dc395dddbf421fe593da2ed0e47c3942ba81e14551c28be9d4a1ff7d514a","test_data/windows/basic-opt32.old.sym":"e97f8a86581afc2385b75e9e7ae85ae4694f7d89724030e5da9afcb060d165f3","test_data/windows/basic-opt32.pdb":"e9bdabafbda60098c4d44148fd7001432c994d225fe7cd80eb2caa332cd43261","test_data/windows/basic-opt64.dll":"9e7f7c47a708c75a8691e90f1599c4c35ccd476fdb804e9721eed5c20a74d529","test_data/windows/basic-opt64.old.sym":"404f852ed3c0bfa04e77c9cbc32b2189b7b971b9e3c054da0c836b2b825d338b","test_data/windows/basic-opt64.pdb":"bfc72b22638be4f0a5a226707d5a51f1bb5bf346ac3afe191f3f171dfab7d0e3","test_data/windows/basic.cpp":"4b3b05382b910ed31643e05f612fe602fbbe9319674d2436cc90d9aaf9bbe16f","test_data/windows/basic32-min.dll":"fbc14344b4c15e1bb918e190abcc694958f25ea3678c4c0fbc3bcd309d6862b3","test_data/windows/basic32-min.old.sym":"151b199aa27ed1b26218bbfc86e87bbc8fbeb7c5ff73f9ffeb2f6ed3e2427181","test_data/windows/basic32-min.pdb":"d8dc7e565cc578513fc9c73d3f7613b5ca2a2b4fc853ef4e7ffd7d21c3ecbc8e","test_data/windows/basic32.dll":"6dd60214760eebefd0aec0d13b373238dea1aea0acff24635f8be13ee22a2915","test_data/windows/basic32.old.sym":"faad23663195e3d480064d83f358f2092d170f8a896b67b025a18ffa66468386","test_data/windows/basic32.pd_":"aadc24504eef021e517777d63bcebaaedac71e881449b4eaee6904fafb89d632","test_data/windows/basic64.dll":"659cbe2cedd4a8e9eb4df40d9a74f3a616cd2bb2092a9b4838aa819b6da776bc","test_data/windows/basic64.old.sym":"6e53a243fb683697725df08d2c556118738bba03a88658cb0ca7446b67a41a2c","test_data/windows/basic64.pdb":"0f90994148627ce5f7e3fdbb2e4e17151ee8a76ea8212b5df2cc1252c0d4e9a2","test_data/windows/dump_syms_regtest64.exe":"46e6bcc478e6903ef08762c3483e1e8b4eba4898011aa9b473ade57c8b0e098c","test_data/windows/dump_syms_regtest64.old.sym":"4b6b4b281368714c0aa34c383bdaafe51cbb01b52db7dad6259b3784d7970e1f","test_data/windows/dump_syms_regtest64.pdb":"d3e8878f893ef945cc0e03fb064e4b76af64de82c92707ed4fc3b62c019949f0","test_data/windows/mozwer.dll":"9b6eff52c350a90c0e23f4b5312dd686ff349c9ab007cd7d0cc00370b3889fc4","test_data/windows/mozwer.sym":"9a9f333f618c7fdf92b09dfa83cac961d574d8812bbc3b3f7525b1be8ed53abe","test_data/windows/ntdll.old.sym":"2983d2d6146b56d3c4105e0f561c78a9f1743d3c4dcde2933c742b6f7f6df8cd","test_data/windows/oleaut32.old.sym":"370baf634d8e0c5742c6d9991931d2d4646c566cd3380a11ab509c7dafed1a07"},"package":null} \ No newline at end of file +{"files":{".github/dependabot.yml":"b3c743aa114d08f175badc60d3a071e5c77bcc471c28e3320b29b22d3df2c6da",".taskcluster.yml":"95cdf88304dd1fb6df2322413e5aa17dc9e14540838c63a1baf0d700d810ab2c","CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"2c6c71f3dca8aecc22549cf91f9db0fd5d89e863f4a1655f40af21603aff93a8","Cargo.toml":"50b4a50c2b4c35014ef7aa596d24149ba223543abfe6cc55321aa4cf390bc6d4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"52943eaec10fc609760b0cc0f141b5ea6b9a99e412089acb94df4702b5fe890e","src/action.rs":"1b2b2fecf9680b458745f0a24631795b375c7149375ddffd1683d0e86c470707","src/cache.rs":"c2e5b1837e9f24683e1e59d84d40c5fba8e603bb0cf4cc6c640061d469178682","src/common.rs":"0310eb658a8674c216974bf79a3fc6c1db39bbb8056eeea28b2139c8c841d3ad","src/dumper.rs":"df2d294912a9df3042d60ab45ce7bcfb547371fc89ea524ec50a33272c7f199c","src/line.rs":"f3183f24532e0acca5aa0b67ab404e940481b3bc38fc4c1ef45999eeee611fa5","src/linux/elf.rs":"123fece07affe5a49b1e05f177dc2b6b0a6642642a7c4345c33fda7f25155371","src/linux/lines.rs":"37d6946d93022072a414e65a98a4e75bfa776a055b3db30c10831c917e4c6db1","src/linux/mod.rs":"8b59d998a9c3390c523a0ed5e550c9bbd746e16c5bb2625811449877795e6b45","src/linux/source.rs":"956c3b4462a1cc2ea99f23e765bd0c04c65fb9cdbdfbaff8c0ed1e1464e7b522","src/linux/symbol.rs":"6740d7a74adc2a7c6fc1b8adfb58be745f967e79aec1120fdc8da3330d99cb6d","src/mac/macho.rs":"99faffc4c24b294661a9eb29537d2da82b7c2e948d9b32bc68a6830d053fe2c5","src/mac/mod.rs":"3ac83be905af817edbf52b6ca4e1e84a3b5902d9f6d3d30739c73d836d7cdaa4","src/main.rs":"cb8e31fd4508382451c49b04583c62fd25cfb5c01149c24768680c2da19d1b24","src/mapping.rs":"ea7cb54ddca809c2221967883f34f170baf271bc7d747f56eab270198d5c10f1","src/utils.rs":"6aa3cfea871d01cb6abee201fbd7cbb540f111c0672977bb80870f13215e4787","src/windows/lines.rs":"831c0af2174ee3cecc2910924fc9ea8527c6a3136d63fdf34e53373215a34b43","src/windows/mod.rs":"96faf55699b8906df9ae36ffe676e260eb86e3c8f4634e5549a54dfd142d576d","src/windows/pdb.rs":"0e7ddec5dbbf80862a6dbac03fe6170c92410f70266089b3790204913c53e348","src/windows/source.rs":"824dad820c7ee12d4bbe098dd98a1b37ab84f3bfbcd6eba62029cbf25733cce5","src/windows/symbol.rs":"1bcaaa390a24fa3ed780d59631b5a355331662653a64d73c2743d81d619dcfde","src/windows/types.rs":"672428c218b5f5e9dcab86f2b381af03539c6c189048769d859e45ab8c7f1f82","src/windows/utils.rs":"4f0843eff9c94e0fe62cf4f5ef2fb7e196d6b89704757c3aa5c8249f1a6bd112","test_data/linux/Makefile":"3432b81e94615cef431c105d011570026a4ac51800f11d9ee5546258a72c92d6","test_data/linux/basic.cpp":"6d5d0ae32014a45f8ebe08fe22c69fe699b8be617a07950945baa9ff39f38f39","test_data/linux/basic.dbg":"5a91bac375c17d505c8902546ea55eb463fd63f666f2abb405fdd358b8e36039","test_data/linux/basic.dbg.sym":"49e4b8517b839a236e4143fb65f572b80278643e08bb33949387ab79dd8b3481","test_data/linux/basic.full":"1bbd131f5646885019384cd264ed48f3d12f73fe0c3f56ed4d5e8424310895f4","test_data/linux/basic.full.sym":"eff0a95963b7ac844792ea3642cbb574505783ba01b731e7f32edf9f1a6bdef7","test_data/linux/basic.stripped":"87726d48f5cfb0442df2f716d8e1e25246991d4c71c8a3e6d515929c6f7b9626","test_data/mapping.json":"dd2e691208636aac2083f4e0c9fc129eb92d1ece58eb7c4066f5c23db8890397","test_data/mapping/aaa.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/bbb.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/mapping/ccc.cpp":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","test_data/windows/Makefile":"48e211d35721ed553958c0202e99814f6493ae86ca1a64900c325a835f617351","test_data/windows/basic-opt32.dll":"5156dc395dddbf421fe593da2ed0e47c3942ba81e14551c28be9d4a1ff7d514a","test_data/windows/basic-opt32.old.sym":"e97f8a86581afc2385b75e9e7ae85ae4694f7d89724030e5da9afcb060d165f3","test_data/windows/basic-opt32.pdb":"e9bdabafbda60098c4d44148fd7001432c994d225fe7cd80eb2caa332cd43261","test_data/windows/basic-opt64.dll":"9e7f7c47a708c75a8691e90f1599c4c35ccd476fdb804e9721eed5c20a74d529","test_data/windows/basic-opt64.old.sym":"404f852ed3c0bfa04e77c9cbc32b2189b7b971b9e3c054da0c836b2b825d338b","test_data/windows/basic-opt64.pdb":"bfc72b22638be4f0a5a226707d5a51f1bb5bf346ac3afe191f3f171dfab7d0e3","test_data/windows/basic.cpp":"4b3b05382b910ed31643e05f612fe602fbbe9319674d2436cc90d9aaf9bbe16f","test_data/windows/basic32-min.dll":"fbc14344b4c15e1bb918e190abcc694958f25ea3678c4c0fbc3bcd309d6862b3","test_data/windows/basic32-min.old.sym":"151b199aa27ed1b26218bbfc86e87bbc8fbeb7c5ff73f9ffeb2f6ed3e2427181","test_data/windows/basic32-min.pdb":"d8dc7e565cc578513fc9c73d3f7613b5ca2a2b4fc853ef4e7ffd7d21c3ecbc8e","test_data/windows/basic32.dll":"6dd60214760eebefd0aec0d13b373238dea1aea0acff24635f8be13ee22a2915","test_data/windows/basic32.old.sym":"faad23663195e3d480064d83f358f2092d170f8a896b67b025a18ffa66468386","test_data/windows/basic32.pd_":"aadc24504eef021e517777d63bcebaaedac71e881449b4eaee6904fafb89d632","test_data/windows/basic64.dll":"659cbe2cedd4a8e9eb4df40d9a74f3a616cd2bb2092a9b4838aa819b6da776bc","test_data/windows/basic64.old.sym":"6e53a243fb683697725df08d2c556118738bba03a88658cb0ca7446b67a41a2c","test_data/windows/basic64.pdb":"0f90994148627ce5f7e3fdbb2e4e17151ee8a76ea8212b5df2cc1252c0d4e9a2","test_data/windows/dump_syms_regtest64.exe":"46e6bcc478e6903ef08762c3483e1e8b4eba4898011aa9b473ade57c8b0e098c","test_data/windows/dump_syms_regtest64.old.sym":"4b6b4b281368714c0aa34c383bdaafe51cbb01b52db7dad6259b3784d7970e1f","test_data/windows/dump_syms_regtest64.pdb":"d3e8878f893ef945cc0e03fb064e4b76af64de82c92707ed4fc3b62c019949f0","test_data/windows/mozwer.dll":"9b6eff52c350a90c0e23f4b5312dd686ff349c9ab007cd7d0cc00370b3889fc4","test_data/windows/mozwer.sym":"9a9f333f618c7fdf92b09dfa83cac961d574d8812bbc3b3f7525b1be8ed53abe","test_data/windows/ntdll.old.sym":"2983d2d6146b56d3c4105e0f561c78a9f1743d3c4dcde2933c742b6f7f6df8cd","test_data/windows/oleaut32.old.sym":"370baf634d8e0c5742c6d9991931d2d4646c566cd3380a11ab509c7dafed1a07"},"package":null} \ No newline at end of file diff -Nru firefox-119.0+build2/third_party/dump_syms/Cargo.toml firefox-119.0.1+build1/third_party/dump_syms/Cargo.toml --- firefox-119.0+build2/third_party/dump_syms/Cargo.toml 2023-10-19 23:42:56.000000000 +0000 +++ firefox-119.0.1+build1/third_party/dump_syms/Cargo.toml 2023-11-07 06:34:34.000000000 +0000 @@ -1,12 +1,24 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# When uploading crates to the registry Cargo will automatically +# "normalize" Cargo.toml files for maximal compatibility +# with all versions of Cargo and also rewrite `path` dependencies +# to registry (e.g., crates.io) dependencies. +# +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. + [package] +edition = "2018" name = "dump_syms" version = "0.0.7" authors = ["Calixte Denizet "] -repository = "https://github.com/mozilla/dump_syms" -homepage = "https://github.com/mozilla/dump_syms" description = "Dump debug symbols into Breakpad ones" -edition = "2018" +homepage = "https://github.com/mozilla/dump_syms" +readme = "README.md" license = "MIT/Apache-2.0" +repository = "https://github.com/mozilla/dump_syms" [dependencies] bitflags = "1.3" @@ -16,23 +28,39 @@ dirs = "3.0" failure = "0.1" futures = "0.3" -goblin = "0.5.1" # Keep in sync with symbolic-debuginfo -hashbrown = { version = "0.11", features = ["serde"] } +goblin = "0.5.1" lazy_static = "1.4" log = "0.4" num_cpus = "1.13" pdb = "0.7" regex = "1.4" -reqwest = { version = "0.11", features = ["blocking"] } serde = "1.0" serde_json = "1.0" sha2 = "0.9" simplelog = "0.10" -symbolic = { version = "8", features = ["demangle", "minidump"] } tokio = "1.8" url = "2.2" uuid = "0.8" +[dependencies.hashbrown] +version = "0.11" +features = ["serde"] + +[dependencies.openssl] +version = "0.10" +optional = true + +[dependencies.reqwest] +version = "0.11" +features = ["blocking"] + +[dependencies.symbolic] +version = "8" +features = [ + "demangle", + "minidump", +] + [dev-dependencies] fxhash = "0.2" tempfile = "3" @@ -40,8 +68,4 @@ [features] vendored-openssl = ["openssl/vendored"] -[dependencies.openssl] -version = "0.10" -optional = true - [workspace] \ No newline at end of file diff -Nru firefox-119.0+build2/toolkit/components/nimbus/FeatureManifest.yaml firefox-119.0.1+build1/toolkit/components/nimbus/FeatureManifest.yaml --- firefox-119.0+build2/toolkit/components/nimbus/FeatureManifest.yaml 2023-10-19 23:41:17.000000000 +0000 +++ firefox-119.0.1+build1/toolkit/components/nimbus/FeatureManifest.yaml 2023-11-07 06:33:22.000000000 +0000 @@ -816,9 +816,6 @@ directMigrateSingleProfile: type: boolean description: Enable direct migration? - firefoxRelayIntegration: - type: boolean - description: Can show Firefox Relay integration offer? cm-csv-import: description: Importing logins from CSV files diff -Nru firefox-119.0+build2/toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js firefox-119.0.1+build1/toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js --- firefox-119.0+build2/toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js 2023-10-19 23:41:17.000000000 +0000 +++ firefox-119.0.1+build1/toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js 2023-11-07 06:33:22.000000000 +0000 @@ -10,12 +10,6 @@ const { FirefoxRelayTelemetry } = ChromeUtils.importESModule( "resource://gre/modules/FirefoxRelayTelemetry.mjs" ); -const { ExperimentAPI } = ChromeUtils.importESModule( - "resource://nimbus/ExperimentAPI.sys.mjs" -); -const { ExperimentFakes } = ChromeUtils.importESModule( - "resource://testing-common/NimbusTestUtils.sys.mjs" -); const gFxAccounts = getFxAccountsSingleton(); let gRelayACOptionsTitles; @@ -155,15 +149,6 @@ requestLongerTimeout(2); add_setup(async function () { - await ExperimentAPI.ready(); - const cleanupExperiment = await ExperimentFakes.enrollWithFeatureConfig( - { - featureId: "password-autocomplete", - value: { firefoxRelayIntegration: true }, - }, - { isRollout: true } - ); - gHttpServer = new HttpServer(); setupServerScenario(); @@ -200,7 +185,6 @@ ]); registerCleanupFunction(async () => { - await cleanupExperiment(); await new Promise(resolve => { gHttpServer.stop(function () { resolve(); diff -Nru firefox-119.0+build2/toolkit/components/satchel/integrations/FirefoxRelay.sys.mjs firefox-119.0.1+build1/toolkit/components/satchel/integrations/FirefoxRelay.sys.mjs --- firefox-119.0+build2/toolkit/components/satchel/integrations/FirefoxRelay.sys.mjs 2023-10-19 23:41:17.000000000 +0000 +++ firefox-119.0.1+build1/toolkit/components/satchel/integrations/FirefoxRelay.sys.mjs 2023-11-07 06:33:22.000000000 +0000 @@ -40,10 +40,6 @@ }; })(); -ChromeUtils.defineESModuleGetters(lazy, { - NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", -}); - ChromeUtils.defineLazyGetter(lazy, "log", () => LoginHelper.createLogger("FirefoxRelay") ); @@ -398,35 +394,30 @@ if ( !hasInput && isSignup(scenarioName) && + (await hasFirefoxAccountAsync()) && !Services.prefs.prefIsLocked("signon.firefoxRelay.feature") ) { - const isUserEligible = lazy.NimbusFeatures[ - "password-autocomplete" - ].getVariable("firefoxRelayIntegration"); - - if (isUserEligible) { - const [title, subtitle] = await formatMessages( - "firefox-relay-opt-in-title-1", - "firefox-relay-opt-in-subtitle-1" - ); - yield new ParentAutocompleteOption( - "chrome://browser/content/logos/relay.svg", - title, - subtitle, - "PasswordManager:offerRelayIntegration", - { - telemetry: { - flowId: gFlowId, - scenarioName, - }, - } - ); - FirefoxRelayTelemetry.recordRelayOfferedEvent( - "shown", - gFlowId, - scenarioName - ); - } + const [title, subtitle] = await formatMessages( + "firefox-relay-opt-in-title-1", + "firefox-relay-opt-in-subtitle-1" + ); + yield new ParentAutocompleteOption( + "chrome://browser/content/logos/relay.svg", + title, + subtitle, + "PasswordManager:offerRelayIntegration", + { + telemetry: { + flowId: gFlowId, + scenarioName, + }, + } + ); + FirefoxRelayTelemetry.recordRelayOfferedEvent( + "shown", + gFlowId, + scenarioName + ); } } diff -Nru firefox-119.0+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js firefox-119.0.1+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js --- firefox-119.0+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js 2023-10-19 23:41:17.000000000 +0000 +++ firefox-119.0.1+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_amazon.js 2023-11-07 06:33:22.000000000 +0000 @@ -116,8 +116,7 @@ regions: ["au"], }, ], - suggestionUrlBase: "https://completion.amazon.com.au/search/complete", - suggestUrlCode: "mkt=111172", + noSuggestionsURL: true, }, { domain: "amazon.ca", @@ -128,9 +127,7 @@ regions: ["ca"], }, ], - searchUrlCode: "tag=mozillacanada-20", - suggestionUrlBase: "https://completion.amazon.ca/search/complete", - suggestUrlCode: "mkt=7", + noSuggestionsURL: true, }, { domain: "amazon.cn", @@ -140,7 +137,6 @@ regions: ["cn"], }, ], - searchUrlCode: "ix=sunray", noSuggestionsURL: true, }, { @@ -153,8 +149,7 @@ }, ], searchUrlCode: "tag=mozillajapan-fx-22", - suggestionUrlBase: "https://completion.amazon.co.jp/search/complete", - suggestUrlCode: "mkt=6", + noSuggestionsURL: true, }, { domain: "amazon.co.uk", @@ -165,9 +160,7 @@ regions: ["gb", "ie"], }, ], - searchUrlCode: "tag=firefox-uk-21", - suggestionUrlBase: "https://completion.amazon.co.uk/search/complete", - suggestUrlCode: "mkt=3", + noSuggestionsURL: true, }, { domain: "amazon.com", @@ -178,7 +171,7 @@ regions: ["us"], }, ], - searchUrlCode: "tag=moz-us-20", + noSuggestionsURL: true, }, { domain: "amazon.com", @@ -192,7 +185,7 @@ }, ], excluded: [{ regions: mainShippedRegions }], - searchUrlCode: "tag=mozilla-20", + noSuggestionsURL: true, }, { domain: "amazon.de", @@ -203,9 +196,7 @@ regions: ["at", "ch", "de"], }, ], - searchUrlCode: "tag=firefox-de-21", - suggestionUrlBase: "https://completion.amazon.de/search/complete", - suggestUrlCode: "mkt=4", + noSuggestionsURL: true, }, { domain: "amazon.es", @@ -216,9 +207,7 @@ regions: ["es", "pt"], }, ], - searchUrlCode: "tag=mozillaspain-21", - suggestionUrlBase: "https://completion.amazon.es/search/complete", - suggestUrlCode: "mkt=44551", + noSuggestionsURL: true, }, { domain: "amazon.fr", @@ -235,9 +224,7 @@ }, }, ], - searchUrlCode: "tag=firefox-fr-21", - suggestionUrlBase: "https://completion.amazon.fr/search/complete", - suggestUrlCode: "mkt=5", + noSuggestionsURL: true, }, { domain: "amazon.in", @@ -251,8 +238,7 @@ regions: ["in"], }, ], - suggestionUrlBase: "https://completion.amazon.in/search/complete", - suggestUrlCode: "mkt=44571", + noSuggestionsURL: true, }, { domain: "amazon.it", @@ -263,9 +249,7 @@ regions: ["it", "sm", "va"], }, ], - searchUrlCode: "tag=firefoxit-21", - suggestionUrlBase: "https://completion.amazon.it/search/complete", - suggestUrlCode: "mkt=35691", + noSuggestionsURL: true, }, { domain: "amazon.nl", @@ -276,9 +260,7 @@ regions: ["nl"], }, ], - searchUrlCode: "tag=mozillanether-21", - suggestionUrlBase: "https://completion.amazon.nl/search/complete", - suggestUrlCode: "mkt=328451", + noSuggestionsURL: true, }, { domain: "amazon.nl", @@ -296,9 +278,7 @@ }, }, ], - searchUrlCode: "tag=mozillanether-21", - suggestionUrlBase: "https://completion.amazon.nl/search/complete", - suggestUrlCode: "mkt=328451", + noSuggestionsURL: true, }, { domain: "amazon.se", @@ -309,9 +289,7 @@ regions: ["se"], }, ], - searchUrlCode: "tag=mozillasweede-21", - suggestionUrlBase: "https://completion.amazon.se/search/complete", - suggestUrlCode: "mkt=704403121", + noSuggestionsURL: true, }, ], }); @@ -337,7 +315,6 @@ d => d.telemetryId == "amazondotcom-us" ); details.telemetryId = "amazondotcom"; - details.searchUrlCode = "tag=mozilla-20"; // nl not present due to urls that don't work. let availableIn = test._config.available.included; diff -Nru firefox-119.0+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js firefox-119.0.1+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js --- firefox-119.0+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js 2023-10-19 23:41:17.000000000 +0000 +++ firefox-119.0.1+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js 2023-11-07 06:33:22.000000000 +0000 @@ -78,12 +78,6 @@ region: "CN", distribution: "MozillaOnline", test: engines => - hasParams(engines, "亚马逊", "searchbar", "ie=UTF8") && - hasParams(engines, "亚马逊", "suggestions", "tag=mozilla") && - hasParams(engines, "亚马逊", "homepage", "camp=536") && - hasParams(engines, "亚马逊", "homepage", "creative=3200") && - hasParams(engines, "亚马逊", "homepage", "index=aps") && - hasParams(engines, "亚马逊", "homepage", "linkCode=ur2") && hasEnginesFirst(engines, ["百度", "Bing", "Google", "亚马逊", "维基百科"]), });