230300 2021-09-15 01:53:00 -0700 Remove the "Replace WebKitAdditions in Framework Headers" build phase 2021-09-15 02:54:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=230198 InRadar P2 Normal --- 1 thorton thorton mitz sam simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1793639 0 thorton 2021-09-15 01:53:00 -0700 Remove the "Replace WebKitAdditions in Framework Headers" build phase 1793640 1 438226 thorton 2021-09-15 01:54:21 -0700 Created attachment 438226 Patch 1793650 2 ews-feeder 2021-09-15 02:53:33 -0700 Committed r282446 (241699@main): <https://commits.webkit.org/241699@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438226. 1793651 3 webkit-bug-importer 2021-09-15 02:54:59 -0700 <rdar://problem/83140190> 438226 2021-09-15 01:54:21 -0700 2021-09-15 02:53:34 -0700 Patch bug-230300-20210915015420.patch text/plain 7539 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNkZDQ4ODM2NDg4MGUxOTMx MWJkZWM3YWY1YjczNGUzNjIxNmYxOTIuLmQ3MGFiNDgxODIzZjE1M2FhNTcwMmI4NjNhNGI3NGEy N2JhYjZlMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDktMTUgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRoZSAiUmVw bGFjZSBXZWJLaXRBZGRpdGlvbnMgaW4gRnJhbWV3b3JrIEhlYWRlcnMiIGJ1aWxkIHBoYXNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzMDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdC54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIG1hYy9yZXBsYWNlLXdlYmtpdC1h ZGRpdGlvbnMtaW5jbHVkZXMucHk6IFJlbW92ZWQuCisgICAgICAgIEFzIFdlbnNvbiBwb2ludGVk IG91dCBpbiBidWcgMjMwMTk4LCB0aGlzIGJ1aWxkIHBoYXNlIGlzIGN1cnJlbnRseSB1bnVzZWQu CisgICAgICAgIEl0J3MgYWxzbyB3YXN0aW5nIGEgcXVhcnRlciBvZiB0aGUgV2ViS2l0LW9ubHkg bnVsbCBidWlsZCB0aW1lLCBzbyBsZXQncworICAgICAgICBqdXN0IHJlbW92ZSBpdCBhbmQgaG9w ZSB3ZSBuZXZlciBuZWVkIGl0IGFnYWluIChidXQgaWYgd2UgZG8sIGl0J3MgaW4gdGhlIGhpc3Rv cnkhKS4KKyAgICAgICAgVGhpcyBnZXRzIHVzIGRvd24gdG8gMTEgc2Vjb25kcyBvbiB0aGUgc2Ft ZSBiZW5jaG1hcmsgbWVudGlvbmVkIGluIHIyODIzNjcuCisKIDIwMjEtMDktMTMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBSZWR1Y2UgYW1vdW50IG9m IElQQyBuZWVkZWQgYnkgQnJvYWRjYXN0Q2hhbm5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0 Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDVkODgzMGIyY2I5NGJhOWRkZGUxOWU3 MjA1N2Q0Y2IzMDNmYzU5Ny4uNzA4MWI4NDNmN2VjMDUyOTY2MmVmZjMzODg3MWM3MDZjNThhYTk2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC0xMzQxMiw3ICsxMzQxMiw2IEBACiAJCQkJMUE2MjgwQzgxOTE5OTU2QjAwNkFEOUY5IC8q IE1pZ3JhdGUgV2ViS2l0TGVnYWN5IEhlYWRlcnMgKi8sCiAJCQkJMzc1QTI0ODgxN0U1MDQ4RTAw QzlBMDg2IC8qIFBvc3Rwcm9jZXNzIFdLQmFzZS5oICovLAogCQkJCTFBRDk4RUNGMTkxRDg2NzMw MENBQTZERiAvKiBQb3N0cHJvY2VzcyBXS0ZvdW5kYXRpb24uaCAqLywKLQkJCQlGNEVGQkFENTIy NTQwQ0JCMDAwNDlCQTYgLyogUmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW4gRnJhbWV3b3JrIEhl YWRlcnMgKi8sCiAJCQkJMUExRDIxMTUxOTFEOTYzODAwMDE2MTlGIC8qIFBvc3Rwcm9jZXNzIEZy YW1ld29yayBIZWFkZXJzICovLAogCQkJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZENiAvKiBDb3B5 IEFkZGl0aW9uYWwgUmVzb3VyY2VzICovLAogCQkJCThEQzJFRjUyMDQ4NkE2OTQwMDk4QjIxNiAv KiBSZXNvdXJjZXMgKi8sCkBAIC0xNDI1MCwyMCArMTQyNDksNiBAQAogCQkJc2hlbGxQYXRoID0g L2Jpbi9zaDsKIAkJCXNoZWxsU2NyaXB0ID0gImVjaG8gXCJQcmVwcm9jZXNzaW5nIHNhbmRib3hc IlxuU2NyaXB0cy9nZW5lcmF0ZS1kZXJpdmVkLXNvdXJjZXMuc2ggc2FuZGJveC1wcm9maWxlcy1p b3NcbmNwICR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL2NvbS5h cHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYiAke0RTVFJPT1R9LyR7SU5TVEFMTF9QQVRIfVxuIjsK IAkJfTsKLQkJRjRFRkJBRDUyMjU0MENCQjAwMDQ5QkE2IC8qIFJlcGxhY2UgV2ViS2l0QWRkaXRp b25zIGluIEZyYW1ld29yayBIZWFkZXJzICovID0gewotCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRC dWlsZFBoYXNlOwotCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKLQkJCWZpbGVzID0g KAotCQkJKTsKLQkJCWlucHV0UGF0aHMgPSAoCi0JCQkpOwotCQkJbmFtZSA9ICJSZXBsYWNlIFdl YktpdEFkZGl0aW9ucyBpbiBGcmFtZXdvcmsgSGVhZGVycyI7Ci0JCQlvdXRwdXRQYXRocyA9ICgK LQkJCSk7Ci0JCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKLQkJCXNo ZWxsUGF0aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlwdCA9ICJpZiBbIFwiJHtYQ09ERV9WRVJT SU9OX0FDVFVBTH1cIiAtZ2UgXCIxMTQwXCIgLWEgXCIke1dLX1VTRV9ORVdfQlVJTERfU1lTVEVN fVwiID0gXCJZRVNcIiBdOyB0aGVuXG4gICAgIyBJbiB0aGlzIGNvbmZpZ3VyYXRpb24sIHBvc3Qt cHJvY2Vzc2luZyBpcyBwZXJmb3JtZWQgYXQgdGhlIHNhbWUgdGltZSBhcyBjb3B5aW5nIGluIHRo ZSBwb3N0cHJvY2Vzcy1oZWFkZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJlJ3Mgbm8gbmVlZCBmb3Ig dGhpcyBzZXBhcmF0ZSBzdGVwLlxuICAgIGV4aXQgMFxuZmlcblxuaWYgWyBcIiR7QUNUSU9OfVwi ID0gXCJhbmFseXplXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiYnVpbGRcIiAtbyBcIiR7QUNUSU9O fVwiID0gXCJpbnN0YWxsXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGhkcnNcIiAtbyBc IiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsYXBpXCIgXTsgdGhlblxuICAgIGZvciBIRUFERVJTX0RJ UkVDVE9SWSBpbiBcIiR7UFVCTElDX0hFQURFUlNfRk9MREVSX1BBVEh9XCIgXCIke1BSSVZBVEVf SEVBREVSU19GT0xERVJfUEFUSH1cIjsgZG9cbiAgICAgICAgZm9yIEhFQURFUl9QQVRIIGluIFwi JHtUQVJHRVRfQlVJTERfRElSfS8ke0hFQURFUlNfRElSRUNUT1JZfS9cIiouKjsgZG9cbiAgICAg ICAgICAgIGlmIFtbICEgLXogYGdyZXAgJyNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy8uKj4nIFwi JHtIRUFERVJfUEFUSH1cImAgXV07IHRoZW5cbiAgICAgICAgICAgICAgICBweXRob24gXCIke1NS Q1JPT1R9L21hYy9yZXBsYWNlLXdlYmtpdC1hZGRpdGlvbnMtaW5jbHVkZXMucHlcIiBcIiR7SEVB REVSX1BBVEh9XCIgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn1cIiBcIiR7U0RLUk9PVH1cIiB8fCBl eGl0ICQ/XG4gICAgICAgICAgICBmaVxuICAgICAgICBkb25lXG4gICAgZG9uZVxuZmlcblxuXG4i OwotCQl9OwogLyogRW5kIFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZSBzZWN0aW9uICovCiAKIC8q IEJlZ2luIFBCWFNvdXJjZXNCdWlsZFBoYXNlIHNlY3Rpb24gKi8KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL3JlcGxhY2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weSBiL1NvdXJj ZS9XZWJLaXQvbWFjL3JlcGxhY2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weQpkZWxldGVk IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggZWQzMzljNTUxYTU3MjhhZDMzNjBkYmZjMzQ5MjAzZDVi MTBiYjFkZS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9yZXBsYWNlLXdlYmtpdC1hZGRpdGlvbnMtaW5jbHVkZXMucHkKKysr IC9kZXYvbnVsbApAQCAtMSw4OCArMCwwIEBACi0jIS91c3IvYmluL2VudiBweXRob24KLSMKLSMg Q29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSMKLSMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0Ci0jIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotIyBhcmUgbWV0OgotIyAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu Ci0jIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0Ci0jICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSMgICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSMKLSMg VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJwotIyBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSMgVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotIyBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05U UklCVVRPUlMKLSMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotIyBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotIyBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MKLSMgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4KLSMgQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSMgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgot IyBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0jCi0KLWltcG9ydCBvcwotaW1wb3J0 IHJlCi1pbXBvcnQgc3lzCi0KLQotZGVmIHJlYWRfY29udGVudF9mcm9tX3dlYmtpdF9hZGRpdGlv bnMoYnVpbHRfcHJvZHVjdHNfZGlyZWN0b3J5LCBzZGtfcm9vdF9kaXJlY3RvcnksIGZpbGVuYW1l KToKLSAgICBhZGRpdGlvbnNfcGF0aCA9IG9zLnBhdGguam9pbigidXNyL2xvY2FsL2luY2x1ZGUv V2ViS2l0QWRkaXRpb25zIiwgZmlsZW5hbWUpCi0gICAgdHJ5OgotICAgICAgICBmaWxlX2luX2J1 aWxkX2RpcmVjdG9yeSA9IG9wZW4ob3MucGF0aC5qb2luKGJ1aWx0X3Byb2R1Y3RzX2RpcmVjdG9y eSwgYWRkaXRpb25zX3BhdGgpLCAiciIpCi0gICAgICAgIHJldHVybiBmaWxlX2luX2J1aWxkX2Rp cmVjdG9yeS5yZWFkKCkKLSAgICBleGNlcHQ6Ci0gICAgICAgIHRyeToKLSAgICAgICAgICAgIGZp bGVfaW5fc2RrX3Jvb3QgPSBvcGVuKG9zLnBhdGguam9pbihzZGtfcm9vdF9kaXJlY3RvcnksIGFk ZGl0aW9uc19wYXRoKSwgInIiKQotICAgICAgICAgICAgcmV0dXJuIGZpbGVfaW5fc2RrX3Jvb3Qu cmVhZCgpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHJldHVybiAiIgotCi0KLWRlZiBt YWluKGFyZ3Y9Tm9uZSk6Ci0gICAgaWYgbm90IGFyZ3Y6Ci0gICAgICAgIGFyZ3YgPSBzeXMuYXJn dgotCi0gICAgaWYgbGVuKGFyZ3YpICE9IDQ6Ci0gICAgICAgIHByaW50KCJVc2FnZTogcmVwbGFj ZS13ZWJraXQtYWRkaXRpb25zLWluY2x1ZGVzLnB5IDxoZWFkZXJfcGF0aD4gPGJ1aWx0X3Byb2R1 Y3RzX2RpcmVjdG9yeT4gPHNka19yb290X2RpcmVjdG9yeT4iKQotICAgICAgICByZXR1cm4gMQot Ci0gICAgaGVhZGVyX3BhdGggPSBhcmd2WzFdCi0gICAgYnVpbHRfcHJvZHVjdHNfZGlyZWN0b3J5 ID0gYXJndlsyXQotICAgIHNka19yb290X2RpcmVjdG9yeSA9IGFyZ3ZbM10KLSAgICBpZiBub3Qg bGVuKGhlYWRlcl9wYXRoKToKLSAgICAgICAgcHJpbnQoIiglcyk6IGhlYWRlciBwYXRoIHVuc3Bl Y2lmaWVkIiAlIGFyZ3ZbMF0pCi0gICAgICAgIHJldHVybiAxCi0KLSAgICBpZiBub3QgbGVuKGJ1 aWx0X3Byb2R1Y3RzX2RpcmVjdG9yeSk6Ci0gICAgICAgIHByaW50KCIoJXMpOiBidWlsdCBwcm9k dWN0cyBkaXJlY3RvcnkgdW5zcGVjaWZpZWQiICUgYXJndlswXSkKLSAgICAgICAgcmV0dXJuIDEK LQotICAgIGlmIG5vdCBsZW4oc2RrX3Jvb3RfZGlyZWN0b3J5KToKLSAgICAgICAgcHJpbnQoIigl cyk6IFNESyByb290IGRpcmVjdG9yeSB1bnNwZWNpZmllZCIgJSBhcmd2WzBdKQotICAgICAgICBy ZXR1cm4gMQotCi0gICAgYWRkaXRpb25zX2ltcG9ydF9wYXR0ZXJuID0gcmUuY29tcGlsZShyIlwj aWYgVVNFXChBUFBMRV9JTlRFUk5BTF9TREtcKVxuI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zLygu Kik+XG4jZW5kaWYiKQotICAgIHRyeToKLSAgICAgICAgd2l0aCBvcGVuKGhlYWRlcl9wYXRoLCAi ciIpIGFzIGhlYWRlcjoKLSAgICAgICAgICAgIGhlYWRlcl9jb250ZW50cyA9IGhlYWRlci5yZWFk KCkKLSAgICAgICAgICAgIG1hdGNoID0gYWRkaXRpb25zX2ltcG9ydF9wYXR0ZXJuLnNlYXJjaCho ZWFkZXJfY29udGVudHMpCi0gICAgICAgICAgICB3aGlsZSBtYXRjaDoKLSAgICAgICAgICAgICAg ICBoZWFkZXJfY29udGVudHMgPSBoZWFkZXJfY29udGVudHNbOm1hdGNoLnN0YXJ0KCldICsgcmVh ZF9jb250ZW50X2Zyb21fd2Via2l0X2FkZGl0aW9ucyhidWlsdF9wcm9kdWN0c19kaXJlY3Rvcnks IHNka19yb290X2RpcmVjdG9yeSwgbWF0Y2guZ3JvdXBzKClbMF0pICsgaGVhZGVyX2NvbnRlbnRz W21hdGNoLmVuZCgpOl0KLSAgICAgICAgICAgICAgICBtYXRjaCA9IGFkZGl0aW9uc19pbXBvcnRf cGF0dGVybi5zZWFyY2goaGVhZGVyX2NvbnRlbnRzKQotICAgICAgICAgICAgdHJ5OgotICAgICAg ICAgICAgICAgIHdpdGggb3BlbihoZWFkZXJfcGF0aCwgInciKSBhcyBoZWFkZXI6Ci0gICAgICAg ICAgICAgICAgICAgIGhlYWRlci53cml0ZShoZWFkZXJfY29udGVudHMpCi0gICAgICAgICAgICBl eGNlcHQ6Ci0gICAgICAgICAgICAgICAgcHJpbnQoIiglcyk6IGZhaWxlZCB0byB3cml0ZSB0byBm aWxlOiAlcyIgJSAoYXJndlswXSwgaGVhZGVyX3BhdGgpKQotICAgICAgICAgICAgICAgIHJldHVy biAxCi0gICAgICAgIHJldHVybiAwCi0gICAgZXhjZXB0OgotICAgICAgICBwcmludCgiKCVzKTog ZmFpbGVkIHRvIHJlYWQgZmlsZTogJXMiICUgKGFyZ3ZbMF0sIGhlYWRlcl9wYXRoKSkKLSAgICAg ICAgcmV0dXJuIDEKLQotaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKLSAgICBzeXMuZXhpdCht YWluKHN5cy5hcmd2KSkK