Skip to content

Commit 4b3911c

Browse files
authored
Merge pull request #320 from mozilla/enterprise-main_merge_20260108
Enterprise main merge 20260108
2 parents ac71874 + b81cc2c commit 4b3911c

File tree

1,101 files changed

+26464
-11740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,101 files changed

+26464
-11740
lines changed

.cargo/config.toml.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ git = "https://github.com/franziskuskiefer/cose-rust"
3535
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
3636
replace-with = "vendored-sources"
3737

38-
[source."git+https://github.com/gfx-rs/wgpu?rev=3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc"]
38+
[source."git+https://github.com/gfx-rs/rspirv?rev=89ce4d0e64c91b0635f617409dc57cb031749a39"]
39+
git = "https://github.com/gfx-rs/rspirv"
40+
rev = "89ce4d0e64c91b0635f617409dc57cb031749a39"
41+
replace-with = "vendored-sources"
42+
43+
[source."git+https://github.com/gfx-rs/wgpu?rev=a2c8c0de7cdb57a74070ce70b9912e853893d502"]
3944
git = "https://github.com/gfx-rs/wgpu"
40-
rev = "3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc"
45+
rev = "a2c8c0de7cdb57a74070ce70b9912e853893d502"
4146
replace-with = "vendored-sources"
4247

4348
[source."git+https://github.com/glandium/allocator-api2?rev=ad5f3d56a5a4519eff52af4ff85293431466ef5c"]

.claude/skills/android/SKILL.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: android
3+
description: Workflow guide when working with Android builds or the mobile/ directory.
4+
---
5+
6+
## Workflow
7+
- Instead of `gradlew`, use `./mach gradle` as the wrapper. Use `-p` argument of gradle if you need to run in a subdirectory

Cargo.lock

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

accessible/generic/FormControlAccessible.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ uint64_t CheckboxAccessible::NativeState() const {
4747
return state | states::CHECKED;
4848
}
4949

50-
} else if (mContent->AsElement()->AttrValueIs(
51-
kNameSpaceID_None, nsGkAtoms::checked, nsGkAtoms::_true,
52-
eCaseMatters)) { // XUL checkbox
50+
} else if (mContent->AsElement()->GetBoolAttr(nsGkAtoms::checked)) {
5351
return state | states::CHECKED;
5452
}
5553

accessible/generic/LocalAccessible.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,8 @@ uint64_t LocalAccessible::NativeLinkState() const { return 0; }
426426
bool LocalAccessible::NativelyUnavailable() const {
427427
if (mContent->IsHTMLElement()) return mContent->AsElement()->IsDisabled();
428428

429-
return mContent->IsElement() && mContent->AsElement()->AttrValueIs(
430-
kNameSpaceID_None, nsGkAtoms::disabled,
431-
nsGkAtoms::_true, eCaseMatters);
429+
return mContent->IsElement() &&
430+
mContent->AsElement()->GetBoolAttr(nsGkAtoms::disabled);
432431
}
433432

434433
Accessible* LocalAccessible::ChildAtPoint(int32_t aX, int32_t aY,

accessible/xul/XULMenuAccessible.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ uint64_t XULMenuitemAccessible::NativeState() const {
6363
state |= states::CHECKABLE;
6464

6565
// Checked?
66-
if (mContent->AsElement()->AttrValueIs(kNameSpaceID_None,
67-
nsGkAtoms::checked, nsGkAtoms::_true,
68-
eCaseMatters)) {
66+
if (mContent->AsElement()->GetBoolAttr(nsGkAtoms::checked)) {
6967
state |= states::CHECKED;
7068
}
7169
}

browser/actors/AboutReaderParent.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class AboutReaderParent extends JSWindowActorParent {
173173
menuitem.hidden = false;
174174
doc.l10n.setAttributes(menuitem, "menu-view-close-readerview");
175175

176-
key.setAttribute("disabled", false);
176+
key.removeAttribute("disabled");
177177

178178
Services.obs.notifyObservers(null, "reader-mode-available");
179179
} else {
@@ -184,7 +184,7 @@ export class AboutReaderParent extends JSWindowActorParent {
184184
menuitem.hidden = !browser.isArticle;
185185
doc.l10n.setAttributes(menuitem, "menu-view-enter-readerview");
186186

187-
key.setAttribute("disabled", !browser.isArticle);
187+
key.toggleAttribute("disabled", !browser.isArticle);
188188

189189
if (browser.isArticle) {
190190
Services.obs.notifyObservers(null, "reader-mode-available");

browser/app/profile/firefox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,8 +2253,8 @@ pref("browser.aiwindow.apiKey", '');
22532253
pref("browser.aiwindow.chatStore.loglevel", "Error");
22542254
pref("browser.aiwindow.enabled", false);
22552255
pref("browser.aiwindow.endpoint", "https://mlpa-prod-prod-mozilla.global.ssl.fastly.net/v1");
2256-
pref("browser.aiwindow.insights", false);
2257-
pref("browser.aiwindow.insightsLogLevel", "Warn");
2256+
pref("browser.aiwindow.memories", false);
2257+
pref("browser.aiwindow.memoriesLogLevel", "Warn");
22582258
pref("browser.aiwindow.firstrun.autoAdvanceMS", 3000);
22592259
pref("browser.aiwindow.firstrun.modelChoice", "");
22602260
pref("browser.aiwindow.model", "qwen3-235b-a22b-instruct-2507-maas");

browser/base/content/browser-addons.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,8 @@ customElements.define(
441441
#setAllowButtonEnabled(allowed) {
442442
let disabled = !allowed;
443443
// "mainactiondisabled" mirrors the "disabled" boolean attribute of the
444-
// "Allow" button. toggleAttribute("mainactiondisabled", disabled) cannot
445-
// be used due to bug 1938481.
446-
if (disabled) {
447-
this.setAttribute("mainactiondisabled", "true");
448-
} else {
449-
this.removeAttribute("mainactiondisabled");
450-
}
444+
// "Allow" button.
445+
this.toggleAttribute("mainactiondisabled", disabled);
451446

452447
// The "mainactiondisabled" attribute may also be toggled by the
453448
// PopupNotifications._setNotificationUIState() method, which can be
@@ -2831,7 +2826,7 @@ var gUnifiedExtensions = {
28312826
if (forBrowserAction) {
28322827
let area = CustomizableUI.getPlacementOfWidget(widgetId).area;
28332828
let inToolbar = area != CustomizableUI.AREA_ADDONS;
2834-
pinButton.setAttribute("checked", inToolbar);
2829+
pinButton.toggleAttribute("checked", inToolbar);
28352830

28362831
const placement = CustomizableUI.getPlacementOfWidget(widgetId);
28372832
const notInPanel = placement?.area !== CustomizableUI.AREA_ADDONS;
@@ -2918,14 +2913,14 @@ var gUnifiedExtensions = {
29182913
},
29192914

29202915
async onPinToToolbarChange(menu, event) {
2921-
let shouldPinToToolbar = event.target.getAttribute("checked") == "true";
2916+
let shouldPinToToolbar = event.target.hasAttribute("checked");
29222917
// Revert the checkbox back to its original state. This is because the
29232918
// addon context menu handlers are asynchronous, and there seems to be
29242919
// a race where the checkbox state won't get set in time to show the
29252920
// right state. So we err on the side of caution, and presume that future
29262921
// attempts to open this context menu on an extension button will show
29272922
// the same checked state that we started in.
2928-
event.target.setAttribute("checked", !shouldPinToToolbar);
2923+
event.target.toggleAttribute("checked", !shouldPinToToolbar);
29292924

29302925
let widgetId = this._getWidgetId(menu);
29312926
if (!widgetId) {

browser/base/content/browser-customization.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var CustomizationHandler = {
4848
// Re-enable parts of the UI we disabled during the dialog
4949
let menubar = document.getElementById("main-menubar");
5050
for (let childNode of menubar.children) {
51-
childNode.setAttribute("disabled", false);
51+
childNode.removeAttribute("disabled");
5252
}
5353

5454
gBrowser.selectedBrowser.focus();

0 commit comments

Comments
 (0)