Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1846500 - Inherit color scheme override from opener. r=pbz

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D185166
This commit is contained in:
Emilio Cobos Álvarez 2023-08-08 11:32:03 +00:00
parent 37b4c74f93
commit 47427950b9
5 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/base/content/pageinfo/pageInfo.js
View File

@ -13,20 +13,6 @@ ChromeUtils.defineESModuleGetters(this, {
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
});
// Inherit color scheme overrides from parent window. This is to inherit the
// color scheme of dark themed PBM windows.
{
let openerColorSchemeOverride =
window.opener?.browsingContext?.top.prefersColorSchemeOverride;
if (
openerColorSchemeOverride &&
window.browsingContext == window.browsingContext.top
) {
window.browsingContext.prefersColorSchemeOverride =
openerColorSchemeOverride;
}
}
// define a js object to implement nsITreeView
function pageInfoTreeView(treeid, copycol) {
// copycol is the index number for the column that we want to add to

23
docshell/base/BrowsingContext.cpp
View File

@ -365,6 +365,12 @@ already_AddRefed<BrowsingContext> BrowsingContext::CreateDetached(
MOZ_DIAGNOSTIC_ASSERT(aOpener->mType == aType);
fields.Get<IDX_OpenerId>() = aOpener->Id();
fields.Get<IDX_HadOriginalOpener>() = true;
if (aType == Type::Chrome && !aParent) {
// See SetOpener for why we do this inheritance.
fields.Get<IDX_PrefersColorSchemeOverride>() =
aOpener->Top()->GetPrefersColorSchemeOverride();
}
}
if (aParent) {
@ -1076,6 +1082,23 @@ bool BrowsingContext::IsTargetable() const {
return !GetClosed() && AncestorsAreCurrent();
}
void BrowsingContext::SetOpener(BrowsingContext* aOpener) {
MOZ_DIAGNOSTIC_ASSERT(!aOpener || aOpener->Group() == Group());
MOZ_DIAGNOSTIC_ASSERT(!aOpener || aOpener->mType == mType);
MOZ_ALWAYS_SUCCEEDS(SetOpenerId(aOpener ? aOpener->Id() : 0));
if (IsChrome() && IsTop() && aOpener) {
// Inherit color scheme overrides from parent window. This is to inherit the
// color scheme of dark themed PBM windows in dialogs opened by such
// windows.
auto openerOverride = aOpener->Top()->PrefersColorSchemeOverride();
if (openerOverride != PrefersColorSchemeOverride()) {
MOZ_ALWAYS_SUCCEEDS(SetPrefersColorSchemeOverride(openerOverride));
}
}
}
bool BrowsingContext::HasOpener() const {
return sBrowsingContexts->Contains(GetOpenerId());
}

8
docshell/base/BrowsingContext.h
View File

@ -486,13 +486,7 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
}
return nullptr;
}
void SetOpener(BrowsingContext* aOpener) {
MOZ_DIAGNOSTIC_ASSERT(!aOpener || aOpener->Group() == Group());
MOZ_DIAGNOSTIC_ASSERT(!aOpener || aOpener->mType == mType);
MOZ_ALWAYS_SUCCEEDS(SetOpenerId(aOpener ? aOpener->Id() : 0));
}
void SetOpener(BrowsingContext* aOpener);
bool HasOpener() const;
bool HadOriginalOpener() const { return GetHadOriginalOpener(); }

14
toolkit/components/prompts/content/commonDialog.js
View File

@ -11,20 +11,6 @@ const { CommonDialog } = ChromeUtils.importESModule(
var propBag, args, Dialog;
// Inherit color scheme overrides from parent window. This is to inherit the
// color scheme of dark themed PBM windows.
{
let openerColorSchemeOverride =
window.opener?.browsingContext?.top.prefersColorSchemeOverride;
if (
openerColorSchemeOverride &&
window.browsingContext == window.browsingContext.top
) {
window.browsingContext.prefersColorSchemeOverride =
openerColorSchemeOverride;
}
}
function commonDialogOnLoad() {
propBag = window.arguments[0]
.QueryInterface(Ci.nsIWritablePropertyBag2)

12
toolkit/profile/content/createProfileWizard.js
View File

@ -24,18 +24,6 @@ var gProfileDisplay;
// Called once when the wizard is opened.
function initWizard() {
// Inherit color scheme overrides from parent window. This is to inherit the
// color scheme of dark themed PBM windows.
let openerColorSchemeOverride =
window.opener?.browsingContext?.top.prefersColorSchemeOverride;
if (
openerColorSchemeOverride &&
window.browsingContext == window.browsingContext.top
) {
window.browsingContext.prefersColorSchemeOverride =
openerColorSchemeOverride;
}
try {
gProfileService = C[ToolkitProfileService].getService(
I.nsIToolkitProfileService