221770 2021-02-11 12:23:24 -0800 Use a template to simplify repetitive code in ColorSpaceCG.cpp 2021-02-11 13:35:16 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin sam webkit-bug-importer oldest_to_newest 1728233 0 darin 2021-02-11 12:23:24 -0800 Use a template to simplify repetitive code in ColorSpaceCG.cpp 1728235 1 420027 darin 2021-02-11 12:24:12 -0800 Created attachment 420027 Patch 1728267 2 darin 2021-02-11 13:34:18 -0800 Committed r272746: <https://trac.webkit.org/changeset/272746> 1728270 3 webkit-bug-importer 2021-02-11 13:35:16 -0800 <rdar://problem/74248835> 420027 2021-02-11 12:24:12 -0800 2021-02-11 12:43:25 -0800 Patch bug-221770-20210211122411.patch text/plain 6356 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBiZjJmZGIzYmRhNDY1 ZWI0NjJjMTJmNWUyNzEzMDRhNzY4MWMyZS4uY2ZlMTQ0MjFhZWU3MjI5NzVjODc4MzBjNjJmMGFk YzJhMWFhMDMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTExICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgYSB0ZW1wbGF0ZSB0byBz aW1wbGlmeSByZXBldGl0aXZlIGNvZGUgaW4gQ29sb3JTcGFjZUNHLmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNzcwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j Zy9Db2xvclNwYWNlQ0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bmFtZWRDb2xvclNwYWNlKTog QWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpzUkdCQ29sb3JTcGFjZVJlZik6IFVzZSBuYW1lZENv bG9yU3BhY2UuCisgICAgICAgIChXZWJDb3JlOjphZG9iZVJHQjE5OThDb2xvclNwYWNlUmVmKTog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpkaXNwbGF5UDNDb2xvclNwYWNlUmVmKTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpleHRlbmRlZFNSR0JDb2xvclNwYWNlUmVmKTogRGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpJVFVSXzIwMjBDb2xvclNwYWNlUmVmKTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpsaW5lYXJTUkdCQ29sb3JTcGFjZVJlZik6IERpdHRvLgorICAgICAgICAoV2Vi Q29yZTo6Uk9NTVJHQkNvbG9yU3BhY2VSZWYpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Onh5 ekNvbG9yU3BhY2VSZWYpOiBEaXR0by4KKwogMjAyMS0wMi0xMSAgU2FtIFdlaW5pZyAgPHdlaW5p Z0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV0dXJuaW5nIHNSR0IgZnJvbSBDRyBjb2xvciBzcGFj ZSBmdW5jdGlvbnMgb24gZmFpbHVyZSBpcyB0b28gZXJyb3IgcHJvbmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0NvbG9yU3BhY2VDRy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9Db2xvclNwYWNlQ0cuY3BwCmluZGV4IDZl OTZhOWY3NTlkZTRmMTAxNWJkZmJkNjUxY2IxNWU0NTZkY2JhOTcuLjQyNDczZGQzZTZmNTkyNzI2 ZTA0OWNhNzk1ZGNkZGQ5Yjc3OTg0OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0NvbG9yU3BhY2VDRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2cvQ29sb3JTcGFjZUNHLmNwcApAQCAtMzMsNzUgKzMzLDYxIEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotQ0dDb2xvclNwYWNlUmVmIHNSR0JDb2xvclNwYWNlUmVm KCkKKyNpZiAhUExBVEZPUk0oV0lOKQordGVtcGxhdGU8Y29uc3QgQ0ZTdHJpbmdSZWYmIGNvbG9y U3BhY2VOYW1lR2xvYmFsQ29uc3RhbnQ+IHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYgbmFtZWRDb2xv clNwYWNlKCkKIHsKLSAgICBzdGF0aWMgQ0dDb2xvclNwYWNlUmVmIHNSR0JDb2xvclNwYWNlOwor ICAgIHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYgY29sb3JTcGFjZTsKICAgICBzdGF0aWMgc3RkOjpv bmNlX2ZsYWcgb25jZUZsYWc7CiAgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKLSNp ZiBQTEFURk9STShXSU4pCi0gICAgICAgIC8vIE91dC1vZi1kYXRlIENHIGluc3RhbGxhdGlvbnMg d2lsbCBub3QgaG9ub3Iga0NHQ29sb3JTcGFjZVNSR0IuIFRoaXMgbG9naWMgYXZvaWRzCi0gICAg ICAgIC8vIGNhdXNpbmcgYSBjcmFzaCB1bmRlciB0aG9zZSBjb25kaXRpb25zLiBTaW5jZSB0aGUg ZGVmYXVsdCBjb2xvciBzcGFjZSBpbiBXaW5kb3dzCi0gICAgICAgIC8vIGlzIHNSR0IsIHRoaXMg YWxsIHdvcmtzIG91dCBuaWNlbHkuCi0gICAgICAgIC8vIEZJWE1FOiBJcyB0aGlzIHN0aWxsIG5l ZWRlZD8gcmRhcjovL3Byb2JsZW0vMTUyMTM1MTUgd2FzIGZpeGVkLgotICAgICAgICBzUkdCQ29s b3JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1lKGtDR0NvbG9yU3BhY2VTUkdCKTsK LSAgICAgICAgaWYgKCFzUkdCQ29sb3JTcGFjZSkKLSAgICAgICAgICAgIHNSR0JDb2xvclNwYWNl ID0gQ0dDb2xvclNwYWNlQ3JlYXRlRGV2aWNlUkdCKCk7Ci0jZWxzZQotICAgICAgICBzUkdCQ29s b3JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1lKGtDR0NvbG9yU3BhY2VTUkdCKTsK LSNlbmRpZiAvLyBQTEFURk9STShXSU4pCisgICAgICAgIGNvbG9yU3BhY2UgPSBDR0NvbG9yU3Bh Y2VDcmVhdGVXaXRoTmFtZShjb2xvclNwYWNlTmFtZUdsb2JhbENvbnN0YW50KTsKKyAgICAgICAg QVNTRVJUKGNvbG9yU3BhY2UpOwogICAgIH0pOwotICAgIHJldHVybiBzUkdCQ29sb3JTcGFjZTsK KyAgICByZXR1cm4gY29sb3JTcGFjZTsKIH0KKyNlbmRpZgogCi0jaWYgSEFWRShDT1JFX0dSQVBI SUNTX0FET0JFX1JHQl8xOTk4X0NPTE9SX1NQQUNFKQotQ0dDb2xvclNwYWNlUmVmIGFkb2JlUkdC MTk5OENvbG9yU3BhY2VSZWYoKQorQ0dDb2xvclNwYWNlUmVmIHNSR0JDb2xvclNwYWNlUmVmKCkK IHsKLSAgICBzdGF0aWMgQ0dDb2xvclNwYWNlUmVmIGFkb2JlUkdCMTk5OENvbG9yU3BhY2U7Cisj aWYgIVBMQVRGT1JNKFdJTikKKyAgICByZXR1cm4gbmFtZWRDb2xvclNwYWNlPGtDR0NvbG9yU3Bh Y2VTUkdCPigpOworI2Vsc2UKKyAgICAvLyBDb3JlIEdyYXBoaWNzIHJldHVybmVkIG51bGwgZm9y IGtDR0NvbG9yU3BhY2VTUkdCIG9uIFdpbmRvd3MgYXQgb25lIHBvaW50LgorICAgIC8vIENvcmUg R3JhcGhpY3MgImRldmljZSBSR0IiIGlzIHNSR0Igb24gV2luZG93cy4gVXNlIHRoYXQgaW5zdGVh ZC4KKyAgICAvLyBGSVhNRTogU3RpbGwgbmVlZGVkIHNpbmNlIHJkYXI6Ly8xNTIxMzUxNSB3YXMg Zml4ZWQgaW4gMjAxMz8KKyAgICBzdGF0aWMgQ0dDb2xvclNwYWNlUmVmIGNvbG9yU3BhY2U7CiAg ICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOwogICAgIHN0ZDo6Y2FsbF9vbmNlKG9u Y2VGbGFnLCBbXSB7Ci0gICAgICAgIGFkb2JlUkdCMTk5OENvbG9yU3BhY2UgPSBDR0NvbG9yU3Bh Y2VDcmVhdGVXaXRoTmFtZShrQ0dDb2xvclNwYWNlQWRvYmVSR0IxOTk4KTsKLSAgICAgICAgQVNT RVJUKGFkb2JlUkdCMTk5OENvbG9yU3BhY2UpOworICAgICAgICBjb2xvclNwYWNlID0gQ0dDb2xv clNwYWNlQ3JlYXRlRGV2aWNlUkdCKCk7CiAgICAgfSk7Ci0gICAgcmV0dXJuIGFkb2JlUkdCMTk5 OENvbG9yU3BhY2U7CisgICAgcmV0dXJuIGNvbG9yU3BhY2U7CisjZW5kaWYgLy8gUExBVEZPUk0o V0lOKQorfQorCisjaWYgSEFWRShDT1JFX0dSQVBISUNTX0FET0JFX1JHQl8xOTk4X0NPTE9SX1NQ QUNFKQorQ0dDb2xvclNwYWNlUmVmIGFkb2JlUkdCMTk5OENvbG9yU3BhY2VSZWYoKQoreworICAg IHJldHVybiBuYW1lZENvbG9yU3BhY2U8a0NHQ29sb3JTcGFjZUFkb2JlUkdCMTk5OD4oKTsKIH0K ICNlbmRpZgogCiAjaWYgSEFWRShDT1JFX0dSQVBISUNTX0RJU1BMQVlfUDNfQ09MT1JfU1BBQ0Up CiBDR0NvbG9yU3BhY2VSZWYgZGlzcGxheVAzQ29sb3JTcGFjZVJlZigpCiB7Ci0gICAgc3RhdGlj IENHQ29sb3JTcGFjZVJlZiBkaXNwbGF5UDNDb2xvclNwYWNlOwotICAgIHN0YXRpYyBzdGQ6Om9u Y2VfZmxhZyBvbmNlRmxhZzsKLSAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10gewotICAg ICAgICBkaXNwbGF5UDNDb2xvclNwYWNlID0gQ0dDb2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NH Q29sb3JTcGFjZURpc3BsYXlQMyk7Ci0gICAgICAgIEFTU0VSVChkaXNwbGF5UDNDb2xvclNwYWNl KTsKLSAgICB9KTsKLSAgICByZXR1cm4gZGlzcGxheVAzQ29sb3JTcGFjZTsKKyAgICByZXR1cm4g bmFtZWRDb2xvclNwYWNlPGtDR0NvbG9yU3BhY2VEaXNwbGF5UDM+KCk7CiB9CiAjZW5kaWYKIAog I2lmIEhBVkUoQ09SRV9HUkFQSElDU19FWFRFTkRFRF9TUkdCX0NPTE9SX1NQQUNFKQogQ0dDb2xv clNwYWNlUmVmIGV4dGVuZGVkU1JHQkNvbG9yU3BhY2VSZWYoKQogewotICAgIHN0YXRpYyBDR0Nv bG9yU3BhY2VSZWYgZXh0ZW5kZWRTUkdCQ29sb3JTcGFjZTsKLSAgICBzdGF0aWMgc3RkOjpvbmNl X2ZsYWcgb25jZUZsYWc7Ci0gICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKLSAgICAg ICAgZXh0ZW5kZWRTUkdCQ29sb3JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1lKGtD R0NvbG9yU3BhY2VFeHRlbmRlZFNSR0IpOwotICAgICAgICBBU1NFUlQoZXh0ZW5kZWRTUkdCQ29s b3JTcGFjZSk7Ci0gICAgfSk7Ci0gICAgcmV0dXJuIGV4dGVuZGVkU1JHQkNvbG9yU3BhY2U7Cisg ICAgcmV0dXJuIG5hbWVkQ29sb3JTcGFjZTxrQ0dDb2xvclNwYWNlRXh0ZW5kZWRTUkdCPigpOwog fQogI2VuZGlmCiAKICNpZiBIQVZFKENPUkVfR1JBUEhJQ1NfSVRVUl8yMDIwX0NPTE9SX1NQQUNF KQogQ0dDb2xvclNwYWNlUmVmIElUVVJfMjAyMENvbG9yU3BhY2VSZWYoKQogewotICAgIHN0YXRp YyBDR0NvbG9yU3BhY2VSZWYgSVRVUjIwMjBDb2xvclNwYWNlOwotICAgIHN0YXRpYyBzdGQ6Om9u Y2VfZmxhZyBvbmNlRmxhZzsKLSAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10gewotICAg ICAgICBJVFVSMjAyMENvbG9yU3BhY2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVXaXRoTmFtZShrQ0dD b2xvclNwYWNlSVRVUl8yMDIwKTsKLSAgICAgICAgQVNTRVJUKElUVVIyMDIwQ29sb3JTcGFjZSk7 Ci0gICAgfSk7Ci0gICAgcmV0dXJuIElUVVIyMDIwQ29sb3JTcGFjZTsKKyAgICByZXR1cm4gbmFt ZWRDb2xvclNwYWNlPGtDR0NvbG9yU3BhY2VJVFVSXzIwMjA+KCk7CiB9CiAjZW5kaWYKIApAQCAt MTE2LDM5ICsxMDIsMjEgQEAgQ0dDb2xvclNwYWNlUmVmIGxhYkNvbG9yU3BhY2VSZWYoKQogI2lm IEhBVkUoQ09SRV9HUkFQSElDU19MSU5FQVJfU1JHQl9DT0xPUl9TUEFDRSkKIENHQ29sb3JTcGFj ZVJlZiBsaW5lYXJTUkdCQ29sb3JTcGFjZVJlZigpCiB7Ci0gICAgc3RhdGljIENHQ29sb3JTcGFj ZVJlZiBsaW5lYXJSR0JDb2xvclNwYWNlOwotICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNl RmxhZzsKLSAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10gewotICAgICAgICBsaW5lYXJS R0JDb2xvclNwYWNlID0gQ0dDb2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NHQ29sb3JTcGFjZUxp bmVhclNSR0IpOwotICAgICAgICBBU1NFUlQobGluZWFyUkdCQ29sb3JTcGFjZSk7Ci0gICAgfSk7 Ci0gICAgcmV0dXJuIGxpbmVhclJHQkNvbG9yU3BhY2U7CisgICAgcmV0dXJuIG5hbWVkQ29sb3JT cGFjZTxrQ0dDb2xvclNwYWNlTGluZWFyU1JHQj4oKTsKIH0KICNlbmRpZgogCiAjaWYgSEFWRShD T1JFX0dSQVBISUNTX1JPTU1SR0JfQ09MT1JfU1BBQ0UpCiBDR0NvbG9yU3BhY2VSZWYgUk9NTVJH QkNvbG9yU3BhY2VSZWYoKQogewotICAgIHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYgUk9NTVJHQkNv bG9yU3BhY2U7Ci0gICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOwotICAgIHN0ZDo6 Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7Ci0gICAgICAgIFJPTU1SR0JDb2xvclNwYWNlID0gQ0dD b2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NHQ29sb3JTcGFjZVJPTU1SR0IpOwotICAgICAgICBB U1NFUlQoUk9NTVJHQkNvbG9yU3BhY2UpOwotICAgIH0pOwotICAgIHJldHVybiBST01NUkdCQ29s b3JTcGFjZTsKKyAgICByZXR1cm4gbmFtZWRDb2xvclNwYWNlPGtDR0NvbG9yU3BhY2VST01NUkdC PigpOwogfQogI2VuZGlmCiAKICNpZiBIQVZFKENPUkVfR1JBUEhJQ1NfWFlaX0NPTE9SX1NQQUNF KQogQ0dDb2xvclNwYWNlUmVmIHh5ekNvbG9yU3BhY2VSZWYoKQogewotICAgIHN0YXRpYyBDR0Nv bG9yU3BhY2VSZWYgeHl6Q29sb3JTcGFjZTsKLSAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25j ZUZsYWc7Ci0gICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKLSAgICAgICAgeHl6Q29s b3JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1lKGtDR0NvbG9yU3BhY2VHZW5lcmlj WFlaKTsKLSAgICAgICAgQVNTRVJUKHh5ekNvbG9yU3BhY2UpOwotICAgIH0pOwotICAgIHJldHVy biB4eXpDb2xvclNwYWNlOworICAgIHJldHVybiBuYW1lZENvbG9yU3BhY2U8a0NHQ29sb3JTcGFj ZUdlbmVyaWNYWVo+KCk7CiB9CiAjZW5kaWYKIAo=