Skip to content

Commit a4b8ed0

Browse files
authored
Merge pull request #324 from mozilla/enterprise-main_merge_20260109
Enterprise main merge 20260109
2 parents e303bad + 44ef1a1 commit a4b8ed0

File tree

990 files changed

+23986
-11203
lines changed

Some content is hidden

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

990 files changed

+23986
-11203
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ toolkit/crashreporter/minidump-analyzer/target/
395395

396396
# Ignore personal preferences files
397397
CLAUDE.local.md
398+
.claude/settings.local.json
398399

399400
# Ignore .json.gz (typically profiles) in the root directory
400401
# lint-ignore-next-line: git-only

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,3 +392,4 @@ toolkit/themes/shared/design-system/node_modules/
392392

393393
# Ignore personal preferences files
394394
^CLAUDE\.local\.md
395+
.claude/settings.local.json

.stylelintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,11 @@ module.exports = {
432432
// into the HTML backup archive files that exist on a user's file system
433433
// and can be opened in any browser.
434434
"browser/components/backup/content/archive.css",
435+
// Bug 2003877 - this is a centralization of a bunch of rules that had
436+
// been spread across about:newtab and about:privatebrowsing. We'll
437+
// fix these design tokens issues in a follow-up (presuming the
438+
// replacement of the handoff bar doesn't land and remove this first).
439+
"browser/components/search/content/contentSearchHandoffUI.css",
435440
],
436441
rules: {
437442
"stylelint-plugin-mozilla/use-design-tokens": null,

AGENTS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ The Firefox repository is very big and so it isn't advised to blindly run grep o
99
```
1010
searchfox-cli --define 'AudioContext::AudioContext' # get function impl
1111
searchfox-cli --define 'AudioSink' # get class definition
12-
searchfox-cli -q blob --path ipdl # search for a string, restrict on path
1312
searchfox-cli --id AudioSink -l 150 --cpp # search for identifier audio sink in C++ code, 150 results max
1413
```
1514
- Use the `searchfox-cli` tool except if you suspect that you need to find information about something that has changed locally, in which case use `rg` or the usual tools, since `searchfox.org` only indexes public (merged) code

accessible/atk/DOMtoATK.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
66

77
#include <glib.h>
8-
#include <cstdint>
98
#include "mozilla/a11y/HyperTextAccessibleBase.h"
109
#include "nsCharTraits.h"
1110
#include "nsString.h"

accessible/generic/HyperTextAccessible.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void HyperTextAccessible::SetMathMLXMLRoles(AccAttributes* aAttributes) {
309309
if (mathMLFrame) {
310310
nsEmbellishData embellishData;
311311
mathMLFrame->GetEmbellishData(embellishData);
312-
if (NS_MATHML_EMBELLISH_IS_FENCE(embellishData.flags)) {
312+
if (embellishData.flags.contains(MathMLEmbellishFlag::Fence)) {
313313
if (!LocalPrevSibling()) {
314314
aAttributes->SetAttribute(nsGkAtoms::xmlroles,
315315
nsGkAtoms::open_fence);
@@ -318,7 +318,7 @@ void HyperTextAccessible::SetMathMLXMLRoles(AccAttributes* aAttributes) {
318318
nsGkAtoms::close_fence);
319319
}
320320
}
321-
if (NS_MATHML_EMBELLISH_IS_SEPARATOR(embellishData.flags)) {
321+
if (embellishData.flags.contains(MathMLEmbellishFlag::Separator)) {
322322
aAttributes->SetAttribute(nsGkAtoms::xmlroles,
323323
nsGkAtoms::separator);
324324
}

accessible/mac/AccessibleWrap.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@
140140
doc->ProcessNewLiveRegions();
141141
}
142142

143-
if ((eventType == nsIAccessibleEvent::EVENT_TEXT_INSERTED ||
144-
eventType == nsIAccessibleEvent::EVENT_TEXT_REMOVED ||
145-
eventType == nsIAccessibleEvent::EVENT_NAME_CHANGE) &&
146-
!aEvent->FromUserInput()) {
143+
if (((eventType == nsIAccessibleEvent::EVENT_TEXT_INSERTED ||
144+
eventType == nsIAccessibleEvent::EVENT_TEXT_REMOVED) &&
145+
!aEvent->FromUserInput()) ||
146+
eventType == nsIAccessibleEvent::EVENT_NAME_CHANGE) {
147147
for (LocalAccessible* container = aEvent->GetAccessible(); container;
148148
container = container->LocalParent()) {
149149
if (container->HasOwnContent() && IsLiveRegion(container->GetContent())) {

accessible/tests/browser/mac/browser_live_regions.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,27 @@ addAccessibleTask(
177177
ok(true, "delete text leaf contents");
178178
}
179179
);
180+
181+
/**
182+
* Test live region announcements caused by clicking a button that modifies a region.
183+
*/
184+
addAccessibleTask(
185+
`
186+
<div id="status-container" aria-live="polite" aria-label="">
187+
</div>
188+
189+
<button id="clickme" onClick="(function(){document.getElementById('status-container').setAttribute('aria-label', 'hello world');})()">
190+
Add something!
191+
</button>
192+
`,
193+
async (browser, accDoc) => {
194+
let liveRegionChanged = waitForMacEvent(
195+
"AXLiveRegionChanged",
196+
"status-container"
197+
);
198+
const button = getNativeInterface(accDoc, "clickme");
199+
button.performAction("AXPress");
200+
await liveRegionChanged;
201+
ok(true, "aria-label was changed, and event was fired");
202+
}
203+
);

accessible/tests/mochitest/tree/test_tabbrowser.xhtml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,16 @@
156156
];
157157
}
158158

159+
if (!SpecialPowers.getBoolPref("sidebar.revamp")) {
160+
tabsAccTree.children.push({
161+
role: ROLE_TEXT_CONTAINER,
162+
children: []
163+
});
164+
}
165+
159166
// NB: The (3) buttons are not visible, unless manually hovered,
160167
// probably due to size reduction in this test.
161168
tabsAccTree.children.push(
162-
{
163-
role: ROLE_TEXT_CONTAINER,
164-
children: []
165-
},
166169
{
167170
// xul:tab ("about:license")
168171
role: ROLE_PAGETAB,

browser/actors/AboutNewTabChild.sys.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export class AboutNewTabChild extends RemotePageChild {
4444

4545
// This list must match any similar ones in render-activity-stream-html.js.
4646
const scripts = [
47-
"chrome://browser/content/contentSearchHandoffUI.js",
4847
"chrome://browser/content/contentTheme.js",
4948
`chrome://global/content/vendor/react${debugString}.js`,
5049
`chrome://global/content/vendor/react-dom${debugString}.js`,

0 commit comments

Comments
 (0)