diff --git a/.cargo/config.in b/.cargo/config.in index 56a8e846bba2b040c08e8be6efe69eb70d97be5d..d36c58f5078bfdd33987d5118b3cea077a21e05e 100644 --- a/.cargo/config.in +++ b/.cargo/config.in @@ -20,7 +20,7 @@ rev = "1bb484e96ae724309e3346968e8ffd4c25e61616" [source."https://github.com/mozilla/cubeb-pulse-rs"] git = "https://github.com/mozilla/cubeb-pulse-rs" replace-with = "vendored-sources" -rev = "c87b50aebfa088c1ad30c74819d4e9829f88b2e3" +rev = "b0acd9e16c0249d61835a2d23735fbcbd8cbef64" [source."https://github.com/mozilla/cubeb-coreaudio-rs"] git = "https://github.com/mozilla/cubeb-coreaudio-rs" @@ -97,6 +97,11 @@ git = "https://github.com/bytecodealliance/wasmtime" replace-with = "vendored-sources" rev = "824fa69756523f2b6d49029fe25de94130b1f144" +[source."https://github.com/alexcrichton/cc-rs/"] +git = "https://github.com/alexcrichton/cc-rs/" +replace-with = "vendored-sources" +rev = "b2f6b146b75299c444e05bbde50d03705c7c4b6e" + [source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"] git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/" replace-with = "vendored-sources" diff --git a/Cargo.lock b/Cargo.lock index c0db28d5679c7bbf1a287c320b4fd860d4c6a478..de958a6fe2ed9aaf139948e964d86eb879b39ec9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -491,9 +491,8 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +version = "1.0.71" +source = "git+https://github.com/alexcrichton/cc-rs/?rev=b2f6b146b75299c444e05bbde50d03705c7c4b6e#b2f6b146b75299c444e05bbde50d03705c7c4b6e" dependencies = [ "jobserver", ] @@ -1028,7 +1027,7 @@ dependencies = [ [[package]] name = "cubeb-pulse" version = "0.3.0" -source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3" +source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64" dependencies = [ "cubeb-backend", "pulse", @@ -3870,7 +3869,7 @@ dependencies = [ [[package]] name = "pulse" version = "0.3.0" -source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3" +source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64" dependencies = [ "bitflags", "pulse-ffi", @@ -3879,7 +3878,7 @@ dependencies = [ [[package]] name = "pulse-ffi" version = "0.1.0" -source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=c87b50aebfa088c1ad30c74819d4e9829f88b2e3#c87b50aebfa088c1ad30c74819d4e9829f88b2e3" +source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=b0acd9e16c0249d61835a2d23735fbcbd8cbef64#b0acd9e16c0249d61835a2d23735fbcbd8cbef64" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 8ceb18889000d6aa4dce7f876e101b8ef81993ab..74658ce02ad8be0134108e7ec65e3e3b016f1758 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -109,3 +109,8 @@ path = "third_party/rust/failure" [patch.crates-io.prost-derive] path = "third_party/rust/prost-derive" + +# Pick upstream patch for GCC 11 on armhf linux. +[patch.crates-io.cc] +git = "https://github.com/alexcrichton/cc-rs/" +rev = "b2f6b146b75299c444e05bbde50d03705c7c4b6e" diff --git a/accessible/windows/msaa/MsaaAccessible.cpp b/accessible/windows/msaa/MsaaAccessible.cpp index 06490463a29173cabd4c715d52d8b68b5de6cbe4..09e95244502f0e13dbd331785e269471dd37c986 100644 --- a/accessible/windows/msaa/MsaaAccessible.cpp +++ b/accessible/windows/msaa/MsaaAccessible.cpp @@ -663,20 +663,22 @@ static bool VisitDocAccessibleParentDescendantsAtTopLevelInContentProcess( already_AddRefed MsaaAccessible::GetRemoteIAccessibleFor( const VARIANT& aVarChild) { a11y::RootAccessible* root = LocalAcc()->RootAccessible(); - const nsTArray* remoteDocs = + const nsTArray* rawRemoteDocs = DocManager::TopLevelRemoteDocs(); - if (!remoteDocs) { + if (!rawRemoteDocs) { return nullptr; } + nsTArray> remoteDocs(rawRemoteDocs->Length()); + for (auto rawRemoteDoc : *rawRemoteDocs) { + remoteDocs.AppendElement(rawRemoteDoc); + } RefPtr result; - // We intentionally leave the call to remoteDocs->Length() inside the loop - // condition because it is possible for reentry to occur in the call to - // GetProxiedAccessibleInSubtree() such that remoteDocs->Length() is mutated. - for (size_t i = 0; i < remoteDocs->Length(); i++) { - DocAccessibleParent* topRemoteDoc = remoteDocs->ElementAt(i); - + for (auto topRemoteDoc : remoteDocs) { + if (topRemoteDoc->IsShutdown()) { + continue; + } LocalAccessible* outerDoc = topRemoteDoc->OuterDocOfRemoteBrowser(); if (!outerDoc) { continue; diff --git a/browser/actors/ClickHandlerChild.jsm b/browser/actors/ClickHandlerChild.jsm index 4f5c2b0b7ea1d40092aac3b25352b177c3a87aad..3c33deddd2481834fc5860fe60234d8f21cbda86 100644 --- a/browser/actors/ClickHandlerChild.jsm +++ b/browser/actors/ClickHandlerChild.jsm @@ -23,6 +23,12 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/E10SUtils.jsm" ); +ChromeUtils.defineModuleGetter( + this, + "BrowserUtils", + "resource://gre/modules/BrowserUtils.jsm" +); + class ClickHandlerChild extends JSWindowActorChild { handleEvent(event) { if ( @@ -59,7 +65,9 @@ class ClickHandlerChild extends JSWindowActorChild { } } - let [href, node, principal] = this._hrefAndLinkNodeForClickEvent(event); + let [href, node, principal] = BrowserUtils.hrefAndLinkNodeForClickEvent( + event + ); let csp = ownerDoc.csp; if (csp) { @@ -133,65 +141,4 @@ class ClickHandlerChild extends JSWindowActorChild { this.sendAsyncMessage("Content:Click", json); } } - - /** - * Extracts linkNode and href for the current click target. - * - * @param event - * The click event. - * @return [href, linkNode, linkPrincipal]. - * - * @note linkNode will be null if the click wasn't on an anchor - * element. This includes SVG links, because callers expect |node| - * to behave like an element, which SVG links (XLink) don't. - */ - _hrefAndLinkNodeForClickEvent(event) { - let content = this.contentWindow; - function isHTMLLink(aNode) { - // Be consistent with what nsContextMenu.js does. - return ( - (aNode instanceof content.HTMLAnchorElement && aNode.href) || - (aNode instanceof content.HTMLAreaElement && aNode.href) || - aNode instanceof content.HTMLLinkElement - ); - } - - let node = event.composedTarget; - while (node && !isHTMLLink(node)) { - node = node.flattenedTreeParentNode; - } - - if (node) { - return [node.href, node, node.ownerDocument.nodePrincipal]; - } - - // If there is no linkNode, try simple XLink. - let href, baseURI; - node = event.composedTarget; - while (node && !href) { - if ( - node.nodeType == content.Node.ELEMENT_NODE && - (node.localName == "a" || - node.namespaceURI == "http://www.w3.org/1998/Math/MathML") - ) { - href = - node.getAttribute("href") || - node.getAttributeNS("http://www.w3.org/1999/xlink", "href"); - if (href) { - baseURI = node.ownerDocument.baseURIObject; - break; - } - } - node = node.flattenedTreeParentNode; - } - - // In case of XLink, we don't return the node we got href from since - // callers expect -like elements. - // Note: makeURI() will throw if aUri is not a valid URI. - return [ - href ? Services.io.newURI(href, null, baseURI).spec : null, - null, - node && node.ownerDocument.nodePrincipal, - ]; - } } diff --git a/browser/actors/ClickHandlerParent.jsm b/browser/actors/ClickHandlerParent.jsm index 0f658fccf7b89c90f7ddb7a20840739800a417b2..89363074ed148046ecc3002703ea6cc635149460 100644 --- a/browser/actors/ClickHandlerParent.jsm +++ b/browser/actors/ClickHandlerParent.jsm @@ -55,6 +55,11 @@ class ClickHandlerParent extends JSWindowActorParent { // This is heavily based on contentAreaClick from browser.js (Bug 903016) // The data is set up in a way to look like an Event. let browser = this.manager.browsingContext.top.embedderElement; + if (!browser) { + // Can be null if the tab disappeared by the time we got the message. + // Just bail. + return; + } let window = browser.ownerGlobal; if (!data.href) { diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js index 8dbb29032a47e1e11c609e1c4ab4c826c944b6c4..e7e1de8d877103bdf448d65a559816e07191f022 100644 --- a/browser/base/content/browser-fullScreenAndPointerLock.js +++ b/browser/base/content/browser-fullScreenAndPointerLock.js @@ -122,8 +122,17 @@ var PointerlockFsWarning = { this._timeoutHide.start(); }, - close() { - if (!this._element) { + /** + * Close the full screen or pointerlock warning. + * @param {('fullscreen-warning'|'pointerlock-warning')} elementId - Id of the + * warning element to close. If the id does not match the currently shown + * warning this is a no-op. + */ + close(elementId) { + if (!elementId) { + throw new Error("Must pass id of warning element to close"); + } + if (!this._element || this._element.id != elementId) { return; } // Cancel any pending timeout @@ -245,7 +254,7 @@ var PointerLock = { }, exited() { - PointerlockFsWarning.close(); + PointerlockFsWarning.close("pointerlock-warning"); }, }; @@ -447,7 +456,7 @@ var FullScreen = { // If we have a current pointerlock warning shown then hide it // before transition. - PointerlockFsWarning.close(); + PointerlockFsWarning.close("pointerlock-warning"); // If it is a remote browser, send a message to ask the content // to enter fullscreen state. We don't need to do so if it is an @@ -569,7 +578,7 @@ var FullScreen = { true ); - PointerlockFsWarning.close(); + PointerlockFsWarning.close("fullscreen-warning"); gBrowser.tabContainer.removeEventListener( "TabSelect", this.exitDomFullScreen diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js index d9ec5c27bbc5bebeeaeb8c81878050e772864e1f..f06f5e6e21ea219fc48a9fcfb2db07da66969f4c 100644 --- a/browser/base/content/test/static/browser_parsable_css.js +++ b/browser/base/content/test/static/browser_parsable_css.js @@ -118,6 +118,9 @@ let propNameWhitelist = [ // This variable is used from CSS embedded in JS in adjustableTitle.js { propName: "--icon-url", isFromDevTools: false }, + + // This variable is used from CSS embedded in JS in pdf.js + { propName: "--zoom-factor", isFromDevTools: false }, ]; // Add suffix to stylesheets' URI so that we always load them here and diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css index f978d523cc8954ef1ecb3ad7444803e56b9f1845..553e8f44f860a96c99c95b9eae9db5b9c66deb11 100644 --- a/browser/components/downloads/content/downloads.css +++ b/browser/components/downloads/content/downloads.css @@ -91,7 +91,7 @@ #downloadsPanel-blockedSubview, #downloadsPanel-mainView { font: caption; - width: 35em; + min-width: 37em; padding: 0.62em; } diff --git a/browser/components/downloads/content/downloadsPanel.inc.xhtml b/browser/components/downloads/content/downloadsPanel.inc.xhtml index 124cd2f706b4a98dcfe99afdf50df2beb73a97f2..e20bc0d6dbc039ab42bda5f4dab99cedcf63b74c 100644 --- a/browser/components/downloads/content/downloadsPanel.inc.xhtml +++ b/browser/components/downloads/content/downloadsPanel.inc.xhtml @@ -117,7 +117,7 @@ menuitem.link ); openContainerInTabs_menuitem.disabled = !openContainerInTabs; + openContainerInTabs_menuitem.hidden = false; } else { - document.getElementById( - "placesContext_open:newprivatewindow" - ).hidden = PrivateBrowsingUtils.isWindowPrivate(window); + linkItems.forEach(id => (document.getElementById(id).hidden = false)); + document.getElementById("placesContext_open:newprivatewindow").hidden = + PrivateBrowsingUtils.isWindowPrivate(window) || + !PrivateBrowsingUtils.enabled; } - openContainerInTabs_menuitem.hidden = !isFolder; - linkItems.forEach(id => (document.getElementById(id).hidden = isFolder)); event.target.ownerGlobal.updateCommands("places"); }, diff --git a/browser/components/search/extensions/coccoc/favicon.ico b/browser/components/search/extensions/coccoc/favicon.ico index e6e82d938e75a6d3a93aa275958f4600c4e0236c..f128244fed478f8bf172d9306e1251993abad103 100644 Binary files a/browser/components/search/extensions/coccoc/favicon.ico and b/browser/components/search/extensions/coccoc/favicon.ico differ diff --git a/browser/components/urlbar/tests/unit/test_unitConversion.js b/browser/components/urlbar/tests/unit/test_unitConversion.js index b0a7d5e5e6c667422b00f5cb7f288b1c870c4b59..f28d8653b32cec48ba8145b0ebaeb1d56fb10c8f 100644 --- a/browser/components/urlbar/tests/unit/test_unitConversion.js +++ b/browser/components/urlbar/tests/unit/test_unitConversion.js @@ -391,22 +391,70 @@ const TEST_DATA = [ { queryString: "0:00 utc to here", timezone: "EST5EDT", - expected: "20:00 UTC-400", + assertResult: output => { + const date = new Date(); + const offset = date.getTimezoneOffset(); + if (offset === 240) { + // Summer time. + Assert.equal(output, "20:00 UTC-400"); + } else if (offset === 300) { + // Standard time. + Assert.equal(output, "19:00 UTC-500"); + } else { + Assert.ok(false, "Unexpected time"); + } + }, }, { queryString: "0:00 utc to here", timezone: "PST8PDT", - expected: "17:00 UTC-700", + assertResult: output => { + const date = new Date(); + const offset = date.getTimezoneOffset(); + if (offset === 420) { + // Summer time. + Assert.equal(output, "17:00 UTC-700"); + } else if (offset === 480) { + // Standard time. + Assert.equal(output, "16:00 UTC-800"); + } else { + Assert.ok(false, "Unexpected time"); + } + }, }, { queryString: "9:00 to utc", timezone: "EST5EDT", - expected: "13:00 UTC", + assertResult: output => { + const date = new Date(); + const offset = date.getTimezoneOffset(); + if (offset === 240) { + // Summer time. + Assert.equal(output, "13:00 UTC"); + } else if (offset === 300) { + // Standard time. + Assert.equal(output, "14:00 UTC"); + } else { + Assert.ok(false, "Unexpected time"); + } + }, }, { queryString: "9 am to utc", timezone: "EST5EDT", - expected: "1:00 PM UTC", + assertResult: output => { + const date = new Date(); + const offset = date.getTimezoneOffset(); + if (offset === 240) { + // Summer time. + Assert.equal(output, "1:00 PM UTC"); + } else if (offset === 300) { + // Standard time. + Assert.equal(output, "2:00 PM UTC"); + } else { + Assert.ok(false, "Unexpected time"); + } + }, }, { queryString: "now to utc", diff --git a/browser/config/version.txt b/browser/config/version.txt index c7d317f051caf32086fec4acbcc1549c3c4a21df..6d90c85e80a80523cdbf2fc283563cd400602aee 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -91.3.0 +91.4.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 29b8c0b0480be362a9d11f45bfec91d38f41f790..5f364dd0cee1e38fad6f42f493e704210024ffda 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -91.3.0esr +91.4.0esr diff --git a/browser/locales/en-US/browser/downloads.ftl b/browser/locales/en-US/browser/downloads.ftl index 28570bb1cf692ed4daec69ea60095820d7b9161c..efd8e7a45bd3a5696f9cf2b54f6bc6bb48bdab4c 100644 --- a/browser/locales/en-US/browser/downloads.ftl +++ b/browser/locales/en-US/browser/downloads.ftl @@ -15,8 +15,8 @@ downloads-panel = # The style attribute has the width of the Downloads Panel expressed using # a CSS unit. The longest labels that should fit are usually those of # in-progress and blocked downloads. -downloads-panel-list = - .style = width: 70ch +downloads-panel-items = + .style = width: 35em downloads-cmd-pause = .label = Pause diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json index 01f9741047c3fc08a42c101d58e9f61e7e48076a..9b5ae021f595c595171a2c4a2b54e63aeb46ee96 100644 --- a/browser/locales/l10n-changesets.json +++ b/browser/locales/l10n-changesets.json @@ -15,7 +15,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "92a1596272fd42bb56e2d5043bd7b8eb65e86314" + "revision": "8312cd2e0777746cca7da89502bd806e57fff7e0" }, "af": { "pin": false, @@ -33,7 +33,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "ef1fb0bc8de0d804e719deb854e71a9287e10147" + "revision": "21bf766c19d81d560aeb7fea3923acaa160a4f0b" }, "an": { "pin": false, @@ -51,7 +51,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "643856bc8d0c324fe63fff8f009534d7a2694256" + "revision": "34b6a4f0790db8e78bb8623a1a835008ccd0b949" }, "ar": { "pin": false, @@ -69,7 +69,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "0933e35d41ba4db587fa87e1bd445e296886e939" + "revision": "513c3e8dac974838cbfc60137a9999d9b3249572" }, "ast": { "pin": false, @@ -87,7 +87,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "d70a68a4aa6face0962deec6f640b6f387c6f47a" + "revision": "19ca0cd0d1bf1ba0d31179c2add90526e7c61867" }, "az": { "pin": false, @@ -105,7 +105,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "6c8cee31a01b8f4e5658eaf9ead1373ac39d7f77" + "revision": "44aa0dad7964291bfa8ca8e7b74ea4cff369df93" }, "be": { "pin": false, @@ -123,7 +123,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "50750fd62e1f551058e1ad72427f2c47b4c513f7" + "revision": "c41577eaf11e849a8e9deaea820b6414a5705cbc" }, "bg": { "pin": false, @@ -141,7 +141,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "f8fd9a2a1a4e21f7ca4db522fa183e9dbab38a8e" + "revision": "98d00610785165a5b5b50719e5cd963a3113dbfb" }, "bn": { "pin": false, @@ -159,7 +159,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "37f0cdb8748acae5d6457b3b2490360603d7d78d" + "revision": "2ca52cbb680a58c4cd4b614cf4699fbf98d9efd4" }, "br": { "pin": false, @@ -177,7 +177,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "87c6e8d9493ef888ce46741fa4379c881c4b7adf" + "revision": "ce92556a0a903955d3c937b59a7c14bd6e1f7ecf" }, "bs": { "pin": false, @@ -195,7 +195,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "c00f54616813c87f5998880daf0bb1f4d07bcc25" + "revision": "1c79dabdb12088b14ae76696ca31170c011b1bcf" }, "ca": { "pin": false, @@ -213,7 +213,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "657a772d6987a0cc31d556827abded1c98b642c9" + "revision": "a22912c01617f0fbc3fe6ec907c17049b7688942" }, "ca-valencia": { "pin": false, @@ -231,7 +231,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "de153293fca69dcd36c10ad1e3ddb9f5d0a575bb" + "revision": "34bf3fd631d48459075581cbfcfd1449ea94f394" }, "cak": { "pin": false, @@ -249,7 +249,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8f035471e0d6850a7768282cd6f312be915ed756" + "revision": "e2e4ba2c37bcea86404c345c24eb0352bd879f4f" }, "cs": { "pin": false, @@ -267,7 +267,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "180092244961ac555f475ee4a54ecfb9f0b91ee3" + "revision": "a60792bff6ff8d6f564445c1c270ce3b14aff13b" }, "cy": { "pin": false, @@ -285,7 +285,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "ed04c2140266a3466b3ee2df713a5db523ec83ff" + "revision": "fe6e566e139d36f25ac9899df2256225cb968a1f" }, "da": { "pin": false, @@ -303,7 +303,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "04f115e9e669cf3e5f709c8007244240d3bb9d70" + "revision": "af198d43f7d62d5421d3ea845947aaf625c48e18" }, "de": { "pin": false, @@ -321,7 +321,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "97551d848cc35d23ab44c5fb575cb033e9b103f8" + "revision": "cdd66c249c7b6039c6128d421a8d6d7bab140f95" }, "dsb": { "pin": false, @@ -339,7 +339,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "eed5e4afa16a0d40b190677ed63ba58e3fa15603" + "revision": "962e5a544415d3edfb87406e4ee1b1cc04488c5a" }, "el": { "pin": false, @@ -357,7 +357,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "46b1520ed3b056cd7e04ff49f092aca92ee958e0" + "revision": "e7c49fd88463275b2b52be622e8f1b5ced0edb42" }, "en-CA": { "pin": false, @@ -375,7 +375,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "20e2b9c4064ee74a24690eb2bcf328c7dd248a5b" + "revision": "5a0e35b08a489351418516c5c384b15bdef9cabd" }, "en-GB": { "pin": false, @@ -393,7 +393,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8a6db5af83f3851a921082defa94d9facd85d9e9" + "revision": "72f8c5d8305df3233cc78e9d2967f6c6624315ba" }, "eo": { "pin": false, @@ -411,7 +411,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "4b208b3cffcaf8dd46746c95f858d46c75ff1e53" + "revision": "23c9df7dee77ec8fae490f54c7a1f737e91bb689" }, "es-AR": { "pin": false, @@ -429,7 +429,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "e660e5b821466e8ecc40b3332ebcc0e16631dcff" + "revision": "6cf3c836995d40e92bb7380e49f0992b269f8f5f" }, "es-CL": { "pin": false, @@ -447,7 +447,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "609efca99c32a1c06ab7d37accfb4013d80d3a23" + "revision": "8727dda3935ef37fcbe6835baec1805db02d79b8" }, "es-ES": { "pin": false, @@ -465,7 +465,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "06f7fdd2474052203dc55d20ae7d8d643cd42c35" + "revision": "5351aba49895272a124069fd062506f132717b9e" }, "es-MX": { "pin": false, @@ -483,7 +483,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "46c5761bc0a0d79c11f338ee1c8ead3a54239d01" + "revision": "dd834a4af402c5c6706f622c4f3dcc0c95abb5b0" }, "et": { "pin": false, @@ -501,7 +501,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "77c75b38c76635d298a50902fe7e0e0b6f6e8258" + "revision": "1f2150796079f0ddc0c5c4bba7c030fc98b39cd2" }, "eu": { "pin": false, @@ -519,7 +519,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "fc0109e70847351138cb7ca1998b9ccafb46d73b" + "revision": "b2aaf4f508cf10389fec637d0f3bdf1ebbbc720c" }, "fa": { "pin": false, @@ -537,7 +537,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "9800e65943ae7b07be1369f4de0ba9f92fe6ef5d" + "revision": "04ec3c3bbe92bdc5fe96943ccccf11d798c906dc" }, "ff": { "pin": false, @@ -555,7 +555,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "cab0e832bfed5291ba93618d46941391fe503185" + "revision": "0cf866f9bc4efcaf941823c89be7103d91c27634" }, "fi": { "pin": false, @@ -573,7 +573,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "1996d416f8706f7ac8577f0db397c25aa5e2158b" + "revision": "04a600fc54a48f151318f9207cc8ec1a3236842b" }, "fr": { "pin": false, @@ -591,7 +591,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "cf093603b7bfad4fe144b46bc119fcb0b9226a03" + "revision": "64a3576df276ce45d0ff0d4ee133c92c1801bcc0" }, "fy-NL": { "pin": false, @@ -609,7 +609,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8db3ea4951e266a03c87d42944eb8bcb435c61eb" + "revision": "c84177dfa254ca9144062a61c07ff6f8e89d9c0e" }, "ga-IE": { "pin": false, @@ -627,7 +627,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "86160f7aeec7b615f982ee024825426812715b91" + "revision": "31590cffac566446b3654fad63d25b89cf39f8c0" }, "gd": { "pin": false, @@ -645,7 +645,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "cd6f01ba00ba02642f71808f0350bb61c07f0127" + "revision": "ba4f274ac4a1198251e9b9f0dd1fcd5adec53ada" }, "gl": { "pin": false, @@ -663,7 +663,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "753414a73c6e94e35325f41350f5374009c04a42" + "revision": "56b41bdcd401c52ded45bbbe67e6dc34727b0eb0" }, "gn": { "pin": false, @@ -681,7 +681,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "b6442f8530c9ecbf07e11badb6944cfc6b2c6599" + "revision": "59e2afb65c08b79c7cd3a54f1b4dc3185253e755" }, "gu-IN": { "pin": false, @@ -699,7 +699,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "71c65787b4b0cbfcd211710c7e4b54d10b4f2ed6" + "revision": "33b4409fb6154d61d7abc626b8beebcbed54f783" }, "he": { "pin": false, @@ -717,7 +717,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "ebe4151d33e329d31a91a2ce7293d46eb40974ac" + "revision": "92f9f82381899a6d87cbb499e8232f2379dd152b" }, "hi-IN": { "pin": false, @@ -735,7 +735,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "3dbb505738e1dd04d6f0dcc7ba8643eff475c395" + "revision": "00090f7a2a3fe122f40e4831945b41dfc4ce9be0" }, "hr": { "pin": false, @@ -753,7 +753,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "4f1a0f4f4067b44d7964a0a4689e8a5804a88440" + "revision": "6e4a3fdc01f315566fe44286e5e9e7421f463165" }, "hsb": { "pin": false, @@ -771,7 +771,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "ee883b57e3233de6e7b3aa5aa9474c55e898858c" + "revision": "7fd9bc25e49d515d0233fc4e7ead47f55557a145" }, "hu": { "pin": false, @@ -789,7 +789,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "ece9f6fe94177435b9b696ba2008d8f08f1fbee8" + "revision": "ce3b378ce95009f47be7840aa688123067c8fb24" }, "hy-AM": { "pin": false, @@ -807,7 +807,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "94e4ba11a06d733285195f99c58f0c51c7d4447e" + "revision": "c91a4a3e8821995112f3a66d1d8b383a4dbd1f5b" }, "ia": { "pin": false, @@ -825,7 +825,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "f6b923d775ab5d78d8dcc9e61b1fd467f8e37661" + "revision": "4f235acc839e921b4c1303874a40bd44433c2620" }, "id": { "pin": false, @@ -843,7 +843,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "cd52deeba1935fcf695799c7a63de28cbcc29004" + "revision": "fface86a34e44672fe70a52dc99e5fc91487f96c" }, "is": { "pin": false, @@ -861,7 +861,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "6ccce2be823e9ffa0d5f4d07d1b175dc58c7689c" + "revision": "5978ae767b44dac272feac7ca40ef7dd7e7162ce" }, "it": { "pin": false, @@ -879,7 +879,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "390a9b74d197e9710b974bedd653d131f60de192" + "revision": "4fdad8bddf965a20e82f73519d4f3c424766cf43" }, "ja": { "pin": false, @@ -895,7 +895,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "deaf9e14e832702d4771e807a2c1bcd38f7e47be" + "revision": "70352a22739bce87e4adbb6929f23f7c32eed5eb" }, "ja-JP-mac": { "pin": false, @@ -903,7 +903,7 @@ "macosx64", "macosx64-devedition" ], - "revision": "ce77b5ca42848c8ebfeff43e603715569a672ac9" + "revision": "d9293092a4608acd2ef01ed4fff7903267ebb661" }, "ka": { "pin": false, @@ -921,7 +921,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8bddf1adfa2c229465c3fb63751c8336793185ec" + "revision": "49b4a7c6bb2c5f41f38d432cdb35f0180d489e50" }, "kab": { "pin": false, @@ -939,7 +939,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "00a29720f947b0c90d871a153b968982516257db" + "revision": "7e9377dce15411da9fc3cf05ad2533f598f3fbfb" }, "kk": { "pin": false, @@ -957,7 +957,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "1d1ee9e00851e1ecc9deea025b2bc5b471b6e061" + "revision": "4850752776400eb3af019a1cc6286fb63785d14c" }, "km": { "pin": false, @@ -975,7 +975,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "7b2dcb7f998649999103bfe0829ac3aaa59a4a8a" + "revision": "3a5a1cae9b9306dd686af753ea51e3164c46d42b" }, "kn": { "pin": false, @@ -993,7 +993,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "89649fb492505be33c3711c0de298d638dc411e7" + "revision": "6ed122b33cacbdeb27068b19e86b3ca7fba642b6" }, "ko": { "pin": false, @@ -1011,7 +1011,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "9537ee3e1cc0e81ec947b7b95e2a60c7384f34d3" + "revision": "49bc07645a47f419eee745babe027ea846d6c9f8" }, "lij": { "pin": false, @@ -1029,7 +1029,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8ff625f36b1a391344e2d5e9d127f6a1ce7cb8c6" + "revision": "93f04df126164aa3e37bca2c981616372783d9a3" }, "lt": { "pin": false, @@ -1047,7 +1047,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "16886a7d864d614e4da149a9c7ef78c65d718bf1" + "revision": "45a45034f5f44299356927b7923256142ba29386" }, "lv": { "pin": false, @@ -1065,7 +1065,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "4c9912d162e8ee6a9bef55a1b7c8694ba8503dc7" + "revision": "daea4ba4e7f4c8bd90009f47f2f129c9f1a32a4c" }, "mk": { "pin": false, @@ -1083,7 +1083,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "a9bf2475611f1fdd1d1510e517a3b39923072362" + "revision": "0c4ca0f4fc179488beeb99fadee5099a67f66bd1" }, "mr": { "pin": false, @@ -1101,7 +1101,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "166d524f00d6cc01dfd328e027d1d39c47d3c8af" + "revision": "9be8d59519762d2211249f36d96c3a481a3a028e" }, "ms": { "pin": false, @@ -1119,7 +1119,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "02294c8f9869ce76fa81f31a972dfb6a34d365dd" + "revision": "0f44d0bcfda2db6f2d90c77bae46a55554edea27" }, "my": { "pin": false, @@ -1137,7 +1137,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "dca5a79d295865e40bca5e6696521995160706c2" + "revision": "ccbf0c4355d6a7d35ff28c6284a6ccd2c3ec6d06" }, "nb-NO": { "pin": false, @@ -1155,7 +1155,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "fa192e5cc1f73f78db70903e9b0dbb4e17fc7a05" + "revision": "a6cf2c6e35944be8477925180857370e44e74f61" }, "ne-NP": { "pin": false, @@ -1173,7 +1173,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "b8dd4d8f5e93e7b33c781e2aef70bdee0c2eaa44" + "revision": "c1636a1a7507710a736e6ffe4faf18ea92f45c9a" }, "nl": { "pin": false, @@ -1191,7 +1191,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "46a820726affa963ae8d0221fab375be955c225f" + "revision": "60ed1c2397a64d311eaf453a2c03679a51eb617d" }, "nn-NO": { "pin": false, @@ -1209,7 +1209,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "3cfb21421c531107d426a39fccce77955727753d" + "revision": "cf67b7b68d3bcff75fa544b66d624677e78f8078" }, "oc": { "pin": false, @@ -1227,7 +1227,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "e01ef9843c28cf55e4c451624db766552dd99db8" + "revision": "9ac29828960ef1d2267773688598a106a3c4eb3a" }, "pa-IN": { "pin": false, @@ -1245,7 +1245,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "da0d62f7f0ad6edbcb44cef3c728946b17234d5d" + "revision": "146b2fad2ae503434f9817a6bc88465d2f91af72" }, "pl": { "pin": false, @@ -1263,7 +1263,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "e30cce769184a71f15485a12723f39ccb95624d6" + "revision": "4d286061b125d7a90b08ac4bd03574e768af5d75" }, "pt-BR": { "pin": false, @@ -1281,7 +1281,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "bd8a87e96bdb21ff6a44d32aa7dba9d42c5f2fe4" + "revision": "89f1b173c9b1002bb3acecc28ee7884d23c9d029" }, "pt-PT": { "pin": false, @@ -1299,7 +1299,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "fe2b648b39619dea2190b45193db507937410b3d" + "revision": "27adc5dad78159639f4921960499b13a6031837e" }, "rm": { "pin": false, @@ -1317,7 +1317,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "2707ab2e7ca0079b9ee1748ebb5f18e752bff804" + "revision": "f27a9549658ab5d5e0d31bd6cc0469b298b985af" }, "ro": { "pin": false, @@ -1335,7 +1335,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "0f29430e1de4c090f96b8cc2322e37974c6099c9" + "revision": "69cdc288966fcc830e3485125f1be4105cda88cd" }, "ru": { "pin": false, @@ -1353,7 +1353,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8b59cb544f3c7e6eee5f97dee439ae0f201d44dd" + "revision": "ee31f5a24611f677b08a13511ed9448befce1959" }, "sco": { "pin": false, @@ -1371,7 +1371,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "29f369dc5302982392ccc3aea2454d6825bb81d1" + "revision": "61ea93a50fffdcd948d3c20421039b712e414d38" }, "si": { "pin": false, @@ -1389,7 +1389,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "39dc94da7fbdd627ce77d14a835588d75e823bc4" + "revision": "2b134d24c0464fbf2b5fd323df0e32cadc13f424" }, "sk": { "pin": false, @@ -1407,7 +1407,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "0d7a7bc0caa7294cbc0e55ba0b24b281e84cb5ba" + "revision": "6d69c24dc8db10d955d908ba5d6c61809a045ec6" }, "sl": { "pin": false, @@ -1425,7 +1425,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "cf86931ec405b8bba60c0bca609dcd14a903b66c" + "revision": "29e195d1d1609410f5383a83fd611ec195d2ef89" }, "son": { "pin": false, @@ -1443,7 +1443,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "7241fff63be7dc2e101e9e24a66ccf326d4e77fa" + "revision": "60a3b235fe1df2316e7c039ef7c22fbe67545a85" }, "sq": { "pin": false, @@ -1461,7 +1461,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "862be030f91ce3e9836a10335fd065be189d4aa0" + "revision": "8588cbc89847b93a0d29f02d85bfefee717b2d2f" }, "sr": { "pin": false, @@ -1479,7 +1479,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "35e4457ff9dd6dfd6a55db7582ea63921549ac29" + "revision": "901ab3e62a9a80aa700af7ebf1ef85152d9027a8" }, "sv-SE": { "pin": false, @@ -1497,7 +1497,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "5a7bb8693aa1d857a1b03ab45bf2c143b7381126" + "revision": "b098e2ebc049724d5a618c5e2a581ff9e01b869c" }, "szl": { "pin": false, @@ -1515,7 +1515,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "278901185c52a2ec9ba3e762e0390e236721c1f2" + "revision": "25951b964d5b961582e60620ab06a2f90f7b53a0" }, "ta": { "pin": false, @@ -1533,7 +1533,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "0f97ab424652c056c02320a04dba1c07e1085889" + "revision": "94659c83c9d820384aa4d505d5777571c4caecd6" }, "te": { "pin": false, @@ -1551,7 +1551,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "0c5171e645808b3f4b61b99450dedadf5ca9e610" + "revision": "eb59646a5d362451db123136ca697ab4e08dd334" }, "th": { "pin": false, @@ -1569,7 +1569,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "9bc9e10fc0a480f4e1ba36df71a7829732cee4e8" + "revision": "10d257301a2d7be0a5f1d66abe70000cfe3f1f15" }, "tl": { "pin": false, @@ -1587,7 +1587,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "9f8f9f3a94befb5cdde63556403c7db864fcf05b" + "revision": "9be6adca0e5183b5082c6b56c51953fd1575417c" }, "tr": { "pin": false, @@ -1605,7 +1605,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "8d51ff7395e2c7673a5307af38d2e744f748552d" + "revision": "51354c936bf6d0bff1684ef2f3fff47f300fddbc" }, "trs": { "pin": false, @@ -1623,7 +1623,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "9d504528894fa1bc57ede3f46d14e7970e924fe7" + "revision": "d7510f2d01dc3740ed1abf2787bf73827deff078" }, "uk": { "pin": false, @@ -1641,7 +1641,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "c78494f6c55a6d39196e8ee9140bf08108a3e385" + "revision": "4d1fa878042bb6f1cf6a6e57e38c4a41a799fd6b" }, "ur": { "pin": false, @@ -1659,7 +1659,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "506249e5943a9d24d54d061c0074829cd280bbc8" + "revision": "ad3035f281830930ba913343e03ef31623dd537a" }, "uz": { "pin": false, @@ -1677,7 +1677,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "d3033e3dea25164352fe28164df4c500a14e2bf4" + "revision": "8ea7a5a051db8ae409a5e5d750988ea6c21e7c06" }, "vi": { "pin": false, @@ -1695,7 +1695,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "1852a46afae43ebf3d6318322a49ee1b53945150" + "revision": "67fe2acb306fcb00853c1ff142efb137b7eeb964" }, "xh": { "pin": false, @@ -1713,7 +1713,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "53916ed84e5b2365df876eff27b21b8e3239f06c" + "revision": "abc22dfb6d84aa2658b0af6bfb9df4a5c2eeb6d4" }, "zh-CN": { "pin": false, @@ -1731,7 +1731,7 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "225124a5e7e332b4db7879765de8a8905032c84d" + "revision": "d6d6f9bb61130b7ec0305e791326543816bc96d5" }, "zh-TW": { "pin": false, @@ -1749,6 +1749,6 @@ "win64-aarch64-devedition", "win64-devedition" ], - "revision": "c81255566999f2655581de0385075c7b9e378b73" + "revision": "0cbdc5f1a0486a7a55f9ed3254b6f3a2badbe501" } } \ No newline at end of file diff --git a/browser/themes/osx/downloads/downloads.css b/browser/themes/osx/downloads/downloads.css index 3eabe6ef539b7e25efc3a5faf90e5d14bef215ea..3aef9f180fe011b2ec4739b68c9a9d50e2731d4f 100644 --- a/browser/themes/osx/downloads/downloads.css +++ b/browser/themes/osx/downloads/downloads.css @@ -15,7 +15,7 @@ :root { --downloads-item-height: 6em; - --downloads-item-font-size-factor: 0.95; + --downloads-item-font-size-factor: 0.80; --downloads-item-details-opacity: 0.7; } diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css index b1b3a772ae4c550fad4bc38598878e2fa6bc243a..36595b896ae3549b3bdf537b0c0c905d1e1a2d22 100644 --- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -80,13 +80,13 @@ @media (-moz-proton) { @media (-moz-windows-accent-color-in-titlebar) { - :root[sizemode=normal][tabsintitlebar] { + :root[sizemode=normal][tabsintitlebar] #navigator-toolbox { border-top: .5px solid -moz-accent-color; } } } /*** END proton ***/ - :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive { + :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive #navigator-toolbox { border-top-color: rgb(57,57,57); } @@ -311,7 +311,8 @@ @media (-moz-os-version: windows-win8) { /* Artificially draw window borders that are covered by lwtheme, see bug 591930. - * Borders for win7 are below, win10 doesn't need them. */ + * Borders for win7 are below, win10 only needs something like this when + * drawing in the titlebar (-moz-windows-accent-color-in-titlebar). */ #main-window[sizemode="normal"] #navigator-toolbox:-moz-lwtheme { border-top: 1px solid @glassShadowColor@; } @@ -343,7 +344,8 @@ } /* Artificially draw window borders that are covered by lwtheme, see bug 591930. - * We use a different border for win8, and this is not necessary on win10+ */ + * We use a different border for win8, and this win10+ only needs this if + * drawing in the titlebar (-moz-windows-accent-color-in-titlebar). */ #main-window[sizemode="normal"] #navigator-toolbox:-moz-lwtheme { border-top: 1px solid @glassActiveBorderColor@; padding-top: 1px; diff --git a/comm/.gecko_rev.yml b/comm/.gecko_rev.yml index 2915f2235b44df495574641346a53a97573e0f50..f51e81976669baf7c20a4e47631149a6bbff2787 100644 --- a/comm/.gecko_rev.yml +++ b/comm/.gecko_rev.yml @@ -1,8 +1,8 @@ --- GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr91 -GECKO_HEAD_REF: default -GECKO_HEAD_REV: 133cb250fa145cba5cc7ed95f75bb3c1b02e6916 +GECKO_HEAD_REF: FIREFOX_91_4_0esr_BUILD1 +GECKO_HEAD_REV: 3359a85a2277bbcbcc2b5ebcc425922a23d07f34 ### For comm-central # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified diff --git a/comm/calendar/base/content/calendar-command-controller.js b/comm/calendar/base/content/calendar-command-controller.js index d41784b7031f2a479abb98bffa13836587dcb06e..9485ed3dbeee1918c94520de13d0b0554b438d36 100644 --- a/comm/calendar/base/content/calendar-command-controller.js +++ b/comm/calendar/base/content/calendar-command-controller.js @@ -953,37 +953,6 @@ async function printCalendar() { // Ensure the printing of this file will be detected by calPrintUtils.jsm. cal.print.ensureInitialized(); - let printBrowser = document.getElementById("calendarPrintContent"); - if (printBrowser.currentURI.spec == "about:blank") { - // The template page hasn't been loaded yet. Do that now. - await new Promise(resolve => { - // Store a strong reference to this progress listener. - printBrowser.progressListener = { - QueryInterface: ChromeUtils.generateQI([ - "nsIWebProgressListener", - "nsISupportsWeakReference", - ]), - - /** nsIWebProgressListener */ - onStateChange(webProgress, request, stateFlags, status) { - if ( - stateFlags & Ci.nsIWebProgressListener.STATE_STOP && - printBrowser.currentURI.spec != "about:blank" - ) { - printBrowser.webProgress.removeProgressListener(this); - delete printBrowser.progressListener; - resolve(); - } - }, - }; - - printBrowser.webProgress.addProgressListener( - printBrowser.progressListener, - Ci.nsIWebProgress.NOTIFY_STATE_ALL - ); - MailE10SUtils.loadURI(printBrowser, "chrome://calendar/content/printing-template.html"); - }); - } - - PrintUtils.startPrintWindow(printBrowser.browsingContext, {}); + await PrintUtils.loadPrintBrowser("chrome://calendar/content/printing-template.html"); + PrintUtils.startPrintWindow(PrintUtils.printBrowser.browsingContext, {}); } diff --git a/comm/calendar/base/content/calendar-event-column.js b/comm/calendar/base/content/calendar-event-column.js index b16e5fdd80802a9ce9cd7988031199dd21b7e98e..ea0d83458f6b6abf87313857caa930387ae7ce97 100644 --- a/comm/calendar/base/content/calendar-event-column.js +++ b/comm/calendar/base/content/calendar-event-column.js @@ -47,6 +47,8 @@