material color utils

3 files changed, 46 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f40ceb3..f7421d2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,6 +16,7 @@ AUX chromium-114-compiler.patch 8433 BLAKE2B 373ef48debcb4c07fdcece70cc95c4f01c6
 AUX chromium-115-compiler.patch 8434 BLAKE2B 5517205c6d5ca78bee4f53cd0de87f1e2fb785225fe3408a5e2d337678823231b17c4e31e693363c39aca974138aeb3edeae4256961bbef0e6ff28af2fe8ab6e SHA512 fa0f67e6e4d23ff1772f3548dd6de48361293170b6ba6f07ce588dbdeb777278c35ee2152d0467186ddb2269bd0000d6138afd00b66fcd40cffb35df39a030f1
 AUX chromium-118-blink-buildgn.patch 635 BLAKE2B faea0e2bc99d031a83a596022fab69555573dbaa44ec0559bb3cada2ea686602fdb2ea6ac1ee26489637489822270b406f356bf6335f720c4122cdba74bc5da7 SHA512 b1814b574e4d3b61a9cf3a9d9f644164418d7542e88292243a24fe549acae8084387fef0a6e1471306810833ed7075cc5790f11e2e6894e6e217edefbc544727
 AUX chromium-118-compiler.patch 8691 BLAKE2B 1f5edc6db620abd0706b61b23c8ff93619799ea6e58e88e5ab6a7b8b93115c4c4f221059c87c1d3bc17efd4352efd508e849b3d9b913b979b88ba0ca38ca0ce4 SHA512 c21b1dee91b7a7d80b50c7a568883d6c583154375653f5f019ca637e2745c02fe46874930d3055eb21e8284a14976f83e7a540508da52a3088e26d1189a13def
+AUX chromium-118-material-color-utils.patch 2088 BLAKE2B 9776e46268b427d5ac651a9e509c392e79fe420b569146b4839d22f1b9c524a5626a023dab12b3ff8ec8db2ceb7047a2da1933af168294ce6aaeb437eeafa8dc SHA512 a7934f42f9b2eb3eefe35c2363d28a4d653730f9068f40fb9ee54ee25051be23fbfcda3407743da20b7a2bf36aa6c97ade371ecc6df59c2e739616f4622129c7
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
@@ -32,4 +33,4 @@ DIST chromium-118.0.5979.0.tar.xz 3226425672 BLAKE2B 564a9f93a2b2d8fbebad10bb927
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 EBUILD chromium-115.0.5762.4.ebuild 38316 BLAKE2B bb4f71240be7573f230a8288b92dd912f2a629f9216d88510ac383b8d768d753a246354b78701f8c0471b79ad369a994ee63900dafad32ed0bfb710f75c2dffa SHA512 cb12f1b261e919cf2c80966dc45dd2c45b8b7dc84d7821f54de88c0ab64188802f4a09857badaa4eab017c757137938b38f4e8378c8b13c53d11123ba847f8a7
 EBUILD chromium-116.0.5817.0.ebuild 38461 BLAKE2B a1d07b79e8cedaeb809d113f6429fe828f9a3c1d0db65b1a32847b83039d42bedcaf4e4e425af9599303dfe6ef843b0480dcdc5acd3cf75e1a19e08729e48cfc SHA512 755cda004818d5ef0c11f361ffacaada5355947e9d24ad19774bf9a77020cb8a1cbf18f7a1eaac10e604cae60ecf3dfeba407fdeaaad4c6daeba671739a81cc3
-EBUILD chromium-118.0.5979.0.ebuild 38392 BLAKE2B 8e58d786d78c81350a923511e3d68621f14fd4eafb7ea5b6ca42c8de17d37bbef411866644c348726ea4fb4d94e61a8c789cf8c81c04b7eec1cb01500c44559a SHA512 1f9857319739df82402e8e9ea0c3a3c638a990c511a256758b323a7c0e45b357be6ee6aa88b977989433ea89f35eba72a0dfeb46deb6bdc193b8683fc7fa7c28
+EBUILD chromium-118.0.5979.0.ebuild 38448 BLAKE2B aa98bb53851a4c2a5d9e123cad2748e779a9b122f5ee3312ac06c6d5a7c82de1b11d01a249cbaea82dec0e18d9dfb5e62ecf0f4cca2a113ff9dc9caddbad1fd4 SHA512 aa95d106b3f4650caa333ab475a6abdf1cb057a643f24fe9dc2738209cb5533c08a6f34770f6224d47e44ed55056cab2931920da6005509f14e2888483223e1b
diff --git a/www-client/chromium/chromium-118.0.5979.0.ebuild b/www-client/chromium/chromium-118.0.5979.0.ebuild
index 33df1c1..654016e 100644
--- a/www-client/chromium/chromium-118.0.5979.0.ebuild
+++ b/www-client/chromium/chromium-118.0.5979.0.ebuild
@@ -323,6 +323,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-109-minizip.patch"
 		"${FILESDIR}/chromium-113-authenticator-request-dialog-model-include.patch"
 		"${FILESDIR}/chromium-118-blink-buildgn.patch"
+		"${FILESDIR}/chromium-118-material-color-utils.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-109-EnumTable-crash.patch"
diff --git a/www-client/chromium/files/chromium-118-material-color-utils.patch b/www-client/chromium/files/chromium-118-material-color-utils.patch
new file mode 100644
index 0000000..4acbc1c
--- /dev/null
+++ b/www-client/chromium/files/chromium-118-material-color-utils.patch
@@ -0,0 +1,43 @@
+diff --git a/third_party/material_color_utilities/src/cpp/palettes/tones.cc b/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+index 7b42646d9..374cb7ce3 100644
+--- a/third_party/material_color_utilities/src/cpp/palettes/tones.cc
++++ b/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+@@ -19,6 +19,8 @@
+ #include "cpp/cam/cam.h"
+ #include "cpp/cam/hct.h"
+ 
++#include <cmath>
++
+ namespace material_color_utilities {
+ 
+ TonalPalette::TonalPalette(Argb argb) : key_color_(0.0, 0.0, 0.0) {
+@@ -55,7 +57,7 @@ Argb TonalPalette::get(double tone) const {
+ Hct TonalPalette::createKeyColor(double hue, double chroma) {
+   double start_tone = 50.0;
+   Hct smallest_delta_hct(hue, chroma, start_tone);
+-  double smallest_delta = abs(smallest_delta_hct.get_chroma() - chroma);
++  double smallest_delta = std::abs(smallest_delta_hct.get_chroma() - chroma);
+   // Starting from T50, check T+/-delta to see if they match the requested
+   // chroma.
+   //
+@@ -67,17 +69,17 @@ Hct TonalPalette::createKeyColor(double hue, double chroma) {
+     // case where requested chroma is 16.51, and the closest chroma is 16.49.
+     // Error is minimized, but when rounded and displayed, requested chroma
+     // is 17, key color's chroma is 16.
+-    if (round(chroma) == round(smallest_delta_hct.get_chroma())) {
++    if (std::round(chroma) == std::round(smallest_delta_hct.get_chroma())) {
+       return smallest_delta_hct;
+     }
+     Hct hct_add(hue, chroma, start_tone + delta);
+-    double hct_add_delta = abs(hct_add.get_chroma() - chroma);
++    double hct_add_delta = std::abs(hct_add.get_chroma() - chroma);
+     if (hct_add_delta < smallest_delta) {
+       smallest_delta = hct_add_delta;
+       smallest_delta_hct = hct_add;
+     }
+     Hct hct_subtract(hue, chroma, start_tone - delta);
+-    double hct_subtract_delta = abs(hct_subtract.get_chroma() - chroma);
++    double hct_subtract_delta = std::abs(hct_subtract.get_chroma() - chroma);
+     if (hct_subtract_delta < smallest_delta) {
+       smallest_delta = hct_subtract_delta;
+       smallest_delta_hct = hct_subtract;