200799 2019-08-15 17:04:50 -0700 [FTW] Enable CoreFoundation use if building for Apple target 2019-08-15 18:51:21 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue dino pvollan webkit-bug-importer oldest_to_newest 1561837 0 bfulgham 2019-08-15 17:04:50 -0700 This patch adds the last bits to get a semi-working MiniBrowser running with FTW. 1561843 1 bfulgham 2019-08-15 17:13:35 -0700 Actually, that was done previously -- this just makes it possible to use CF, which is needed for preferences. 1561848 2 376449 bfulgham 2019-08-15 17:30:28 -0700 Created attachment 376449 Patch 1561864 3 376449 achristensen 2019-08-15 17:45:48 -0700 Comment on attachment 376449 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376449&action=review > Source/cmake/OptionsFTW.cmake:218 > + find_package(LibXml2 2.9.1 REQUIRED) Isn't this just a minimum version? I think it would be fine if the minimum version were the same for apple and non-apple. > Source/cmake/OptionsFTW.cmake:-224 > - find_package(LibXslt 1.1.32 REQUIRED) ditto 1561877 4 376449 bfulgham 2019-08-15 18:20:35 -0700 Comment on attachment 376449 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376449&action=review >> Source/cmake/OptionsFTW.cmake:218 >> + find_package(LibXml2 2.9.1 REQUIRED) > > Isn't this just a minimum version? I think it would be fine if the minimum version were the same for apple and non-apple. The non-Apple number is what Sony is using.I wanted to keep the two distinct where our distributions are different, 1561892 5 376449 commit-queue 2019-08-15 18:50:11 -0700 Comment on attachment 376449 Patch Clearing flags on attachment: 376449 Committed r248755: <https://trac.webkit.org/changeset/248755> 1561893 6 commit-queue 2019-08-15 18:50:13 -0700 All reviewed patches have been landed. Closing bug. 1561895 7 webkit-bug-importer 2019-08-15 18:51:21 -0700 <rdar://problem/54373548> 376449 2019-08-15 17:30:28 -0700 2019-08-15 18:50:11 -0700 Patch bug-200799-20190815173028.patch text/plain 12475 bfulgham SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ4NzUwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBA CisyMDE5LTA4LTE1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAg ICAgIFtGVFddIEVuYWJsZSBDb3JlRm91bmRhdGlvbiB1c2UgaWYgYnVpbGRpbmcgZm9yIEFwcGxl IHRhcmdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAwNzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBQbGF0Zm9ybUZUVy5jbWFrZTogQWRkIG1pc3NpbmcgZmlsZXMuCisKIDIwMTktMDgtMTUgIEFs ZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIERhdGVDb252 ZXJzaW9uOjpmb3JtYXREYXRlVGltZSBpbmNvcnJlY3RseSBmb3JtYXRzIG5lZ2F0aXZlIHllYXJz CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1GVFcuY21ha2UKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtRlRXLmNtYWtlCShyZXZpc2lvbiAy NDg3NTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1GVFcuY21ha2UJKHdvcmtp bmcgY29weSkKQEAgLTcsNiArNywyNiBAQCBsaXN0KEFQUEVORCBKYXZhU2NyaXB0Q29yZV9QVUJM SUNfRlJBTUVXCiAgICAgQVBJL0phdmFTY3JpcHRDb3JlLmgKICkKIAoraWYgKFVTRV9DRikKKyAg ICBsaXN0KEFQUEVORCBKYXZhU2NyaXB0Q29yZV9TT1VSQ0VTCisgICAgICAgIEFQSS9KU1N0cmlu Z1JlZkNGLmNwcAorICAgICkKKworICAgIGxpc3QoQVBQRU5EIEphdmFTY3JpcHRDb3JlX1BVQkxJ Q19GUkFNRVdPUktfSEVBREVSUworICAgICAgICBBUEkvSlNTdHJpbmdSZWZDRi5oCisgICAgKQor CisgICAgbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfTElCUkFSSUVTCisgICAgICAgICR7Q09S RUZPVU5EQVRJT05fTElCUkFSWX0KKyAgICApCitlbmRpZiAoKQorCitpZiAoTk9UIFdURl9QTEFU Rk9STV9XSU5fQ0FJUk8pCisgICAgbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfTElCUkFSSUVT CisgICAgICAgIHdpbm1tCisgICAgKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9SRU1PVEVfSU5T UEVDVE9SKQogICAgIGxpc3QoQVBQRU5EIEphdmFTY3JpcHRDb3JlX1BSSVZBVEVfSU5DTFVERV9E SVJFQ1RPUklFUwogICAgICAgICAiJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L2luc3BlY3Rvci9yZW1v dGUvc29ja2V0IgpJbmRleDogU291cmNlL1dURi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dURi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODc1MCkKKysrIFNvdXJjZS9XVEYvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTktMDgtMTUgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZUV10gRW5hYmxlIENvcmVG b3VuZGF0aW9uIHVzZSBpZiBidWlsZGluZyBmb3IgQXBwbGUgdGFyZ2V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA3OTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUZUVy5jbWFr ZTogQWRkIG1pc3NpbmcgZmlsZXMuCisKIDIwMTktMDgtMTUgIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy NDg0NDAuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUZUVy5jbWFrZQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUZUVy5jbWFrZQkocmV2aXNpb24gMjQ4NzUwKQor KysgU291cmNlL1dURi93dGYvUGxhdGZvcm1GVFcuY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTMz LDQgKzMzLDI1IEBAIGxpc3QoQVBQRU5EIFdURl9TT1VSQ0VTCiAgICAgd2luL1dvcmtRdWV1ZVdp bi5jcHAKICkKIAoraWYgKFVTRV9DRikKKyAgICBsaXN0KEFQUEVORCBXVEZfUFVCTElDX0hFQURF UlMKKyAgICAgICAgY2YvQ0ZVUkxFeHRyYXMuaAorICAgICAgICBjZi9UeXBlQ2FzdHNDRi5oCisK KyAgICAgICAgdGV4dC9jZi9UZXh0QnJlYWtJdGVyYXRvckNGLmgKKyAgICApCisgICAgbGlzdChB UFBFTkQgV1RGX1NPVVJDRVMKKyAgICAgICAgY2YvQ0ZVUkxFeHRyYXMuY3BwCisgICAgICAgIGNm L0ZpbGVTeXN0ZW1DRi5jcHAKKyAgICAgICAgY2YvVVJMQ0YuY3BwCisKKyAgICAgICAgdGV4dC9j Zi9BdG9tU3RyaW5nSW1wbENGLmNwcAorICAgICAgICB0ZXh0L2NmL1N0cmluZ0NGLmNwcAorICAg ICAgICB0ZXh0L2NmL1N0cmluZ0ltcGxDRi5jcHAKKyAgICAgICAgdGV4dC9jZi9TdHJpbmdWaWV3 Q0YuY3BwCisgICAgKQorCisgICAgbGlzdChBUFBFTkQgV1RGX0xJQlJBUklFUyAke0NPUkVGT1VO REFUSU9OX0xJQlJBUll9KQorZW5kaWYgKCkKKwogc2V0KFdURl9PVVRQVVRfTkFNRSBXVEYke0RF QlVHX1NVRkZJWH0pCkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjQ4NzUwKQorKysgU291cmNlL1dl YktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxOS0wOC0x NSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbRlRXXSBF bmFibGUgQ29yZUZvdW5kYXRpb24gdXNlIGlmIGJ1aWxkaW5nIGZvciBBcHBsZSB0YXJnZXQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDc5OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgYnVp bGQgYW5kIHJlbW92ZSBhbiB1bnVzZWQgbWV0aG9kLgorCisgICAgICAgICogUGxhdGZvcm1GVFcu Y21ha2U6CisgICAgICAgICogU2hhcmVkL1NoYXJlYWJsZUJpdG1hcC5oOgorICAgICAgICAqIFNo YXJlZC93aW4vU2hhcmVhYmxlQml0bWFwRGlyZWN0MkQuY3BwOgorICAgICAgICAoV2ViS2l0OjpT aGFyZWFibGVCaXRtYXA6OmNyZWF0ZURpcmVjdDJEU3VyZmFjZSk6CisgICAgICAgIChXZWJLaXQ6 OlNoYXJlYWJsZUJpdG1hcDo6cmVsZWFzZVN1cmZhY2VEYXRhKTogRGVsZXRlZC4KKwogMjAxOS0w OC0xNSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBTb21lIGlt cHJvdmVtZW50cyBvbiB3ZWIgc3RvcmFnZQpJbmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9ybUZU Vy5jbWFrZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtRlRXLmNtYWtlCShy ZXZpc2lvbiAyNDg3NTApCisrKyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtRlRXLmNtYWtlCSh3b3Jr aW5nIGNvcHkpCkBAIC0yOTEsNiArMjkxLDcgQEAgc2V0KFdlYktpdF9QVUJMSUNfRlJBTUVXT1JL X0hFQURFUlMKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlTmF2aWdhdGlvbkNsaWVudC5oCiAg ICAgVUlQcm9jZXNzL0FQSS9DL1dLUGFnZVBvbGljeUNsaWVudC5oCiAgICAgVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZVByaXZhdGUuaAorICAgIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VTdGF0ZUNsaWVu dC5oCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLUGFnZVJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzLmgK ICAgICBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlVUlDbGllbnQuaAogICAgIFVJUHJvY2Vzcy9BUEkv Qy9XS1BsdWdpbkxvYWRQb2xpY3kuaApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvU2hhcmVh YmxlQml0bWFwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvU2hhcmVhYmxl Qml0bWFwLmgJKHJldmlzaW9uIDI0ODc1MCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NoYXJl YWJsZUJpdG1hcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDksNyArMTQ5LDcgQEAgcHJpdmF0ZToK ICAgICBzdGF0aWMgdm9pZCByZWxlYXNlRGF0YVByb3ZpZGVyRGF0YSh2b2lkKiB0eXBlbGVzc0Jp dG1hcCwgY29uc3Qgdm9pZCogdHlwZWxlc3NEYXRhLCBzaXplX3QpOwogI2VuZGlmCiAKLSNpZiBV U0UoQ0FJUk8pIHx8IFVTRShESVJFQ1QyRCkKKyNpZiBVU0UoQ0FJUk8pCiAgICAgc3RhdGljIHZv aWQgcmVsZWFzZVN1cmZhY2VEYXRhKHZvaWQqIHR5cGVsZXNzQml0bWFwKTsKICNlbmRpZgogCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC93aW4vU2hhcmVhYmxlQml0bWFwRGlyZWN0MkQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL3dpbi9TaGFyZWFibGVCaXRtYXBE aXJlY3QyRC5jcHAJKHJldmlzaW9uIDI0ODc1MCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL3dp bi9TaGFyZWFibGVCaXRtYXBEaXJlY3QyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2LDE1ICs5 Niw5IEBAIHZvaWQgU2hhcmVhYmxlQml0bWFwOjpwYWludChHcmFwaGljc0NvbnQKIENPTVB0cjxJ V0lDQml0bWFwPiBTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZURpcmVjdDJEU3VyZmFjZSgpCiB7CiAg ICAgbV9iaXRtYXAgPSBjcmVhdGVTdXJmYWNlRnJvbURhdGEoZGF0YSgpLCBtX3NpemUpOwotICAg IHJlZigpOyAvLyBCYWxhbmNlZCBieSBkZXJlZiBpbiByZWxlYXNlU3VyZmFjZURhdGEuCiAgICAg cmV0dXJuIG1fYml0bWFwOwogfQogCi12b2lkIFNoYXJlYWJsZUJpdG1hcDo6cmVsZWFzZVN1cmZh Y2VEYXRhKHZvaWQqIHR5cGVsZXNzQml0bWFwKQotewotICAgIHN0YXRpY19jYXN0PFNoYXJlYWJs ZUJpdG1hcCo+KHR5cGVsZXNzQml0bWFwKS0+ZGVyZWYoKTsgLy8gQmFsYW5jZWQgYnkgcmVmIGlu IGNyZWF0ZURpcmVjdDJEU3VyZmFjZS4KLX0KLQogUmVmUHRyPEltYWdlPiBTaGFyZWFibGVCaXRt YXA6OmNyZWF0ZUltYWdlKCkKIHsKICAgICBhdXRvIHN1cmZhY2UgPSBjcmVhdGVEaXJlY3QyRFN1 cmZhY2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDg3NTApCisrKyBT b3VyY2UvV2ViS2l0TGVnYWN5L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEy IEBACisyMDE5LTA4LTE1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisg ICAgICAgIFtGVFddIEVuYWJsZSBDb3JlRm91bmRhdGlvbiB1c2UgaWYgYnVpbGRpbmcgZm9yIEFw cGxlIHRhcmdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAwNzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBQbGF0Zm9ybUZUVy5jbWFrZToKKwogMjAxOS0wOC0xNSAgU2lodWkgTGl1ICA8c2lodWlf bGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBTb21lIGltcHJvdmVtZW50cyBvbiB3ZWIgc3RvcmFn ZQpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9QbGF0Zm9ybUZUVy5jbWFrZQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L1BsYXRmb3JtRlRXLmNtYWtlCShyZXZpc2lvbiAyNDg3 NTApCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L1BsYXRmb3JtRlRXLmNtYWtlCSh3b3JraW5nIGNv cHkpCkBAIC0yMjAsNiArMjIwLDE2IEBAIGxpc3QoQVBQRU5EIFdlYktpdExlZ2FjeV9TT1VSQ0VT X1dlYkNvcmUKICAgICB3aW4vV2ViQ29yZVN1cHBvcnQvV2ViVmlzaXRlZExpbmtTdG9yZS5oCiAp CiAKK2lmIChVU0VfQ0YpCisgICAgbGlzdChBUFBFTkQgV2ViS2l0TGVnYWN5X1NPVVJDRVNfQ2xh c3NlcworICAgICAgICBjZi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnRDRi5jcHAK KyAgICApCisKKyAgICBsaXN0KEFQUEVORCBXZWJLaXRMZWdhY3lfTElCUkFSSUVTCisgICAgICAg ICR7Q09SRUZPVU5EQVRJT05fTElCUkFSWX0KKyAgICApCitlbmRpZiAoKQorCiBpZiAoQ01BS0Vf U0laRU9GX1ZPSURfUCBFUVVBTCA4KQogICAgIGVuYWJsZV9sYW5ndWFnZShBU01fTUFTTSkKICAg ICBpZiAoTVNWQykKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0 ODc1MCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA4LTE1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgorCisgICAgICAgIFtGVFddIEVuYWJsZSBDb3JlRm91bmRhdGlvbiB1c2UgaWYg YnVpbGRpbmcgZm9yIEFwcGxlIHRhcmdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcDoKKyAgICAg ICAgKEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OkZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXIp OgorICAgICAgICAoRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjo6ZW50ZXJGdWxsc2NyZWVuKToK KyAgICAgICAgKEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmV4aXRGdWxsc2NyZWVuKToKKyAg ICAgICAgKEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmNyZWF0ZUhVRFdpbmRvdyk6CisgICAg ICAgICogRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlZpZXcuY3Bw OgorICAgICAgICAoV2ViVmlldzo6ZXhpdEZ1bGxzY3JlZW5JZk5lZWRlZCk6CisKIDIwMTktMDgt MTUgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFsd2F5cyBj cmVhdGUgYSBEb2N1bWVudCB3aXRoIGEgdmFsaWQgU2Vzc2lvbklECkluZGV4OiBTb3VyY2UvV2Vi S2l0TGVnYWN5L3dpbi9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcAko cmV2aXNpb24gMjQ4NzUwKQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4vRnVsbHNjcmVlblZp ZGVvQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0OSw3ICsyNDksOSBAQCBGdWxs c2NyZWVuVmlkZW9Db250cm9sbGVyOjpGdWxsc2NyZWVuVmlkCiAgICAgLCBtX2xheWVyQ2xpZW50 KHN0ZDo6bWFrZV91bmlxdWU8TGF5ZXJDbGllbnQ+KHRoaXMpKQogICAgICwgbV9yb290Q2hpbGQo UGxhdGZvcm1DQUxheWVyV2luOjpjcmVhdGUoUGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVMYXll ciwgbV9sYXllckNsaWVudC5nZXQoKSkpCiAjZW5kaWYKKyNpZiBFTkFCTEUoRlVMTFNDUkVFTl9B UEkpCiAgICAgLCBtX2Z1bGxzY3JlZW5XaW5kb3coc3RkOjptYWtlX3VuaXF1ZTxNZWRpYVBsYXll clByaXZhdGVGdWxsc2NyZWVuV2luZG93PihzdGF0aWNfY2FzdDxNZWRpYVBsYXllclByaXZhdGVG dWxsc2NyZWVuQ2xpZW50Kj4odGhpcykpKQorI2VuZGlmCiB7CiB9CiAKQEAgLTI3NCw2ICsyNzYs NyBAQCB2b2lkIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OnNldFZpZGVvCiAKIHZvaWQgRnVs bHNjcmVlblZpZGVvQ29udHJvbGxlcjo6ZW50ZXJGdWxsc2NyZWVuKCkKIHsKKyNpZiBFTkFCTEUo RlVMTFNDUkVFTl9BUEkpCiAgICAgaWYgKCFtX3ZpZGVvRWxlbWVudCkKICAgICAgICAgcmV0dXJu OwogCkBAIC0yOTksMTMgKzMwMiwxNiBAQCB2b2lkIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6 OmVudGVyRnVsCiAgICAgbV9mdWxsc2NyZWVuU2l6ZS5zZXRIZWlnaHQod2luZG93UmVjdC5ib3R0 b20gLSB3aW5kb3dSZWN0LnRvcCk7CiAKICAgICBjcmVhdGVIVURXaW5kb3coKTsKKyNlbmRpZgog fQogCiB2b2lkIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmV4aXRGdWxsc2NyZWVuKCkKIHsK ICAgICBTZXRXaW5kb3dMb25nUHRyKG1faHVkV2luZG93LCAwLCAwKTsKIAorI2lmIEVOQUJMRShG VUxMU0NSRUVOX0FQSSkKICAgICBtX2Z1bGxzY3JlZW5XaW5kb3cgPSBudWxscHRyOworI2VuZGlm CiAKICAgICBBU1NFUlQoIUlzV2luZG93KG1faHVkV2luZG93KSk7CiAgICAgbV9odWRXaW5kb3cg PSAwOwpAQCAtNDMyLDYgKzQzOCw3IEBAIHZvaWQgRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjo6 cmVnaXN0ZXIKIAogdm9pZCBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIVURXaW5k b3coKQogeworI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICBtX2h1ZFBvc2l0aW9uLnNl dFgoKG1fZnVsbHNjcmVlblNpemUud2lkdGgoKSAtIHdpbmRvd1dpZHRoKSAvIDIpOwogICAgIG1f aHVkUG9zaXRpb24uc2V0WShtX2Z1bGxzY3JlZW5TaXplLmhlaWdodCgpICogaW5pdGlhbEhVRFBv c2l0aW9uWSAtIHdpbmRvd0hlaWdodCAvIDIpOwogCkBAIC00NjEsNiArNDY4LDcgQEAgdm9pZCBG dWxsc2NyZWVuVmlkZW9Db250cm9sbGVyOjpjcmVhdGVIVQogICAgIFNldFdpbmRvd0xvbmdQdHIo bV9odWRXaW5kb3csIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KHRoaXMpKTsKIAogICAg IGRyYXcoKTsKKyNlbmRpZgogfQogCiBzdGF0aWMgU3RyaW5nIHRpbWVUb1N0cmluZyhmbG9hdCB0 aW1lKQpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJv bGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0Z1bGxzY3JlZW5W aWRlb0NvbnRyb2xsZXIuaAkocmV2aXNpb24gMjQ4NzUwKQorKysgU291cmNlL1dlYktpdExlZ2Fj eS93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTQs NyArMTU0LDkgQEAgcHJpdmF0ZToKICAgICBHRElPYmplY3Q8SEJJVE1BUD4gbV9iaXRtYXA7CiAg ICAgV2ViQ29yZTo6SW50U2l6ZSBtX2Z1bGxzY3JlZW5TaXplOwogICAgIFdlYkNvcmU6OkludFBv aW50IG1faHVkUG9zaXRpb247CisjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIHN0ZDo6 dW5pcXVlX3B0cjxXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVGdWxsc2NyZWVuV2luZG93PiBt X2Z1bGxzY3JlZW5XaW5kb3c7CisjZW5kaWYKIAogI2lmIFVTRShDQSkKICAgICBjbGFzcyBMYXll ckNsaWVudDsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiAy NDg3NTApCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzg4MCw3ICs3ODgwLDkgQEAgSFJFU1VMVCBXZWJWaWV3OjpzZXRWaXNpYmlsaXR5 U3RhdGUoV2ViUAogCiBIUkVTVUxUIFdlYlZpZXc6OmV4aXRGdWxsc2NyZWVuSWZOZWVkZWQoKQog eworI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICBpZiAoZnVsbFNjcmVlbkNvbnRyb2xs ZXIoKSAmJiBmdWxsU2NyZWVuQ29udHJvbGxlcigpLT5pc0Z1bGxTY3JlZW4oKSkKICAgICAgICAg ZnVsbFNjcmVlbkNvbnRyb2xsZXIoKS0+Y2xvc2UoKTsKKyNlbmRpZgogICAgIHJldHVybiBTX09L OwogfQpJbmRleDogU291cmNlL2NtYWtlL09wdGlvbnNGVFcuY21ha2UKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL2NtYWtlL09wdGlvbnNGVFcuY21ha2UJKHJldmlzaW9uIDI0ODc1MCkKKysrIFNvdXJj ZS9jbWFrZS9PcHRpb25zRlRXLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSwxMyBA QCBhZGRfZGVmaW5pdGlvbnMoLURVTklDT0RFIC1EX1VOSUNPREUpCiBhZGRfZGVmaW5pdGlvbnMo LURfV0lOU09DS0FQSV89KQogCiAjIFNldHVwIGxpYnJhcnkgcGF0aHMKK2lmIChERUZJTkVEIEVO VntBcHBsZUFwcGxpY2F0aW9uU3VwcG9ydFNES30pCisgICAgZmlsZShUT19DTUFLRV9QQVRIICIk RU5We0FwcGxlQXBwbGljYXRpb25TdXBwb3J0U0RLfS9BcHBsZUludGVybmFsIiBXRUJLSVRfTElC UkFSSUVTX0RJUikKKyAgICBzZXQoV0VCS0lUX0xJQlJBUklFU19JTkNMVURFX0RJUiAiJHtXRUJL SVRfTElCUkFSSUVTX0RJUn0vaW5jbHVkZSIpCisgICAgaW5jbHVkZV9kaXJlY3Rvcmllcygke1dF QktJVF9MSUJSQVJJRVNfSU5DTFVERV9ESVJ9KQorICAgIHNldChBUFBMRV9CVUlMRCAxKQorZW5k aWYgKCkKKwogaWYgKE5PVCBXRUJLSVRfTElCUkFSSUVTX0RJUikKICAgICBpZiAoREVGSU5FRCBF TlZ7V0VCS0lUX0xJQlJBUklFU30pCiAgICAgICAgIGZpbGUoVE9fQ01BS0VfUEFUSCAiJEVOVntX RUJLSVRfTElCUkFSSUVTfSIgV0VCS0lUX0xJQlJBUklFU19ESVIpCkBAIC0yMDQsMTAgKzIxMSwy NCBAQCBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShVU0VfU1lTCiAKIFdFQktJVF9P UFRJT05fRU5EKCkKIAoraWYgKEFQUExFX0JVSUxEKQorICAgIGluY2x1ZGUodGFyZ2V0L2ljdSkK KyAgICBzZXQoQ09SRUZPVU5EQVRJT05fTElCUkFSWSBDb3JlRm91bmRhdGlvbiR7REVCVUdfU1VG RklYfSkKKyAgICBTRVRfQU5EX0VYUE9TRV9UT19CVUlMRChVU0VfQ0YgT04pCisgICAgZmluZF9w YWNrYWdlKExpYlhtbDIgMi45LjEgUkVRVUlSRUQpCisgICAgaWYgKEVOQUJMRV9YU0xUKQorICAg ICAgICBmaW5kX3BhY2thZ2UoTGliWHNsdCAxLjEuMjggUkVRVUlSRUQpCisgICAgZW5kaWYgKCkK K2Vsc2UgKCkKKyAgICBmaW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEIENPTVBPTkVOVFMgZGF0YSBp MThuIHVjKQorICAgIGZpbmRfcGFja2FnZShMaWJYbWwyIDIuOS43IFJFUVVJUkVEKQorICAgIGlm IChFTkFCTEVfWFNMVCkKKyAgICAgICAgZmluZF9wYWNrYWdlKExpYlhzbHQgMS4xLjMyIFJFUVVJ UkVEKQorICAgIGVuZGlmICgpCitlbmRpZiAoKQorCiBmaW5kX3BhY2thZ2UoQ1VSTCA3LjYwLjAg UkVRVUlSRUQpCi1maW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEIENPTVBPTkVOVFMgZGF0YSBpMThu IHVjKQogZmluZF9wYWNrYWdlKEpQRUcgMS41LjIgUkVRVUlSRUQpCi1maW5kX3BhY2thZ2UoTGli WG1sMiAyLjkuNyBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShPcGVuU1NMIDIuMC4wIFJFUVVJUkVE KQogZmluZF9wYWNrYWdlKFBORyAxLjYuMzQgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoU3FsaXRl IDMuMjMuMSBSRVFVSVJFRCkKQEAgLTIyMCwxMCArMjQxLDYgQEAgZmluZF9wYWNrYWdlKExpYlBT TCAwLjIwLjIgUkVRVUlSRUQpCiAjICAgICBTRVRfQU5EX0VYUE9TRV9UT19CVUlMRChVU0VfV0VC UCBPTikKICMgZW5kaWYgKCkKIAotaWYgKEVOQUJMRV9YU0xUKQotICAgIGZpbmRfcGFja2FnZShM aWJYc2x0IDEuMS4zMiBSRVFVSVJFRCkKLWVuZGlmICgpCi0KIFNFVF9BTkRfRVhQT1NFX1RPX0JV SUxEKFVTRV9DVVJMIE9OKQogU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX0RJUkVDVDJEIE9O KQogU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX0VYUE9SVF9NQUNST1MgT04pCg==