231589 2021-10-12 10:20:01 -0700 Fix build with differently unified souces 2021-10-12 11:46:57 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen simon.fraser webkit-bug-importer oldest_to_newest 1803200 0 achristensen 2021-10-12 10:20:01 -0700 Fix build with differently unified souces 1803201 1 440951 achristensen 2021-10-12 10:20:43 -0700 Created attachment 440951 Patch 1803271 2 ews-feeder 2021-10-12 11:45:04 -0700 Committed r283995 (242839@main): <https://commits.webkit.org/242839@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440951. 1803275 3 webkit-bug-importer 2021-10-12 11:46:57 -0700 <rdar://problem/84159003> 440951 2021-10-12 10:20:43 -0700 2021-10-12 11:45:05 -0700 Patch bug-231589-20211012112042.patch text/plain 2877 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4Mzk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEwLTEyICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGJ1aWxk IHdpdGggZGlmZmVyZW50bHkgdW5pZmllZCBzb3VjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIHNoYWRvd1BhaW50aW5nRXh0ZW50IHdhcyBvbmx5IGRl ZmluZWQgaW4gRGlzcGxheUxpc3RSZWNvcmRlci5jcHAgYW5kIG9ubHkgdXNlZCBpbiBEaXNwbGF5 TGlzdFJlY29yZGVySW1wbC5jcHAKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3Bs YXlMaXN0OjpzaGFkb3dQYWludGluZ0V4dGVudCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXJJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpzaGFkb3dQYWludGluZ0V4dGVudCk6CisKIDIw MjEtMTAtMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgSGF2ZSB0aGUgU2Nyb2xsaW5nVHJlZSB0cmFjayBub2RlcyB3aXRoIGFuaW1hdGVkIHNjcm9s bHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9E aXNwbGF5TGlzdFJlY29yZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAJKHJldmlz aW9uIDI4MzkzOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXls aXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAxLDE2ICs1 MDEsNiBAQCBGbG9hdFJlY3QgUmVjb3JkZXI6OnJvdW5kVG9EZXZpY2VQaXhlbHMoCiAgICAgcmV0 dXJuIHJlY3Q7CiB9CiAKLS8vIEZJWE1FOiBzaGFyZSB3aXRoIFNoYWRvd0RhdGEKLXN0YXRpYyBp bmxpbmUgZmxvYXQgc2hhZG93UGFpbnRpbmdFeHRlbnQoZmxvYXQgYmx1clJhZGl1cykKLXsKLSAg ICAvLyBCbHVycmluZyB1c2VzIGEgR2F1c3NpYW4gZnVuY3Rpb24gd2hvc2Ugc3RkLiBkZXZpYXRp b24gaXMgbV9yYWRpdXMvMiwgYW5kIHdoaWNoIGluIHRoZW9yeQotICAgIC8vIGV4dGVuZHMgdG8g aW5maW5pdHkuIEluIDgtYml0IGNvbnRleHRzLCBob3dldmVyLCByb3VuZGluZyBjYXVzZXMgdGhl IGVmZmVjdCB0byBiZWNvbWUKLSAgICAvLyB1bmRldGVjdGFibGUgYXQgYXJvdW5kIDEuNHggdGhl IHJhZGl1cy4KLSAgICBjb25zdCBmbG9hdCByYWRpdXNFeHRlbnRNdWx0aXBsaWVyID0gMS40Owot ICAgIHJldHVybiBjZWlsZihibHVyUmFkaXVzICogcmFkaXVzRXh0ZW50TXVsdGlwbGllcik7Ci19 Ci0KIGNvbnN0IFJlY29yZGVyOjpDb250ZXh0U3RhdGUmIFJlY29yZGVyOjpjdXJyZW50U3RhdGUo KSBjb25zdAogewogICAgIEFTU0VSVChtX3N0YXRlU3RhY2suc2l6ZSgpKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29y ZGVySW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXJJbXBsLmNwcAkocmV2aXNpb24gMjgz OTM4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rp c3BsYXlMaXN0UmVjb3JkZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQxLDYgKzQ0MSwx NiBAQCB2b2lkIFJlY29yZGVySW1wbDo6cmVjb3JkUmVzb3VyY2VVc2UoSW1hCiAgICAgbV9kaXNw bGF5TGlzdC5jYWNoZUltYWdlQnVmZmVyKGltYWdlQnVmZmVyKTsKIH0KIAorLy8gRklYTUU6IHNo YXJlIHdpdGggU2hhZG93RGF0YQorc3RhdGljIGlubGluZSBmbG9hdCBzaGFkb3dQYWludGluZ0V4 dGVudChmbG9hdCBibHVyUmFkaXVzKQoreworICAgIC8vIEJsdXJyaW5nIHVzZXMgYSBHYXVzc2lh biBmdW5jdGlvbiB3aG9zZSBzdGQuIGRldmlhdGlvbiBpcyBtX3JhZGl1cy8yLCBhbmQgd2hpY2gg aW4gdGhlb3J5CisgICAgLy8gZXh0ZW5kcyB0byBpbmZpbml0eS4gSW4gOC1iaXQgY29udGV4dHMs IGhvd2V2ZXIsIHJvdW5kaW5nIGNhdXNlcyB0aGUgZWZmZWN0IHRvIGJlY29tZQorICAgIC8vIHVu ZGV0ZWN0YWJsZSBhdCBhcm91bmQgMS40eCB0aGUgcmFkaXVzLgorICAgIGNvbnN0IGZsb2F0IHJh ZGl1c0V4dGVudE11bHRpcGxpZXIgPSAxLjQ7CisgICAgcmV0dXJuIGNlaWxmKGJsdXJSYWRpdXMg KiByYWRpdXNFeHRlbnRNdWx0aXBsaWVyKTsKK30KKwogRmxvYXRSZWN0IFJlY29yZGVySW1wbDo6 ZXh0ZW50RnJvbUxvY2FsQm91bmRzKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkgY29uc3QKIHsKICAg ICBGbG9hdFJlY3QgYm91bmRzID0gcmVjdDsK