228313 2021-07-26 22:07:50 -0700 LayoutTestHelper does not correctly restore color profiles for some devices 2021-08-10 16:51:47 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 188320 1 heycam heycam ap jbedard webkit-bug-importer oldest_to_newest 1779681 0 heycam 2021-07-26 22:07:50 -0700 LayoutTestHelper only looks for profiles named "1", which is a default profile name. Some devices have multiple profile names, such as my external monitor, which has this device info dictionary: (lldb) po deviceInfo { CustomProfiles = { "HDMI HD" = "file:///System/Library/ColorSync/Profiles/sRGB%20Profile.icc"; }; DeviceClass = mntr; DeviceDescription = "ASUS PB27U"; DeviceHostScope = kCFPreferencesCurrentHost; DeviceID = "<CFUUID 0x6000037cc3e0> 4261DDFA-A1B4-1E80-AD62-026351A927F0"; DeviceUserScope = kCFPreferencesAnyUser; FactoryProfiles = { DeviceDefaultProfileID = "HDMI HD"; "HDMI HD" = { DeviceModeDescription = "HDMI HD"; DeviceProfileURL = "file:///Library/ColorSync/Profiles/Displays/ASUS%20PB27U-4261DDFA-A1B4-1E80-AD62-026351A927F0.icc"; }; "HDMI SD" = { DeviceModeDescription = "HDMI SD"; DeviceProfileURL = "file:///System/Library/CoreServices/Resources/Profiles/SD%20170M-A.icc"; }; }; } We should look at the DeviceDefaultProfileID and use that as the profile name. 1779682 1 heycam 2021-07-26 22:10:51 -0700 s/profile name/mode/, maybe. 1779683 2 webkit-bug-importer 2021-07-26 22:11:04 -0700 <rdar://problem/81146417> 1779687 3 434270 heycam 2021-07-26 22:34:38 -0700 Created attachment 434270 Patch 1783362 4 ews-feeder 2021-08-10 16:51:46 -0700 Committed r280871 (240410@main): <https://commits.webkit.org/240410@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434270. 434270 2021-07-26 22:34:38 -0700 2021-08-10 16:51:46 -0700 Patch bug-228313-20210727153437.patch text/plain 3519 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmI1ZDAwMGU0YWI5ZjVmYjU3Nzg4MGUxYzdiNjE0OTBk MjFlYWQ1Ni4uM2M1YWI4MmI4NWQ2ZmM0YjhhYWIzODg2YjAwYTkyYTVlM2NiOGUwYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIxLTA3LTI2ICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisK KyAgICAgICAgUmVzdG9yZSBjb2xvciBwcm9maWxlcyBjb3JyZWN0bHkgb24gZGlzcGxheXMgd2l0 aCBtdWx0aXBsZSBuYW1lZCBtb2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI4MzEzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MTE0NjQxNz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rIHVw IGEgZGV2aWNlJ3MgY3VycmVudCBjb2xvciBwcm9maWxlIGJ5IGNoZWNraW5nIHRoZSBkZWZhdWx0 IG1vZGUKKyAgICAgICAgcmF0aGVyIHRoYW4gYXNzdW1pbmcgaXQgaXMgIjEiLiAgVGhlIGRldmlj ZSBpbmZvIGRpY3Rpb25hcnkgcmV0dXJuZWQKKyAgICAgICAgYnkgQ29sb3JTeW5jRGV2aWNlQ29w eURldmljZUluZm8gaGFzIHRoaXMgc2hhcGU6CisKKyAgICAgICAgeworICAgICAgICAgICAgQ3Vz dG9tUHJvZmlsZXMgPSB7CisgICAgICAgICAgICAgICAgTW9kZU5hbWUxID0gImZpbGU6Ly8vcGF0 aC90by9jdXN0b20vcHJvZmlsZS5pY3MiOworICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIEZh Y3RvcnlQcm9maWxlcyA9IHsKKyAgICAgICAgICAgICAgICBEZXZpY2VEZWZhdWx0UHJvZmlsZUlE ID0gIk1vZGVOYW1lMSI7CisgICAgICAgICAgICAgICAgTW9kZU5hbWUxID0geworICAgICAgICAg ICAgICAgICAgICBEZXZpY2VNb2RlRGVzY3JpcHRpb24gPSAiTW9kZSBOYW1lIDEiOworICAgICAg ICAgICAgICAgICAgICBEZXZpY2VQcm9maWxlVVJMID0gImZpbGU6Ly8vcGF0aC90by9mYWN0b3J5 L3Byb2ZpbGUxLmljcyI7CisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICBNb2Rl TmFtZTIgPSB7CisgICAgICAgICAgICAgICAgICAgIERldmljZU1vZGVEZXNjcmlwdGlvbiA9ICJN b2RlIE5hbWUgMiI7CisgICAgICAgICAgICAgICAgICAgIERldmljZVByb2ZpbGVVUkwgPSAiZmls ZTovLy9wYXRoL3RvL2ZhY3RvcnkvcHJvZmlsZTIuaWNzIjsKKyAgICAgICAgICAgICAgICB9Owor ICAgICAgICAgICAgfTsKKyAgICAgICAgfQorCisgICAgICAgIHdoZXJlIEN1c3RvbVByb2ZpbGVz IGlzIG9ubHkgcHJlc2VudCBpZiBhIGN1c3RvbSBwcm9maWxlIGhhcyBiZWVuCisgICAgICAgIHNl bGVjdGVkLCBhbmQgdGhlIGRlZmF1bHQgbW9kZSBuYW1lIGlzICIxIi4gIERpc3BsYXlzIGNvbm5l Y3RlZCBvdmVyCisgICAgICAgIEhETUkgZG9uJ3QgdXNlIHRoZSBkZWZhdWx0IG1vZGUgbmFtZS4K KworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm06CisgICAg ICAgIChjb2xvclByb2ZpbGVVUkxGb3JEaXNwbGF5KToKKwogMjAyMS0wNy0yNiAgS2F0ZSBDaGVu ZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBTZXJ2aWNlV29ya2Vy UmVnaXN0cmF0aW9uLnVucmVnaXN0ZXIgbWV0aG9kIGZhaWxzIGluIFdLV2ViVmlldwpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RIZWxwZXIubSBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm0KaW5kZXggZmE5MjEyZGM1MzRl MGMxOTA3Y2FmZjJjZDAzMjE3YzlmOWNhNjY1Mi4uYzE3YzhhZWVhNjJhM2MyMmVjMTYzZTk4MzY3 Y2Q2OTA1NDA4NGQzYyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91 dFRlc3RIZWxwZXIubQorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhl bHBlci5tCkBAIC03OSwxNSArNzksMjAgQEAKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiAK KyAgICBDRlN0cmluZ1JlZiBwcm9maWxlSUQgPSBDRlNUUigiMSIpOwogICAgIENGVVJMUmVmIHBy b2ZpbGVVUkwgPSBuaWw7Ci0gICAgQ0ZEaWN0aW9uYXJ5UmVmIHByb2ZpbGVJbmZvID0gKENGRGlj dGlvbmFyeVJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShkZXZpY2VJbmZvLCBrQ29sb3JTeW5jQ3Vz dG9tUHJvZmlsZXMpOwotICAgIGlmIChwcm9maWxlSW5mbykKLSAgICAgICAgcHJvZmlsZVVSTCA9 IChDRlVSTFJlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShwcm9maWxlSW5mbywgQ0ZTVFIoIjEiKSk7 Ci0gICAgZWxzZSB7Ci0gICAgICAgIHByb2ZpbGVJbmZvID0gKENGRGljdGlvbmFyeVJlZilDRkRp Y3Rpb25hcnlHZXRWYWx1ZShkZXZpY2VJbmZvLCBrQ29sb3JTeW5jRmFjdG9yeVByb2ZpbGVzKTsK LSAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIGZhY3RvcnlQcm9maWxlID0gKENGRGljdGlvbmFyeVJl ZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShwcm9maWxlSW5mbywgQ0ZTVFIoIjEiKSk7Ci0gICAgICAg IGlmIChmYWN0b3J5UHJvZmlsZSkKLSAgICAgICAgICAgIHByb2ZpbGVVUkwgPSAoQ0ZVUkxSZWYp Q0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZmFjdG9yeVByb2ZpbGUsIGtDb2xvclN5bmNEZXZpY2VQcm9m aWxlVVJMKTsKKworICAgIENGRGljdGlvbmFyeVJlZiBmYWN0b3J5UHJvZmlsZXMgPSAoQ0ZEaWN0 aW9uYXJ5UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGRldmljZUluZm8sIGtDb2xvclN5bmNGYWN0 b3J5UHJvZmlsZXMpOworICAgIGlmIChmYWN0b3J5UHJvZmlsZXMpCisgICAgICAgIHByb2ZpbGVJ RCA9IChDRlN0cmluZ1JlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShmYWN0b3J5UHJvZmlsZXMsIGtD b2xvclN5bmNEZXZpY2VEZWZhdWx0UHJvZmlsZUlEKTsKKworICAgIENGRGljdGlvbmFyeVJlZiBj dXN0b21Qcm9maWxlcyA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZGV2 aWNlSW5mbywga0NvbG9yU3luY0N1c3RvbVByb2ZpbGVzKTsKKyAgICBpZiAoY3VzdG9tUHJvZmls ZXMpCisgICAgICAgIHByb2ZpbGVVUkwgPSAoQ0ZVUkxSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUo Y3VzdG9tUHJvZmlsZXMsIHByb2ZpbGVJRCk7CisgICAgaWYgKCFwcm9maWxlVVJMICYmIGZhY3Rv cnlQcm9maWxlcykgeworICAgICAgICBDRkRpY3Rpb25hcnlSZWYgcHJvZmlsZSA9IChDRkRpY3Rp b25hcnlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZmFjdG9yeVByb2ZpbGVzLCBwcm9maWxlSUQp OworICAgICAgICBpZiAocHJvZmlsZSkKKyAgICAgICAgICAgIHByb2ZpbGVVUkwgPSAoQ0ZVUkxS ZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUocHJvZmlsZSwga0NvbG9yU3luY0RldmljZVByb2ZpbGVV UkwpOwogICAgIH0KICAgICAKICAgICBpZiAoIXByb2ZpbGVVUkwpIHsK