Skip to content

Enterprise main merge 2026060100#978

Merged
jporter-dev merged 640 commits into
mozilla:enterprise-mainfrom
jporter-dev:main-merge_2026060100
Jun 1, 2026
Merged

Enterprise main merge 2026060100#978
jporter-dev merged 640 commits into
mozilla:enterprise-mainfrom
jporter-dev:main-merge_2026060100

Conversation

@jporter-dev

Copy link
Copy Markdown
Contributor

Description

Bugzilla: NO BUG
Daily merge from upstream/main to enterprise-main

Resolved conflicts:

  • .cargo/config.toml.in
  • browser/components/enterprisepolicies/schemas/policies-schema.json

smolnar-sheriff and others added 30 commits May 29, 2026 20:32
…ere() in subject position. r=firefox-style-system-reviewers,jwatt,dshin

The page has selectors like:

```
:where(._space-y-6_caiht_2 > :not(:last-child))
```

Unfortunately our current code to collect ancestor combinators doesn't
deal with this case which means that we don't fast-reject these on
things like <head>.

This causes the <html> element to get the slow selector flags, which
causes patterns like the one in comment 4 to restyle the whole <body>
over and over which is super slow.

Differential Revision: https://phabricator.services.mozilla.com/D303326
The change to the compartment tests are because firstDayOfWeek
returns undefined for the test locale.

Differential Revision: https://phabricator.services.mozilla.com/D302878
…nursery invariant r=jandem

This table has the invariant that all the tenured views come first, with the
position of the first nursery view being recorded to allow efficient access to
only the nursery views. This did not account for semispace nursery where some
nursery views can remain in the nursery after minor collection.

The fix is to move any subsequent tenured views before the first nursery view
seen and update the recorded position of the first nursery view. The invariant
is checked after sweeping in debug builds.

Differential Revision: https://phabricator.services.mozilla.com/D303350
…ock() by removing type local variable. r=layout-reviewers,AlaskanEmily

This doesn't change behavior.

Differential Revision: https://phabricator.services.mozilla.com/D303223
Exports of source phase imports should be bound as local
lexicals, with the current code they were being treated as a
namespace re-export.

Differential Revision: https://phabricator.services.mozilla.com/D303183
…viewers,urlbar-reviewers,fluent-reviewers,echa,mak,flod,emilio

Adds a model selector dropdown to the smartbar that allows users to:
- Select from available models per tab
- Access Smart Window model settings

Differential Revision: https://phabricator.services.mozilla.com/D301509
…echa,cgopal

Adds support for switching models per tab:
- Extends openAIEngine.build() to accept a modelChoiceId override
- Adds ChatConversation.updateSystemPromptForModel() to update the system prompt when model changes

Differential Revision: https://phabricator.services.mozilla.com/D301510
…ttachFunction. r=iain

It's simpler to use a specialized stub for the primitive-LHS case. This avoids
changing the function's shape and fixes the assertion failure in the bug.

The micro-benchmark in bug 1994205 is still fast. It's a bit faster even
because we emit better code for the primitive-LHS case now.

Differential Revision: https://phabricator.services.mozilla.com/D303301
…ksenia" for causing build bustages

This reverts commit 408c1b4.
…s.admin.ch; r=ksenia,webcompat-reviewers" for causing build bustages

This reverts commit 9362d5a.
…br; r=ksenia,webcompat-reviewers" for causing build bustages

This reverts commit afe3acf.
jcsteh and others added 21 commits June 1, 2026 00:22
…ore trying to call it. r=morgan

UiaRaiseNotificationEvent is only available on Windows 10 version 1709 and later.
Previously, we tried to call it without checking whether it was available, causing crashes on (very) outdated versions of Windows 10.
We now explicitly check whether this function is available before trying to call it, gracefully doing nothing if we can't.

Differential Revision: https://phabricator.services.mozilla.com/D303249
… r=eeejay

Previously, we used the IsPrinting flag on the BrowsingContext in some cases to check whether a document was a print document.
While IsPrinting will always be true on a print document, it might also be true for the original document (as opposed to the static clone) while it is being printed.
This caused us to use the PDF cache domains in some cases when we shouldn't and might have caused other problems down the line.
To fix this, check whether the document is a static clone instead.
Accessibility should only ever see a static clone if it's a print document, but we assert IsPrinting to be sure.

Differential Revision: https://phabricator.services.mozilla.com/D303299
… to update the cache domains for print documents. r=eeejay

Print documents use a specific set of cache domains, so they shouldn't be impacted by any changes to the global set.
I haven't seen any bugs show up because of this, but it's definitely a correctness issue that should be fixed.

Differential Revision: https://phabricator.services.mozilla.com/D303300
…ick-off has started. r=nina-py" for causing node failures

This reverts commit 0cf0106.
…culated correctly for both fragments and feImageElements r=firefox-svg-reviewers,jwatt

See https://www.w3.org/TR/media-frags/#valid-uri-spatial

Differential Revision: https://phabricator.services.mozilla.com/D303672
…irefox-build-system-reviewers,sergesanspaille" for causing xpcshells failures

This reverts commit 91ef1e7.

Revert "Bug 2043877 - Update hashbrown to 0.16.1. r=emilio"

This reverts commit de0c982.
…r handling of WeChat Input Method r=m_kato

When we return `TS_E_NOLAYOUT` from `ITextStoreACP::GetTextExt()`,
WeChat Input Method does not handle the error correctly and shows its
UI to the top-left corner of the screen. Therefore, we need not to
return `TS_E_NOLAYOUT` if it's the active TIP.

However, I found 2 extant bugs and they block fixing this bug.

First one is, `TSFTextStore::MaybeHackNoErrorLayoutBugs()` does nothing
if `IsHandlingCompositionInContent()` return `false`. [1] This means
that we don't hack `GetTextExt()` behavior when the composition starts
and not yet dispatched the first event. So, this causes temporarily
appear the UI in odd place, like top-left corner of the screen even with
some other IMEs.

The other one is, `TSFTextStore::GetTextExt()` may query a line break
rect when the user starts composition at end of a line. [2] So, only
when starting composition, the UI may (maybe temporarily) appear at
start of next line. Therefore, if the line scanning range in the
original content has a linefeed, we should query a rect before the
first linefeed, i.e., only the text rect in the start line even if it's
0-length. The difference between the caret rect and the new character
rect should be smaller than the difference from the start of the next
line.

1. https://searchfox.org/firefox-main/rev/e28b34ab33dbf49364999070168cbb7e11e8e5bd/widget/windows/TSFTextStore.cpp#2156,2172,2175
2. https://searchfox.org/firefox-main/rev/e28b34ab33dbf49364999070168cbb7e11e8e5bd/widget/windows/TSFTextStore.cpp#2070

Differential Revision: https://phabricator.services.mozilla.com/D303266
…system-reviewers

display values can now be reified into Typed OM values.

Differential Revision: https://phabricator.services.mozilla.com/D301762
…t string r=flod,fluent-reviewers DONTBUILD

flod left a comment on D301981 noting the new menu-view-open-tabs string
is missing the same "Open tabs" disambiguation comment the other Open
Tabs strings carry, so translators know "Open Tabs" is a noun phrase
(the tabs currently open) and not an instruction.

Same pattern as sidebar-menu-open-tabs-label and sidebar-opentabs-title.
Just a comment addition.

Differential Revision: https://phabricator.services.mozilla.com/D303685
… r=sheehan,sparky,perftest-reviewers DONTBUILD

This allows `mach try` calls to use a unique entry point to handle
defaults and env-based overrides for all uses (currently try pushes to
lando, and `perf`).

This also fixes a latent bug where the LANDO_TRY_CONFIG override would
return an incorrect value when used with `mach try perf`.

Differential Revision: https://phabricator.services.mozilla.com/D302947
…llback-string globals. r=iain

LLMs keep finding clever ways to mutate the interrupted code. It seems better to
create the global with a small set of allowlisted testing functions to prevent this.
The functions to trigger GC seem most useful because that's what interrupt callbacks
can do in the browser.

Differential Revision: https://phabricator.services.mozilla.com/D303359
…igation.html, to reflect reality.

This test had an expected-error annotation, added by automation, but in fact
it's sometimes got an "OK" status, so let's update the annotation to reflect
that.

Differential Revision: https://phabricator.services.mozilla.com/D303701
@jporter-dev jporter-dev added the branch:main PR that should be merged on enterprise-main branch label Jun 1, 2026
"examples": [true, false]
},

"DisableRemoteSettingsAndAcceptSecurityConsequences": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if we've been flagging additions to the schema that don't have the extra properties we've added in the enterprise branch. @bsmth I have recommended that the additional properties be upstreamed so that we don't have to be the ones to deal with them.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's time to enforce this via linter upstream, i.e., #910

@jporter-dev jporter-dev force-pushed the main-merge_2026060100 branch from 38c3dfe to 4d5d6d6 Compare June 1, 2026 18:15
@jporter-dev jporter-dev merged commit 3a26a2b into mozilla:enterprise-main Jun 1, 2026
95 of 96 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch:main PR that should be merged on enterprise-main branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.