Commit 61924095 authored by Gayane Petrosyan's avatar Gayane Petrosyan Committed by Commit Bot

[Themes] Revert back to using array instead of HSL struct.

This is a partial revert of
https://chromium-review.googlesource.com/c/chromium/src/+/1702769

TBR=estade@chromium.org

Bug: 988055
Change-Id: Id6e67a5a69fa97c23083f44b9054526792cb58ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750790Reviewed-by: default avatarGayane Petrosyan <gayane@chromium.org>
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686339}
parent f53fa7ca
...@@ -62,7 +62,7 @@ constexpr int kTallestFrameHeight = kTallestTabHeight + 19; ...@@ -62,7 +62,7 @@ constexpr int kTallestFrameHeight = kTallestTabHeight + 19;
// change default theme assets, if you need themes to recreate their generated // change default theme assets, if you need themes to recreate their generated
// images (which are cached), or if you changed how missing values are // images (which are cached), or if you changed how missing values are
// generated. // generated.
const int kThemePackVersion = 67; const int kThemePackVersion = 68;
// IDs that are in the DataPack won't clash with the positive integer // IDs that are in the DataPack won't clash with the positive integer
// uint16_t. kHeaderID should always have the maximum value because we want the // uint16_t. kHeaderID should always have the maximum value because we want the
...@@ -606,7 +606,9 @@ void BrowserThemePack::SetTint(int id, color_utils::HSL tint) { ...@@ -606,7 +606,9 @@ void BrowserThemePack::SetTint(int id, color_utils::HSL tint) {
int first_available_index = -1; int first_available_index = -1;
for (size_t i = 0; i < kTintTableLength; ++i) { for (size_t i = 0; i < kTintTableLength; ++i) {
if (tints_[i].id == id) { if (tints_[i].id == id) {
tints_[i].hsl = tint; tints_[i].h = tint.h;
tints_[i].s = tint.s;
tints_[i].l = tint.l;
return; return;
} }
if (tints_[i].id == -1 && first_available_index == -1) if (tints_[i].id == -1 && first_available_index == -1)
...@@ -615,7 +617,9 @@ void BrowserThemePack::SetTint(int id, color_utils::HSL tint) { ...@@ -615,7 +617,9 @@ void BrowserThemePack::SetTint(int id, color_utils::HSL tint) {
DCHECK_NE(-1, first_available_index); DCHECK_NE(-1, first_available_index);
tints_[first_available_index].id = id; tints_[first_available_index].id = id;
tints_[first_available_index].hsl = tint; tints_[first_available_index].h = tint.h;
tints_[first_available_index].s = tint.s;
tints_[first_available_index].l = tint.l;
} }
void BrowserThemePack::SetDisplayProperty(int id, int value) { void BrowserThemePack::SetDisplayProperty(int id, int value) {
...@@ -849,7 +853,9 @@ bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const { ...@@ -849,7 +853,9 @@ bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const {
if (tints_) { if (tints_) {
for (size_t i = 0; i < kTintTableLength; ++i) { for (size_t i = 0; i < kTintTableLength; ++i) {
if (tints_[i].id == id) { if (tints_[i].id == id) {
*hsl = tints_[i].hsl; hsl->h = tints_[i].h;
hsl->s = tints_[i].s;
hsl->l = tints_[i].l;
return true; return true;
} }
} }
...@@ -1072,7 +1078,9 @@ void BrowserThemePack::InitTints() { ...@@ -1072,7 +1078,9 @@ void BrowserThemePack::InitTints() {
tints_ = new TintEntry[kTintTableLength]; tints_ = new TintEntry[kTintTableLength];
for (size_t i = 0; i < kTintTableLength; ++i) { for (size_t i = 0; i < kTintTableLength; ++i) {
tints_[i].id = -1; tints_[i].id = -1;
tints_[i].hsl = {-1, -1, -1}; tints_[i].h = -1;
tints_[i].s = -1;
tints_[i].l = -1;
} }
} }
...@@ -1138,7 +1146,9 @@ void BrowserThemePack::SetTintsFromJSON( ...@@ -1138,7 +1146,9 @@ void BrowserThemePack::SetTintsFromJSON(
it != temp_tints.end() && count < kTintTableLength; it != temp_tints.end() && count < kTintTableLength;
++it, ++count) { ++it, ++count) {
tints_[count].id = it->first; tints_[count].id = it->first;
tints_[count].hsl = it->second; tints_[count].h = it->second.h;
tints_[count].s = it->second.s;
tints_[count].l = it->second.l;
} }
} }
......
...@@ -298,7 +298,9 @@ class BrowserThemePack : public CustomThemeSupplier { ...@@ -298,7 +298,9 @@ class BrowserThemePack : public CustomThemeSupplier {
// will point directly to mmapped data. // will point directly to mmapped data.
struct TintEntry { struct TintEntry {
int32_t id; int32_t id;
color_utils::HSL hsl; double h;
double s;
double l;
}* tints_ = nullptr; }* tints_ = nullptr;
struct ColorPair { struct ColorPair {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment