# HG changeset patch # User Rajdeep Malakar # Date 1721551695 -19800 # Sun Jul 21 14:18:15 2024 +0530 # Node ID addcd04d206576bc0ca6735afdf5d6ba43e8c38a # Parent e02aaef56a586e12fc596a7a4763f8aef4352b77 Fix branding 1. Use SVG Images for about-logo 2. `navigator.whoami` is now fully gated behind the `flamewolf.api.whoami.enabled` pref, enabled by default. On the absence, instead of returning an empty string, it will no longer exist (aka, become `undefined`) diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css --- a/browser/base/content/aboutDialog.css +++ b/browser/base/content/aboutDialog.css @@ -17,7 +17,7 @@ } #leftBox { - background-image: url("chrome://branding/content/about-logo.png"); + background-image: url("chrome://branding/content/about-logo.svg"); background-repeat: no-repeat; background-size: 192px auto; background-position: center 40px; @@ -31,7 +31,7 @@ @media (min-resolution: 2dppx) { #leftBox { - background-image: url("chrome://branding/content/about-logo@2x.png"); + background-image: url("chrome://branding/content/about-logo.svg"); } } diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -44,7 +44,7 @@ #ifndef MOZ_UPDATER diff --git a/browser/base/content/test/general/browser_gestureSupport.js b/browser/base/content/test/general/browser_gestureSupport.js --- a/browser/base/content/test/general/browser_gestureSupport.js +++ b/browser/base/content/test/general/browser_gestureSupport.js @@ -924,15 +924,15 @@ stopExpectedRotation, test_rotateHelperGetImageRotation(aImageElement), "Image rotation at gesture stop/hold: expected=" + - stopExpectedRotation + - ", observed=" + - test_rotateHelperGetImageRotation(aImageElement) + - ", init=" + - aCurrentRotation + - ", amt=" + - aAmount + - ", dir=" + - (aDirection == clockwise ? "cl" : "ccl") + stopExpectedRotation + + ", observed=" + + test_rotateHelperGetImageRotation(aImageElement) + + ", init=" + + aCurrentRotation + + ", amt=" + + aAmount + + ", dir=" + + (aDirection == clockwise ? "cl" : "ccl") ); } // End it and force flush @@ -967,15 +967,15 @@ finalExpectedRotation, test_rotateHelperGetImageRotation(aImageElement), "Image rotation gesture end: expected=" + - finalExpectedRotation + - ", observed=" + - test_rotateHelperGetImageRotation(aImageElement) + - ", init=" + - aCurrentRotation + - ", amt=" + - aAmount + - ", dir=" + - (aDirection == clockwise ? "cl" : "ccl") + finalExpectedRotation + + ", observed=" + + test_rotateHelperGetImageRotation(aImageElement) + + ", init=" + + aCurrentRotation + + ", amt=" + + aAmount + + ", dir=" + + (aDirection == clockwise ? "cl" : "ccl") ); } @@ -1138,7 +1138,7 @@ function test_rotateGestures() { test_imageTab = BrowserTestUtils.addTab( gBrowser, - "chrome://branding/content/about-logo.png" + "chrome://branding/content/about-logo.svg" ); gBrowser.selectedTab = test_imageTab; diff --git a/browser/branding/flamewolf/content/about-logo.png b/browser/branding/flamewolf/content/about-logo.png deleted file mode 100644 index c1fc3f0b6a3bda5f9485fbc47f2861940255b9ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/browser/branding/flamewolf/content/firefox-wordmark.svg b/browser/branding/flamewolf/content/firefox-wordmark.svg --- a/browser/branding/flamewolf/content/firefox-wordmark.svg +++ b/browser/branding/flamewolf/content/firefox-wordmark.svg @@ -1,7 +1,6 @@ - - + diff --git a/browser/branding/flamewolf/content/jar.mn b/browser/branding/flamewolf/content/jar.mn --- a/browser/branding/flamewolf/content/jar.mn +++ b/browser/branding/flamewolf/content/jar.mn @@ -5,9 +5,7 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes content/branding/about.png - content/branding/about-logo.png content/branding/about-logo.svg - content/branding/about-logo@2x.png content/branding/about-logo-private.png content/branding/about-logo-private@2x.png content/branding/about-wordmark.svg diff --git a/browser/components/newtab/content-src/components/Search/_Search.scss b/browser/components/newtab/content-src/components/Search/_Search.scss --- a/browser/components/newtab/content-src/components/Search/_Search.scss +++ b/browser/components/newtab/content-src/components/Search/_Search.scss @@ -26,7 +26,7 @@ display: inline-block; height: $logo-size; width: $logo-size; - background: image-set(url('chrome://branding/content/about-logo.png'), url('chrome://branding/content/about-logo@2x.png') 2x) no-repeat center; + background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center; background-size: $logo-size; } diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css --- a/browser/components/newtab/css/activity-stream-linux.css +++ b/browser/components/newtab/css/activity-stream-linux.css @@ -1282,7 +1282,7 @@ display: inline-block; height: 82px; width: 82px; - background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center; + background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center; background-size: 82px; } .search-wrapper .logo-and-wordmark .wordmark { diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css --- a/browser/components/newtab/css/activity-stream-mac.css +++ b/browser/components/newtab/css/activity-stream-mac.css @@ -1286,7 +1286,7 @@ display: inline-block; height: 82px; width: 82px; - background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center; + background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center; background-size: 82px; } .search-wrapper .logo-and-wordmark .wordmark { diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css --- a/browser/components/newtab/css/activity-stream-windows.css +++ b/browser/components/newtab/css/activity-stream-windows.css @@ -1282,7 +1282,7 @@ display: inline-block; height: 82px; width: 82px; - background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center; + background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center; background-size: 82px; } .search-wrapper .logo-and-wordmark .wordmark { diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus.js --- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus.js +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus.js @@ -17,7 +17,7 @@ infoTitleEnabled: true, infoBody: "This is some text", infoLinkText: "This is a link", - infoIcon: "chrome://branding/content/about-logo.png", + infoIcon: "chrome://branding/content/about-logo.svg", promoTitle: "Promo title", promoLinkText: "Promo link", promoLinkType: "link", @@ -55,7 +55,7 @@ ok(!infoContainer.hidden, ".info container should be visible"); ok( infoContainer.style.backgroundImage.includes( - "chrome://branding/content/about-logo.png" + "chrome://branding/content/about-logo.svg" ), "should render icon" ); diff --git a/browser/config/version.txt b/browser/config/version.txt --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1,1 +1,1 @@ -128.1.1 +128.1.2 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1,1 +1,1 @@ -128.1.1esr +128.1.2esr diff --git a/devtools/client/inspector/markup/test/doc_markup_image_and_canvas_2.html b/devtools/client/inspector/markup/test/doc_markup_image_and_canvas_2.html --- a/devtools/client/inspector/markup/test/doc_markup_image_and_canvas_2.html +++ b/devtools/client/inspector/markup/test/doc_markup_image_and_canvas_2.html @@ -5,7 +5,7 @@ Image and Canvas markup-view test - + diff --git a/devtools/client/inspector/markup/test/doc_markup_whitespace.html b/devtools/client/inspector/markup/test/doc_markup_whitespace.html --- a/devtools/client/inspector/markup/test/doc_markup_whitespace.html +++ b/devtools/client/inspector/markup/test/doc_markup_whitespace.html @@ -13,13 +13,13 @@
div 2
div 3
- - - + + +
- - + +
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl --- a/dom/webidl/Navigator.webidl +++ b/dom/webidl/Navigator.webidl @@ -56,7 +56,7 @@ DOMString arch(); [Pure] boolean isEnabled(DOMString api); - [Pure] + [Pure, Pref="flamewolf.api.whoami.enabled"] DOMString whoami(); // WebKit/Blink/Trident/Presto support this (hardcoded "Mozilla"). [Constant, Cached, Throws]