217642 2020-10-12 17:50:42 -0700 Fix the macCatalyst build ("reference to 'Rect' is ambiguous") 2020-10-12 19:13:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=217644 InRadar P1 Normal --- 1 thorton thorton darin webkit-bug-importer wenson_hsieh oldest_to_newest 1697133 0 thorton 2020-10-12 17:50:42 -0700 Fix the macCatalyst build ("reference to 'Rect' is ambiguous") 1697134 1 411182 thorton 2020-10-12 17:50:57 -0700 Created attachment 411182 Patch 1697135 2 thorton 2020-10-12 17:50:59 -0700 <rdar://problem/70224629> 1697145 3 ews-feeder 2020-10-12 18:55:35 -0700 Committed r268381: <https://trac.webkit.org/changeset/268381> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411182. 411182 2020-10-12 17:50:57 -0700 2020-10-12 18:55:36 -0700 Patch bug-217642-20201012175056.patch text/plain 4041 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkY2MwNWJiMzMwNzkzOTJl ODFiYTlkMzAxZTJiNzljM2EyMzdmNmEuLjM0ODIzNzZjODdjZTQxOWYxZTNkNGNlNDE0NGE0Y2Jl NWY5ZDczODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMTAtMTIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHRoZSBtYWNDYXRh bHlzdCBidWlsZCAoInJlZmVyZW5jZSB0byAnUmVjdCcgaXMgYW1iaWd1b3VzIikKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzY0MgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNzAyMjQ2Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENv bnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgaW5pdFdpdGhWaWV3OmRhdGVQ aWNrZXJNb2RlOl0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIHNob3VsZFByZXNlbnRH cmVnb3JpYW5DYWxlbmRhcjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBjb250cm9s QmVnaW5FZGl0aW5nXSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wgaW5pdFdp dGhWaWV3Ol0pOgorICAgICAgICBBbiBlYXJsaWVyIHVuaWZpZWQgc291cmNlJ3MgYHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlYCBpbnNpZGUgYG5hbWVzcGFjZSBXZWJLaXRgCisgICAgICAgIGFuZCB0 aGVuIFdLRGF0ZVRpbWVJbnB1dENvbnRyb2wncyBgdXNpbmcgbmFtZXNwYWNlIFdlYktpdGAgaW4g dGhlIGdsb2JhbCBuYW1lc3BhY2UKKyAgICAgICAgcmVzdWx0ZWQgaW4gb25jZS1hZ2FpbiBjb25m bGljdGluZyBkZWZpbml0aW9ucyBvZiBgUmVjdGAgYmV0d2VlbiBDU1MKKyAgICAgICAgY29kZSBh bmQgTWFjVHlwZXMuaC4KKwogMjAyMC0xMC0xMiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggYWZ0ZXIgcjI2ODM2Ny4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRD b250cm9sLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJ bnB1dENvbnRyb2wubW0KaW5kZXggZGU2NjNmZGY2MmYyYjc5N2UxNDUzYTZkYzhkYWY1YjgyYjQ2 NzU0ZC4uZTQwMjk0ZTBkMTU5Yjc4NzNjOGE5Y2IxMDE1NTE3ZjhiMWZiYTFmYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRy b2wubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJ bnB1dENvbnRyb2wubW0KQEAgLTM5LDggKzM5LDYgQEAKICNpbXBvcnQgPGFsZ29yaXRobT4KICNp bXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAotdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKLQogQGlu dGVyZmFjZSBXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciA6IFVJVmlld0NvbnRy b2xsZXIKIEBlbmQKIApAQCAtMTE3LDE3ICsxMTUsMTcgQEAgLSAoaWQpaW5pdFdpdGhWaWV3OihX S0NvbnRlbnRWaWV3ICopdmlldyBkYXRlUGlja2VyTW9kZTooVUlEYXRlUGlja2VyTW9kZSltb2Rl CiAgICAgX3Nob3VsZFJlbW92ZVRpbWVab25lSW5mb3JtYXRpb24gPSBOTzsKICAgICBfaXNUaW1l SW5wdXQgPSBOTzsKICAgICBzd2l0Y2ggKHZpZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5l bGVtZW50VHlwZSkgewotICAgIGNhc2UgSW5wdXRUeXBlOjpEYXRlOgorICAgIGNhc2UgV2ViS2l0 OjpJbnB1dFR5cGU6OkRhdGU6CiAgICAgICAgIF9mb3JtYXRTdHJpbmcgPSBrRGF0ZUZvcm1hdFN0 cmluZzsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBJbnB1dFR5cGU6Ok1vbnRoOgorICAgIGNh c2UgV2ViS2l0OjpJbnB1dFR5cGU6Ok1vbnRoOgogICAgICAgICBfZm9ybWF0U3RyaW5nID0ga01v bnRoRm9ybWF0U3RyaW5nOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIElucHV0VHlwZTo6VGlt ZToKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lOgogICAgICAgICBfZm9ybWF0U3Ry aW5nID0ga1RpbWVGb3JtYXRTdHJpbmc7CiAgICAgICAgIF9pc1RpbWVJbnB1dCA9IFlFUzsKICAg ICAgICAgYnJlYWs7Ci0gICAgY2FzZSBJbnB1dFR5cGU6OkRhdGVUaW1lTG9jYWw6CisgICAgY2Fz ZSBXZWJLaXQ6OklucHV0VHlwZTo6RGF0ZVRpbWVMb2NhbDoKICAgICAgICAgX3Nob3VsZFJlbW92 ZVRpbWVab25lSW5mb3JtYXRpb24gPSBZRVM7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6 CkBAIC0zMDcsNyArMzA1LDcgQEAgLSAodm9pZClkZWFsbG9jCiAgICAgW3N1cGVyIGRlYWxsb2Nd OwogfQogCi0tIChCT09MKXNob3VsZFByZXNlbnRHcmVnb3JpYW5DYWxlbmRhcjooY29uc3QgRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYpbm9kZUluZm8KKy0gKEJPT0wpc2hvdWxkUHJlc2VudEdy ZWdvcmlhbkNhbGVuZGFyOihjb25zdCBXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24m KW5vZGVJbmZvCiB7CiAgICAgcmV0dXJuIG5vZGVJbmZvLmF1dG9maWxsRmllbGROYW1lID09IFdl YkNvcmU6OkF1dG9maWxsRmllbGROYW1lOjpDY0V4cE1vbnRoCiAgICAgICAgIHx8IG5vZGVJbmZv LmF1dG9maWxsRmllbGROYW1lID09IFdlYkNvcmU6OkF1dG9maWxsRmllbGROYW1lOjpDY0V4cApA QCAtNDA0LDcgKzQwMiw3IEBAIC0gKHZvaWQpY29udHJvbEJlZ2luRWRpdGluZwogICAgIF9wcmVz ZW50aW5nID0gWUVTOwogCiAgICAgYXV0byBlbGVtZW50VHlwZSA9IF92aWV3LmZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGU7Ci0gICAgaWYgKGVsZW1lbnRUeXBlID09IElucHV0 VHlwZTo6VGltZSB8fCBlbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6OkRhdGVUaW1lTG9jYWwpCisg ICAgaWYgKGVsZW1lbnRUeXBlID09IFdlYktpdDo6SW5wdXRUeXBlOjpUaW1lIHx8IGVsZW1lbnRU eXBlID09IFdlYktpdDo6SW5wdXRUeXBlOjpEYXRlVGltZUxvY2FsKQogICAgICAgICBbX3ZpZXcg c3RhcnRSZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50XTsKIAogICAg IC8vIFNldCB0aGUgdGltZSB6b25lIGluIGNhc2UgaXQgY2hhbmdlZC4KQEAgLTQ1NiwxNiArNDU0 LDE2IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3 CiAgICAgVUlEYXRlUGlja2VyTW9kZSBtb2RlOwogCiAgICAgc3dpdGNoICh2aWV3LmZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHsKLSAgICBjYXNlIElucHV0VHlwZTo6RGF0 ZToKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpEYXRlOgogICAgICAgICBtb2RlID0gVUlE YXRlUGlja2VyTW9kZURhdGU7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgSW5wdXRUeXBlOjpE YXRlVGltZUxvY2FsOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6OkRhdGVUaW1lTG9jYWw6 CiAgICAgICAgIG1vZGUgPSBVSURhdGVQaWNrZXJNb2RlRGF0ZUFuZFRpbWU7CiAgICAgICAgIGJy ZWFrOwotICAgIGNhc2UgSW5wdXRUeXBlOjpUaW1lOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5 cGU6OlRpbWU6CiAgICAgICAgIG1vZGUgPSBVSURhdGVQaWNrZXJNb2RlVGltZTsKICAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBJbnB1dFR5cGU6Ok1vbnRoOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1 dFR5cGU6Ok1vbnRoOgogICAgICAgICBtb2RlID0gKFVJRGF0ZVBpY2tlck1vZGUpVUlEYXRlUGlj a2VyTW9kZVllYXJBbmRNb250aDsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoK