226438 2021-05-30 15:29:23 -0700 Add additional target luminance keywords for color-contrast() added for https://github.com/w3c/csswg-drafts/issues/6311 2021-05-30 19:18:51 -0700 1 1 1 Unclassified WebKit CSS Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam cdumez darin esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard webkit-bug-importer oldest_to_newest 1765265 0 sam 2021-05-30 15:29:23 -0700 AAA (7.0) and AAA-large (4.5) were added for https://github.com/w3c/csswg-drafts/issues/6311 / https://github.com/w3c/csswg-drafts/commit/45b0b891e81ff308b4ce482ac1e3621382608f0a#diff-2035345378942a021190ce428e1f91413c366fec038ea7c90ec1a446100c4f5e. 1765267 1 430153 sam 2021-05-30 15:59:29 -0700 Created attachment 430153 Patch 1765270 2 430153 darin 2021-05-30 16:57:41 -0700 Comment on attachment 430153 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430153&action=review > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1618 > + auto id = args.consumeIncludingWhitespace().id(); > + for (auto& [identifier, luminance] : targetLuminanceMappings) { > + if (identifier == id) > + return luminance; > + } > + return std::nullopt; Since these keys are sorted, you could have used SortedArrayMap and written this: constexpr SortedArrayMap targetLuminanceMap { targetLuminanceMappings }; return targetLuminanceMap.tryGet(args.consumeIncludingWhitespace().id()); However, it returns a const double*, not a std::optional<double>. But in other ways it’s designed just for uses like this. Switches to binary search if the list gets long. 1765281 3 ews-feeder 2021-05-30 17:52:26 -0700 Committed r278262 (238299@main): <https://commits.webkit.org/238299@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430153. 1765282 4 webkit-bug-importer 2021-05-30 17:53:15 -0700 <rdar://problem/78670255> 1765292 5 sam 2021-05-30 19:18:51 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 430153 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=430153&action=review > > > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1618 > > + auto id = args.consumeIncludingWhitespace().id(); > > + for (auto& [identifier, luminance] : targetLuminanceMappings) { > > + if (identifier == id) > > + return luminance; > > + } > > + return std::nullopt; > > Since these keys are sorted, you could have used SortedArrayMap and written > this: > > constexpr SortedArrayMap targetLuminanceMap { targetLuminanceMappings }; > return targetLuminanceMap.tryGet(args.consumeIncludingWhitespace().id()); > > However, it returns a const double*, not a std::optional<double>. But in > other ways it’s designed just for uses like this. Switches to binary search > if the list gets long. Missed this. Sorry. Addressed in https://bugs.webkit.org/show_bug.cgi?id=226444. 430153 2021-05-30 15:59:29 -0700 2021-05-30 17:52:27 -0700 Patch bug-226438-20210530155928.patch text/plain 5822 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3ODI1OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA1LTMwICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYWRkaXRpb25hbCB0YXJnZXQg bHVtaW5hbmNlIGtleXdvcmRzIGZvciBjb2xvci1jb250cmFzdCgpIGFkZGVkIGZvciBodHRwczov L2dpdGh1Yi5jb20vdzNjL2Nzc3dnLWRyYWZ0cy9pc3N1ZXMvNjMxMQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NDM4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ld2x5IHNwZWMnZCB0YXJnZXQg bHVtaW5hbmNlIGtleXdvcmRzLiAKKworICAgICAgICAqIGNzcy9DU1NWYWx1ZUtleXdvcmRzLmlu OgorICAgICAgICBBZGQgQUFBIGFuZCBBQUEtbGFyZ2Uga2V5d29yZHMuCisKKyAgICAgICAgKiBj c3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OnBhcnNlQ29sb3JDb250cmFzdEZ1bmN0aW9uUGFy YW1ldGVycyk6CisgICAgICAgIEFkZCB0YXJnZXQgbHVtaW5hbmNlIG1hcHBpbmdzIGZvciAiQUFB IiAtPiA3IGFuZCAiQUFBLWxhcmdlIiAtPiA0LjUKKwogMjAyMS0wNS0zMCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYlhSXSBObyBuZWVkIGZvciBvcGFxdWVU ZXh0dXJlIHdoZW4gVVNFKElPU1VSRkFDRV9GT1JfWFJfTEFZRVJfREFUQSkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCShyZXZpc2lvbiAyNzgyNTMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTQ0 OCw2ICsxNDQ4LDggQEAgY29sb3ItY29udHJhc3QKIHZzCiBBQQogQUEtbGFyZ2UKK0FBQQorQUFB LWxhcmdlCiAKIC8vIGNvbG9yLW1peCgpCiBjb2xvci1taXgKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAJKHJl dmlzaW9uIDI3ODI1MykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQ YXJzZXJIZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYwMCwxMiArMTYwMCwyMyBAQCBz dGF0aWMgQ29sb3IgcGFyc2VDb2xvckNvbnRyYXN0RnVuY3Rpb25QCiAgICAgaWYgKGNvbG9yc1Rv Q29tcGFyZUFnYWluc3Quc2l6ZSgpID09IDEpCiAgICAgICAgIHJldHVybiB7IH07CiAKKyAgICBj b25zdGV4cHIgc3RkOjpwYWlyPENTU1ZhbHVlSUQsIGRvdWJsZT4gdGFyZ2V0THVtaW5hbmNlTWFw cGluZ3NbXSB7CisgICAgICAgIHsgQ1NTVmFsdWVBQSwgNC41IH0sCisgICAgICAgIHsgQ1NTVmFs dWVBQUxhcmdlLCAzLjAgfSwKKyAgICAgICAgeyBDU1NWYWx1ZUFBQSwgNy4wIH0sCisgICAgICAg IHsgQ1NTVmFsdWVBQUFMYXJnZSwgNC41IH0sCisgICAgfTsKKwogICAgIGlmIChjb25zdW1lZFRv KSB7CiAgICAgICAgIGF1dG8gdGFyZ2V0Q29udHJhc3QgPSBbJl0gKCkgLT4gc3RkOjpvcHRpb25h bDxkb3VibGU+IHsKLSAgICAgICAgICAgIGlmIChjb25zdW1lSWRlbnRSYXc8Q1NTVmFsdWVBQT4o YXJncykpCi0gICAgICAgICAgICAgICAgcmV0dXJuIDQuNTsKLSAgICAgICAgICAgIGlmIChjb25z dW1lSWRlbnRSYXc8Q1NTVmFsdWVBQUxhcmdlPihhcmdzKSkKLSAgICAgICAgICAgICAgICByZXR1 cm4gMy4wOworICAgICAgICAgICAgaWYgKGFyZ3MucGVlaygpLnR5cGUoKSA9PSBJZGVudFRva2Vu KSB7CisgICAgICAgICAgICAgICAgYXV0byBpZCA9IGFyZ3MuY29uc3VtZUluY2x1ZGluZ1doaXRl c3BhY2UoKS5pZCgpOworICAgICAgICAgICAgICAgIGZvciAoYXV0byYgW2lkZW50aWZpZXIsIGx1 bWluYW5jZV0gOiB0YXJnZXRMdW1pbmFuY2VNYXBwaW5ncykgeworICAgICAgICAgICAgICAgICAg ICBpZiAoaWRlbnRpZmllciA9PSBpZCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBs dW1pbmFuY2U7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJldHVybiBzdGQ6 Om51bGxvcHQ7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gY29uc3VtZU51bWJl clJhdyhhcmdzKTsKICAgICAgICAgfSgpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzgyNTkpCisr KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAor MjAyMS0wNS0zMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRk IGFkZGl0aW9uYWwgdGFyZ2V0IGx1bWluYW5jZSBrZXl3b3JkcyBmb3IgY29sb3ItY29udHJhc3Qo KSBhZGRlZCBmb3IgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzYz MTEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjQz OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSB0ZXN0IGFuZCByZXN1bHRzIGZvciBuZXcgQUFBIGFuZCBBQUEtbGFyZ2UgdGFyZ2V0IGx1bWlu YW5jZSBrZXl3b3Jkcy4KKworICAgICAgICAqIGZhc3QvY3NzL3BhcnNpbmctY29sb3ItY29udHJh c3QtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzL3BhcnNpbmctY29sb3ItY29udHJh c3QuaHRtbDoKKwogMjAyMS0wNS0yOSAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbmFtZSBJbnRlcm5hbHMubWFpblRocmVhZFNjcm9sbGluZ1JlYXNv bnMgdG8gc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2Nzcy9wYXJzaW5nLWNvbG9yLWNvbnRyYXN0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L2Nzcy9wYXJzaW5nLWNvbG9yLWNvbnRyYXN0LWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMjc4MjUzKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvcGFyc2luZy1jb2xvci1j b250cmFzdC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTIwLDYgKzIwLDggQEAgUEFT UyBjb21wdXRlZFN0eWxlKCJiYWNrZ3JvdW5kLWNvbG9yIiwgIgogVGVzdCB3aXRoIHNwZWNpZmll ZCB0YXJnZXQgY29udHJhc3QKIFBBU1MgY29tcHV0ZWRTdHlsZSgiYmFja2dyb3VuZC1jb2xvciIs ICJjb2xvci1jb250cmFzdCh3aGVhdCB2cyBiaXNxdWUsIGRhcmtnb2xkZW5yb2QsIG9saXZlLCBz aWVubmEsIGRhcmtncmVlbiwgbWFyb29uIHRvIEFBKSIpIGlzICJyZ2IoMCwgMTAwLCAwKSIKIFBB U1MgY29tcHV0ZWRTdHlsZSgiYmFja2dyb3VuZC1jb2xvciIsICJjb2xvci1jb250cmFzdCh3aGVh dCB2cyBiaXNxdWUsIGRhcmtnb2xkZW5yb2QsIG9saXZlLCBzaWVubmEsIGRhcmtncmVlbiwgbWFy b29uIHRvIEFBLWxhcmdlKSIpIGlzICJyZ2IoMTI4LCAxMjgsIDApIgorUEFTUyBjb21wdXRlZFN0 eWxlKCJiYWNrZ3JvdW5kLWNvbG9yIiwgImNvbG9yLWNvbnRyYXN0KHdoZWF0IHZzIGJpc3F1ZSwg ZGFya2dvbGRlbnJvZCwgb2xpdmUsIHNpZW5uYSwgZGFya2dyZWVuLCBtYXJvb24gdG8gQUFBKSIp IGlzICJyZ2IoMTI4LCAwLCAwKSIKK1BBU1MgY29tcHV0ZWRTdHlsZSgiYmFja2dyb3VuZC1jb2xv ciIsICJjb2xvci1jb250cmFzdCh3aGVhdCB2cyBiaXNxdWUsIGRhcmtnb2xkZW5yb2QsIG9saXZl LCBzaWVubmEsIGRhcmtncmVlbiwgbWFyb29uIHRvIEFBQS1sYXJnZSkiKSBpcyAicmdiKDAsIDEw MCwgMCkiCiBQQVNTIGNvbXB1dGVkU3R5bGUoImJhY2tncm91bmQtY29sb3IiLCAiY29sb3ItY29u dHJhc3Qod2hlYXQgdnMgYmlzcXVlLCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2llbm5hLCBkYXJr Z3JlZW4sIG1hcm9vbiB0byA1LjgpIikgaXMgInJnYigxMjgsIDAsIDApIgogCiBUZXN0IHdpdGgg c3BlY2lmaWVkIHRhcmdldCBjb250cmFzdCB0aGF0IG5vbmUgbWVldApJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9jc3MvcGFyc2luZy1jb2xvci1jb250cmFzdC5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvY3NzL3BhcnNpbmctY29sb3ItY29udHJhc3QuaHRtbAkocmV2aXNpb24g Mjc4MjUzKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvcGFyc2luZy1jb2xvci1jb250cmFzdC5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw5IEBACiAKICAgICB0ZXN0Q29tcHV0ZWQo YGNvbG9yLWNvbnRyYXN0KHdoZWF0IHZzIGJpc3F1ZSwgZGFya2dvbGRlbnJvZCwgb2xpdmUsIHNp ZW5uYSwgZGFya2dyZWVuLCBtYXJvb24gdG8gQUEpYCwgYHJnYigwLCAxMDAsIDApYCk7IC8vIGRh cmtncmVlbgogICAgIHRlc3RDb21wdXRlZChgY29sb3ItY29udHJhc3Qod2hlYXQgdnMgYmlzcXVl LCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2llbm5hLCBkYXJrZ3JlZW4sIG1hcm9vbiB0byBBQS1s YXJnZSlgLCBgcmdiKDEyOCwgMTI4LCAwKWApOyAvLyBvbGl2ZQotICAgIHRlc3RDb21wdXRlZChg Y29sb3ItY29udHJhc3Qod2hlYXQgdnMgYmlzcXVlLCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2ll bm5hLCBkYXJrZ3JlZW4sIG1hcm9vbiB0byA1LjgpYCwgYHJnYigxMjgsIDAsIDApYCk7IC8vIG9s aXZlIG1hcm9vbgorICAgIHRlc3RDb21wdXRlZChgY29sb3ItY29udHJhc3Qod2hlYXQgdnMgYmlz cXVlLCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2llbm5hLCBkYXJrZ3JlZW4sIG1hcm9vbiB0byBB QUEpYCwgYHJnYigxMjgsIDAsIDApYCk7IC8vIG1hcm9vbgorICAgIHRlc3RDb21wdXRlZChgY29s b3ItY29udHJhc3Qod2hlYXQgdnMgYmlzcXVlLCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2llbm5h LCBkYXJrZ3JlZW4sIG1hcm9vbiB0byBBQUEtbGFyZ2UpYCwgYHJnYigwLCAxMDAsIDApYCk7IC8v IGRhcmtncmVlbgorICAgIHRlc3RDb21wdXRlZChgY29sb3ItY29udHJhc3Qod2hlYXQgdnMgYmlz cXVlLCBkYXJrZ29sZGVucm9kLCBvbGl2ZSwgc2llbm5hLCBkYXJrZ3JlZW4sIG1hcm9vbiB0byA1 LjgpYCwgYHJnYigxMjgsIDAsIDApYCk7IC8vIG1hcm9vbgogICAgIAogICAgIGRlYnVnKCcnKTsK ICAgICBkZWJ1ZygnVGVzdCB3aXRoIHNwZWNpZmllZCB0YXJnZXQgY29udHJhc3QgdGhhdCBub25l IG1lZXQnKQo=