nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1702765 - Plumb ColorScheme through nsXPLookAndFeel. r=mstange

Browse source 
After this patch, there are two remaining pieces to fix bug 1700294:

 * macOS nsLookAndFeel needs to return the right colors for light / dark
   appearance.

 * We need to return ColorScheme::Dark for the right documents in
   ColorSchemeForDocument.

Both of those should be straight-forward.

Differential Revision: https://phabricator.services.mozilla.com/D110680
This commit is contained in:
Emilio Cobos Álvarez 2021-04-02 22:17:55 +00:00
parent 7319f11f91
commit d3f4f81c53
17 changed files with 55 additions and 35 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
widget/LookAndFeelTypes.ipdlh
View file

@ -34,13 +34,15 @@ namespace widget {
struct LookAndFeelTables { struct LookAndFeelTables {
int32_t[] ints; int32_t[] ints;
float[] floats; float[] floats;
nscolor[] colors;
LookAndFeelFont[] fonts; LookAndFeelFont[] fonts;
nscolor[] lightColors;
nscolor[] darkColors;
uint8_t[] intMap; uint8_t[] intMap;
uint8_t[] floatMap; uint8_t[] floatMap;
uint8_t[] colorMap;
uint8_t[] fontMap; uint8_t[] fontMap;
uint8_t[] lightColorMap;
uint8_t[] darkColorMap;
uint16_t passwordChar; uint16_t passwordChar;
bool passwordEcho; bool passwordEcho;

17
widget/RemoteLookAndFeel.cpp
View file

@ -106,9 +106,14 @@ void AddToMap(nsTArray<Item>& aItems, nsTArray<UInt>& aMap, Id aId,
} // namespace } // namespace
nsresult RemoteLookAndFeel::NativeGetColor(ColorID aID, nscolor& aResult) { nsresult RemoteLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
nscolor& aResult) {
const nscolor* result; const nscolor* result;
MOZ_TRY_VAR(result, MapLookup(mTables.colors(), mTables.colorMap(), aID)); const bool dark = aScheme == ColorScheme::Dark;
MOZ_TRY_VAR(
result,
MapLookup(dark ? mTables.darkColors() : mTables.lightColors(),
dark ? mTables.darkColorMap() : mTables.lightColorMap(), aID));
aResult = *result; aResult = *result;
return NS_OK; return NS_OK;
} }
@ -149,6 +154,7 @@ static bool AddIDsToMap(nsXPLookAndFeel* aImpl, FullLookAndFeel* aLf,
using FontID = LookAndFeel::FontID; using FontID = LookAndFeel::FontID;
using FloatID = LookAndFeel::FloatID; using FloatID = LookAndFeel::FloatID;
using ColorID = LookAndFeel::ColorID; using ColorID = LookAndFeel::ColorID;
using ColorScheme = LookAndFeel::ColorScheme;
bool anyFromOtherTheme = false; bool anyFromOtherTheme = false;
for (auto id : MakeEnumeratedRange(IntID::End)) { for (auto id : MakeEnumeratedRange(IntID::End)) {
@ -168,8 +174,11 @@ static bool AddIDsToMap(nsXPLookAndFeel* aImpl, FullLookAndFeel* aLf,
continue; continue;
} }
nscolor theColor; nscolor theColor;
nsresult rv = aImpl->NativeGetColor(id, theColor); nsresult rv = aImpl->NativeGetColor(id, ColorScheme::Light, theColor);
AddToMap(aLf->tables().colors(), aLf->tables().colorMap(), id, AddToMap(aLf->tables().lightColors(), aLf->tables().lightColorMap(), id,
NS_SUCCEEDED(rv) ? Some(theColor) : Nothing{});
rv = aImpl->NativeGetColor(id, ColorScheme::Dark, theColor);
AddToMap(aLf->tables().darkColors(), aLf->tables().darkColorMap(), id,
NS_SUCCEEDED(rv) ? Some(theColor) : Nothing{}); NS_SUCCEEDED(rv) ? Some(theColor) : Nothing{});
} }

6
widget/RemoteLookAndFeel.h
View file

@ -25,9 +25,9 @@ class RemoteLookAndFeel final : public nsXPLookAndFeel {
void NativeInit() override {} void NativeInit() override {}
nsresult NativeGetInt(IntID aID, int32_t& aResult) override; nsresult NativeGetInt(IntID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID, float& aResult) override;
nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
bool NativeGetFont(FontID aID, nsString& aFontName, bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;

3
widget/android/nsLookAndFeel.cpp
View file

@ -81,7 +81,8 @@ void nsLookAndFeel::RefreshImpl() {
mSystemUsesDarkThemeCached = false; mSystemUsesDarkThemeCached = false;
} }
nsresult nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) { nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme,
nscolor& aColor) {
nsresult rv = NS_OK; nsresult rv = NS_OK;
EnsureInitSystemColors(); EnsureInitSystemColors();

6
widget/android/nsLookAndFeel.h
View file

@ -15,9 +15,9 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
void NativeInit() final; void NativeInit() final;
virtual void RefreshImpl() override; virtual void RefreshImpl() override;
nsresult NativeGetInt(IntID aID, int32_t& aResult) override; nsresult NativeGetInt(IntID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID, float& aResult) override;
nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
bool NativeGetFont(FontID aID, nsString& aName, bool NativeGetFont(FontID aID, nsString& aName,
gfxFontStyle& aStyle) override; gfxFontStyle& aStyle) override;
virtual bool GetEchoPasswordImpl() override; virtual bool GetEchoPasswordImpl() override;

6
widget/cocoa/nsLookAndFeel.h
View file

@ -14,9 +14,9 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
void NativeInit() final; void NativeInit() final;
virtual void RefreshImpl() override; virtual void RefreshImpl() override;
nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
nsresult NativeGetInt(IntID aID, int32_t& aResult) override; nsresult NativeGetInt(IntID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID, float& aResult) override;
bool NativeGetFont(FontID aID, nsString& aFontName, bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;

2
widget/cocoa/nsLookAndFeel.mm
View file

@ -115,7 +115,7 @@ nscolor nsLookAndFeel::ProcessSelectionBackground(nscolor aColor) {
return resultColor; return resultColor;
} }
nsresult nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) { nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme, nscolor& aColor) {
EnsureInit(); EnsureInit();
nsresult res = NS_OK; nsresult res = NS_OK;

3
widget/gtk/nsLookAndFeel.cpp
View file

@ -300,7 +300,8 @@ static bool IsSelectionColorBackground(LookAndFeel::ColorID aID) {
} }
} }
nsresult nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) { nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme,
nscolor& aColor) {
EnsureInit(); EnsureInit();
nsresult res = NS_OK; nsresult res = NS_OK;

2
widget/gtk/nsLookAndFeel.h
View file

@ -25,7 +25,7 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
void RefreshImpl() override; void RefreshImpl() override;
nsresult NativeGetInt(IntID aID, int32_t& aResult) override; nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID aID, float& aResult) override;
nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
bool NativeGetFont(FontID aID, nsString& aFontName, bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;

3
widget/headless/HeadlessLookAndFeel.h
View file

@ -37,7 +37,8 @@ class HeadlessLookAndFeel : public nsXPLookAndFeel {
void NativeInit() final{}; void NativeInit() final{};
virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) override; virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
virtual nsresult NativeGetFloat(FloatID aID, float& aResult) override; virtual nsresult NativeGetFloat(FloatID aID, float& aResult) override;
virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; virtual nsresult NativeGetColor(ColorID, ColorScheme,
nscolor& aResult) override;
virtual bool NativeGetFont(FontID aID, nsString& aFontName, virtual bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;

3
widget/headless/HeadlessLookAndFeelGTK.cpp
View file

@ -16,7 +16,8 @@ HeadlessLookAndFeel::HeadlessLookAndFeel() {}
HeadlessLookAndFeel::~HeadlessLookAndFeel() = default; HeadlessLookAndFeel::~HeadlessLookAndFeel() = default;
nsresult HeadlessLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) { nsresult HeadlessLookAndFeel::NativeGetColor(ColorID aID, ColorScheme,
nscolor& aColor) {
// For headless mode, we use GetStandinForNativeColor for everything we can, // For headless mode, we use GetStandinForNativeColor for everything we can,
// and hardcoded values for everything else. // and hardcoded values for everything else.

18
widget/nsXPLookAndFeel.cpp
View file

@ -93,7 +93,8 @@ class EnumeratedCache {
} }
}; };
static EnumeratedCache<ColorID, Maybe<nscolor>, ColorID::End> sColorCache; static EnumeratedCache<ColorID, Maybe<nscolor>, ColorID::End> sLightColorCache;
static EnumeratedCache<ColorID, Maybe<nscolor>, ColorID::End> sDarkColorCache;
static EnumeratedCache<FloatID, Maybe<float>, FloatID::End> sFloatCache; static EnumeratedCache<FloatID, Maybe<float>, FloatID::End> sFloatCache;
static EnumeratedCache<IntID, Maybe<int32_t>, IntID::End> sIntCache; static EnumeratedCache<IntID, Maybe<int32_t>, IntID::End> sIntCache;
static EnumeratedCache<FontID, widget::LookAndFeelFont, FontID::End> sFontCache; static EnumeratedCache<FontID, widget::LookAndFeelFont, FontID::End> sFontCache;
@ -680,7 +681,9 @@ nsresult nsXPLookAndFeel::GetColorValue(ColorID aID, ColorScheme aScheme,
return NS_OK; return NS_OK;
} }
if (const auto* cached = sColorCache.Get(aID)) { auto& cache =
aScheme == ColorScheme::Light ? sLightColorCache : sDarkColorCache;
if (const auto* cached = cache.Get(aID)) {
if (cached->isNothing()) { if (cached->isNothing()) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@ -689,11 +692,11 @@ nsresult nsXPLookAndFeel::GetColorValue(ColorID aID, ColorScheme aScheme,
} }
if (NS_SUCCEEDED(GetColorFromPref(aID, aResult))) { if (NS_SUCCEEDED(GetColorFromPref(aID, aResult))) {
sColorCache.Insert(aID, Some(aResult)); cache.Insert(aID, Some(aResult));
return NS_OK; return NS_OK;
} }
if (NS_SUCCEEDED(NativeGetColor(aID, aResult))) { if (NS_SUCCEEDED(NativeGetColor(aID, aScheme, aResult))) {
if (gfxPlatform::GetCMSMode() == CMSMode::All && if (gfxPlatform::GetCMSMode() == CMSMode::All &&
!IsSpecialColor(aID, aResult)) { !IsSpecialColor(aID, aResult)) {
qcms_transform* transform = gfxPlatform::GetCMSInverseRGBTransform(); qcms_transform* transform = gfxPlatform::GetCMSInverseRGBTransform();
@ -710,11 +713,11 @@ nsresult nsXPLookAndFeel::GetColorValue(ColorID aID, ColorScheme aScheme,
// NOTE: Servo holds a lock and the main thread is paused, so writing to the // NOTE: Servo holds a lock and the main thread is paused, so writing to the
// global cache here is fine. // global cache here is fine.
sColorCache.Insert(aID, Some(aResult)); cache.Insert(aID, Some(aResult));
return NS_OK; return NS_OK;
} }
sColorCache.Insert(aID, Nothing()); cache.Insert(aID, Nothing());
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@ -832,7 +835,8 @@ bool nsXPLookAndFeel::GetFontValue(FontID aID, nsString& aName,
void nsXPLookAndFeel::RefreshImpl() { void nsXPLookAndFeel::RefreshImpl() {
// Wipe out our caches. // Wipe out our caches.
sColorCache.Clear(); sLightColorCache.Clear();
sDarkColorCache.Clear();
sFontCache.Clear(); sFontCache.Clear();
sFloatCache.Clear(); sFloatCache.Clear();
sIntCache.Clear(); sIntCache.Clear();

2
widget/nsXPLookAndFeel.h
View file

@ -40,7 +40,7 @@ class nsXPLookAndFeel : public mozilla::LookAndFeel {
virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) = 0; virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) = 0;
virtual nsresult NativeGetFloat(FloatID aID, float& aResult) = 0; virtual nsresult NativeGetFloat(FloatID aID, float& aResult) = 0;
virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) = 0; virtual nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) = 0;
virtual bool NativeGetFont(FontID aID, nsString& aName, virtual bool NativeGetFont(FontID aID, nsString& aName,
gfxFontStyle& aStyle) = 0; gfxFontStyle& aStyle) = 0;

2
widget/uikit/nsLookAndFeel.h
View file

@ -17,7 +17,7 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
virtual void RefreshImpl(); virtual void RefreshImpl();
nsresult NativeGetImpl(IntID aID, int32_t& aResult) override; nsresult NativeGetImpl(IntID aID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID aID, float& aResult) override;
nsresult NativeGetColor(const ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
bool NativeGetFont(FontID aID, nsString& aFontName, bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;
virtual char16_t GetPasswordCharacterImpl() { virtual char16_t GetPasswordCharacterImpl() {

2
widget/uikit/nsLookAndFeel.mm
View file

@ -40,7 +40,7 @@ void nsLookAndFeel::RefreshImpl() {
mInitialized = false; mInitialized = false;
} }
nsresult nsLookAndFeel::NativeGetColor(const ColorID aID, nscolor& aResult) { nsresult nsLookAndFeel::NativeGetColor(ColorID, ColorScheme, nscolor& aResult) {
EnsureInit(); EnsureInit();
nsresult res = NS_OK; nsresult res = NS_OK;

3
widget/windows/nsLookAndFeel.cpp
View file

@ -124,7 +124,8 @@ void nsLookAndFeel::RefreshImpl() {
mInitialized = false; mInitialized = false;
} }
nsresult nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) { nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme,
nscolor& aColor) {
EnsureInit(); EnsureInit();
nsresult res = NS_OK; nsresult res = NS_OK;

6
widget/windows/nsLookAndFeel.h
View file

@ -52,9 +52,9 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
void NativeInit() final; void NativeInit() final;
void RefreshImpl() override; void RefreshImpl() override;
nsresult NativeGetInt(IntID aID, int32_t& aResult) override; nsresult NativeGetInt(IntID, int32_t& aResult) override;
nsresult NativeGetFloat(FloatID aID, float& aResult) override; nsresult NativeGetFloat(FloatID, float& aResult) override;
nsresult NativeGetColor(ColorID aID, nscolor& aResult) override; nsresult NativeGetColor(ColorID, ColorScheme, nscolor& aResult) override;
bool NativeGetFont(FontID aID, nsString& aFontName, bool NativeGetFont(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle) override; gfxFontStyle& aFontStyle) override;
char16_t GetPasswordCharacterImpl() override; char16_t GetPasswordCharacterImpl() override;