230373 2021-09-16 14:24:00 -0700 [Mac Catalyst] Fix build issue 2021-09-17 10:13:42 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham darin thorton webkit-bug-importer oldest_to_newest 1794204 0 pvollan 2021-09-16 14:24:00 -0700 There's an issue with the Mac Catalyst build where LSSessionID is being redefined. Address this by removing the second definition, and moving the related function into the open source section. 1794205 1 pvollan 2021-09-16 14:24:17 -0700 <rdar://83126967> 1794207 2 438402 pvollan 2021-09-16 14:29:25 -0700 Created attachment 438402 Patch 1794232 3 438406 pvollan 2021-09-16 15:29:58 -0700 Created attachment 438406 Patch 1794482 4 pvollan 2021-09-17 10:08:12 -0700 Thanks for reviewing! 1794484 5 ews-feeder 2021-09-17 10:13:41 -0700 Committed r282665 (241806@main): <https://commits.webkit.org/241806@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438406. 438402 2021-09-16 14:29:25 -0700 2021-09-16 15:52:12 -0700 Patch bug-230373-20210916142924.patch text/plain 1836 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjgyNjAwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA5 LTE2ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFj IENhdGFseXN0XSBGaXggYnVpbGQgaXNzdWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDM3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZXJlJ3MgYW4gaXNzdWUgd2l0aCB0aGUgTWFjIENhdGFseXN0 IGJ1aWxkIHdoZXJlIExTU2Vzc2lvbklEIGlzIGJlaW5nIHJlZGVmaW5lZC4gQWRkcmVzcyB0aGlz IGJ5IHJlbW92aW5nIHRoZSBzZWNvbmQgZGVmaW5pdGlvbiwKKyAgICAgICAgYW5kIG1vdmluZyB0 aGUgcmVsYXRlZCBmdW5jdGlvbiBpbnRvIHRoZSBvcGVuIHNvdXJjZSBzZWN0aW9uLgorCisgICAg ICAgICogcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oOgorCiAyMDIxLTA5LTE2ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkanVzdCBB UktJVF9JTkxJTkVfUFJFVklFVyogY29tcGlsZSB0aW1lIGZsYWdzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmgJKHJl dmlzaW9uIDI4MjU5NykKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0xhdW5j aFNlcnZpY2VzU1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDYgKzc5LDggQEAgZW51bSBMU1Nl c3Npb25JRCB7CiBlbnVtIHsKICAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RDb25u ZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAogfTsKKworQ0ZEaWN0aW9uYXJ5UmVmIF9MU0FwcGxp Y2F0aW9uQ2hlY2tJbihMU1Nlc3Npb25JRCwgQ0ZEaWN0aW9uYXJ5UmVmIGFwcGxpY2F0aW9uSW5m byk7CiAjZW5kaWYKIAogI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCkBAIC0xMjUsMTcgKzEy NywxMCBAQCBXVEZfRVhURVJOX0NfRU5ECiAKICNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JN KE1BQ0NBVEFMWVNUKQogCi0jaWYgUExBVEZPUk0oTUFDQ0FUQUxZU1QpICYmIFVTRShBUFBMRV9J TlRFUk5BTF9TREspCi1lbnVtIExTU2Vzc2lvbklEIHsKLSAgICBrTFNEZWZhdWx0U2Vzc2lvbklE ID0gLTIsCi19OwotI2VuZGlmCi0KIFdURl9FWFRFUk5fQ19CRUdJTgogCiB0eXBlZGVmIGJvb2wg KF5MU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2spIChDRkRpY3Rpb25hcnlSZWYgb3B0aW9u c1JlZik7CiB2b2lkIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0 aW9uU3RhdHVzKHVpbnQ2NF90IGZsYWdzLCBMU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2sg YmxvY2spOwotQ0ZEaWN0aW9uYXJ5UmVmIF9MU0FwcGxpY2F0aW9uQ2hlY2tJbihMU1Nlc3Npb25J RCBzZXNzaW9uSUQsIENGRGljdGlvbmFyeVJlZiBhcHBsaWNhdGlvbkluZm8pOwogCiBXVEZfRVhU RVJOX0NfRU5ECiAK 438406 2021-09-16 15:29:58 -0700 2021-09-17 10:13:42 -0700 Patch bug-230373-20210916152957.patch text/plain 1881 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjgyNjAwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA5 LTE2ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFj IENhdGFseXN0XSBGaXggYnVpbGQgaXNzdWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDM3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZXJlJ3MgYW4gaXNzdWUgd2l0aCB0aGUgTWFjIENhdGFseXN0 IGJ1aWxkIHdoZXJlIExTU2Vzc2lvbklEIGlzIGJlaW5nIHJlZGVmaW5lZC4gQWRkcmVzcyB0aGlz IGJ5IHJlbW92aW5nIHRoZSBzZWNvbmQgZGVmaW5pdGlvbiwKKyAgICAgICAgYW5kIG1vdmluZyB0 aGUgcmVsYXRlZCBmdW5jdGlvbiBpbnRvIHRoZSBvcGVuIHNvdXJjZSBzZWN0aW9uLgorCisgICAg ICAgICogcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oOgorCiAyMDIxLTA5LTE2ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkanVzdCBB UktJVF9JTkxJTkVfUFJFVklFVyogY29tcGlsZSB0aW1lIGZsYWdzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmgJKHJl dmlzaW9uIDI4MjU5NykKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0xhdW5j aFNlcnZpY2VzU1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDYgKzc5LDEzIEBAIGVudW0gTFNT ZXNzaW9uSUQgewogZW51bSB7CiAgICAga0xTU2VydmVyQ29ubmVjdGlvblN0YXR1c0RvTm90Q29u bmVjdFRvU2VydmVyTWFzayA9IDB4MVVMTCwKIH07CisKK1dURl9FWFRFUk5fQ19CRUdJTgorCitD RkRpY3Rpb25hcnlSZWYgX0xTQXBwbGljYXRpb25DaGVja0luKExTU2Vzc2lvbklELCBDRkRpY3Rp b25hcnlSZWYgYXBwbGljYXRpb25JbmZvKTsKKworV1RGX0VYVEVSTl9DX0VORAorCiAjZW5kaWYK IAogI2lmIEhBVkUoTFNEQVRBQkFTRUNPTlRFWFQpCkBAIC0xMjUsMTcgKzEzMiwxMCBAQCBXVEZf RVhURVJOX0NfRU5ECiAKICNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKE1BQ0NBVEFMWVNU KQogCi0jaWYgUExBVEZPUk0oTUFDQ0FUQUxZU1QpICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREsp Ci1lbnVtIExTU2Vzc2lvbklEIHsKLSAgICBrTFNEZWZhdWx0U2Vzc2lvbklEID0gLTIsCi19Owot I2VuZGlmCi0KIFdURl9FWFRFUk5fQ19CRUdJTgogCiB0eXBlZGVmIGJvb2wgKF5MU1NlcnZlckNv bm5lY3Rpb25BbGxvd2VkQmxvY2spIChDRkRpY3Rpb25hcnlSZWYgb3B0aW9uc1JlZik7CiB2b2lk IF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzKHVp bnQ2NF90IGZsYWdzLCBMU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2sgYmxvY2spOwotQ0ZE aWN0aW9uYXJ5UmVmIF9MU0FwcGxpY2F0aW9uQ2hlY2tJbihMU1Nlc3Npb25JRCBzZXNzaW9uSUQs IENGRGljdGlvbmFyeVJlZiBhcHBsaWNhdGlvbkluZm8pOwogCiBXVEZfRVhURVJOX0NfRU5ECiAK