194678 2019-02-14 15:11:24 -0800 Make WebPaymentCoordinatorProxy more robust and modern 2019-02-15 13:30:32 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes webkit-bug-importer oldest_to_newest 1506395 0 achristensen 2019-02-14 15:11:24 -0800 Make WebPaymentCoordinatorProxy more robust and modern 1506398 1 362068 achristensen 2019-02-14 15:15:13 -0800 Created attachment 362068 Patch 1506742 2 achristensen 2019-02-15 13:25:39 -0800 http://trac.webkit.org/r241611 1506746 3 webkit-bug-importer 2019-02-15 13:30:32 -0800 <rdar://problem/48122136> 362068 2019-02-14 15:15:13 -0800 2019-02-15 11:07:40 -0800 Patch bug-194678-20190214151513.patch text/plain 14022 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDE1NjYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTAyLTE0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXZWJQYXlt ZW50Q29vcmRpbmF0b3JQcm94eSBtb3JlIHJvYnVzdCBhbmQgbW9kZXJuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ2NzgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgV2Vha1B0ciBpbnN0ZWFkIG9m IHN0b3JpbmcgcmF3IHBvaW50ZXJzIGluIGxhbWJkYXMgb3IgdGhlIGdsb2JhbCBhY3RpdmVQYXlt ZW50Q29vcmRpbmF0b3JQcm94eSB0byBhdm9pZCBVQUYgcHJvYmxlbXMuCisgICAgICAgIENhbGwg Q29tcGxldGlvbkhhbmRsZXJzIGluIGFsbCBjb2RlIHBhdGhzIHRvIGF2b2lkIGhhbmdzLgorICAg ICAgICBVc2UgRGVsYXllZCBpbnN0ZWFkIG9mIExlZ2FjeVN5bmMgZm9yIHN5bmNocm9ub3VzIG1l c3NhZ2luZyB0byBwcm9ncmVzcyB0b3dhcmRzIHJlbW92aW5nIExlZ2FjeVN5bmMgbWVzc2FnZXMu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjphY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBheW1lbnRDb29yZGluYXRvclByb3h5Ojp+V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6YXZhaWxhYmxl UGF5bWVudE5ldHdvcmtzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGF5bWVudENvb3JkaW5hdG9y UHJveHk6OmNhbk1ha2VQYXltZW50cyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBheW1lbnRDb29y ZGluYXRvclByb3h5OjpzaG93UGF5bWVudFVJKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGF5bWVu dENvb3JkaW5hdG9yUHJveHk6OmRpZFJlYWNoRmluYWxTdGF0ZSk6CisgICAgICAgICogVUlQcm9j ZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Lm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BcHBsZVBheS9pb3MvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBheW1lbnRDb29yZGluYXRvclByb3h5Ojpw bGF0Zm9ybVNob3dQYXltZW50VUkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BcHBsZVBheS9tYWMv V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh eW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9ybVNob3dQYXltZW50VUkpOgorCiAyMDE5LTAy LTE0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBU1NFUlRJ T04gRkFJTEVEOiBtX2NhY2hlcy5pc0VtcHR5KCkgfHwgIW1fcGVuZGluZ0luaXRpYWxpemF0aW9u Q2FsbGJhY2tzLmlzRW1wdHkoKSBpbiBXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6Q2FjaGVzOjpjbGVh ck1lbW9yeVJlcHJlc2VudGF0aW9uKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJr aXQvbWVzc2FnZXMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtp dC9tZXNzYWdlcy5weQkocmV2aXNpb24gMjQxNDQxKQorKysgU291cmNlL1dlYktpdC9TY3JpcHRz L3dlYmtpdC9tZXNzYWdlcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTg5LDEwICsxODksOCBAQCBk ZWYgZm9yd2FyZF9kZWNsYXJhdGlvbnNfYW5kX2hlYWRlcnMocmVjCiAgICAgICAgICdTdHJpbmcn LAogICAgIF0pCiAKLSAgICBmb3IgbWVzc2FnZSBpbiByZWNlaXZlci5tZXNzYWdlczoKLSAgICAg ICAgaWYgbWVzc2FnZS5yZXBseV9wYXJhbWV0ZXJzICE9IE5vbmU6Ci0gICAgICAgICAgICBoZWFk ZXJzLmFkZCgnPHd0Zi9UaHJlYWRTYWZlUmVmQ291bnRlZC5oPicpCi0gICAgICAgICAgICB0eXBl c19ieV9uYW1lc3BhY2VbJ0lQQyddLnVwZGF0ZShbKCdjbGFzcycsICdDb25uZWN0aW9uJyldKQor ICAgIGhlYWRlcnMuYWRkKCciQ29ubmVjdGlvbi5oIicpCisgICAgaGVhZGVycy5hZGQoJzx3dGYv VGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4nKQogCiAgICAgbm9fZm9yd2FyZF9kZWNsYXJhdGlvbl90 eXBlcyA9IGZyb3plbnNldChbCiAgICAgICAgICdNYWNoU2VuZFJpZ2h0JywKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXlt ZW50Q29vcmRpbmF0b3JQcm94eS5jcHAJKHJldmlzaW9uIDI0MTQ0MSkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzYsNyArMzYsMTEgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0 YXRpYyBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eSogYWN0aXZlUGF5bWVudENvb3JkaW5hdG9y UHJveHk7CitzdGF0aWMgV2Vha1B0cjxXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eT4mIGFjdGl2 ZVBheW1lbnRDb29yZGluYXRvclByb3h5KCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 V2Vha1B0cjxXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eT4+IGFjdGl2ZVBheW1lbnRDb29yZGlu YXRvclByb3h5OworICAgIHJldHVybiBhY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eS5nZXQo KTsKK30KIAogV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OldlYlBheW1lbnRDb29yZGluYXRv clByb3h5KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQogICAgIDogbV93ZWJQYWdlUHJveHko d2ViUGFnZVByb3h5KQpAQCAtNDksMjMgKzUzLDIwIEBAIFdlYlBheW1lbnRDb29yZGluYXRvclBy b3h5OjpXZWJQYXltZW50Q28KIAogV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6On5XZWJQYXlt ZW50Q29vcmRpbmF0b3JQcm94eSgpCiB7Ci0gICAgaWYgKGFjdGl2ZVBheW1lbnRDb29yZGluYXRv clByb3h5ID09IHRoaXMpCi0gICAgICAgIGFjdGl2ZVBheW1lbnRDb29yZGluYXRvclByb3h5ID0g bnVsbHB0cjsKLQogICAgIGlmIChtX3N0YXRlICE9IFN0YXRlOjpJZGxlKQogICAgICAgICBoaWRl UGF5bWVudFVJKCk7CiAKICAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkucmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKLXZvaWQgV2ViUGF5 bWVudENvb3JkaW5hdG9yUHJveHk6OmF2YWlsYWJsZVBheW1lbnROZXR3b3JrcyhWZWN0b3I8U3Ry aW5nPiYgbmV0d29ya3MpCit2b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjphdmFpbGFi bGVQYXltZW50TmV0d29ya3MoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8U3RyaW5nPiYm KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBuZXR3b3JrcyA9IHBsYXRmb3JtQXZhaWxh YmxlUGF5bWVudE5ldHdvcmtzKCk7CisgICAgY29tcGxldGlvbkhhbmRsZXIocGxhdGZvcm1BdmFp bGFibGVQYXltZW50TmV0d29ya3MoKSk7CiB9CiAKLXZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9y UHJveHk6OmNhbk1ha2VQYXltZW50cyhib29sJiByZXBseSkKK3ZvaWQgV2ViUGF5bWVudENvb3Jk aW5hdG9yUHJveHk6OmNhbk1ha2VQYXltZW50cyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wp PiYmIHJlcGx5KQogewotICAgIHJlcGx5ID0gcGxhdGZvcm1DYW5NYWtlUGF5bWVudHMoKTsKKyAg ICByZXBseShwbGF0Zm9ybUNhbk1ha2VQYXltZW50cygpKTsKIH0KIAogdm9pZCBXZWJQYXltZW50 Q29vcmRpbmF0b3JQcm94eTo6Y2FuTWFrZVBheW1lbnRzV2l0aEFjdGl2ZUNhcmQoY29uc3QgU3Ry aW5nJiBtZXJjaGFudElkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZG9tYWluTmFtZSwgdWludDY0 X3QgcmVxdWVzdElEKQpAQCAtOTIsMTcgKzkzLDE3IEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5h dG9yUHJveHk6Om9wZW5QYXkKICAgICB9KTsKIH0KIAotdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0 b3JQcm94eTo6c2hvd1BheW1lbnRVSShjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3RyaW5n LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgbGlua0ljb25VUkxTdHJpbmdzLCBjb25zdCBXZWJDb3Jl OjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYgcGF5bWVudFJlcXVlc3QsIGJvb2wmIHJl c3VsdCkKK3ZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnNob3dQYXltZW50VUkoY29u c3QgU3RyaW5nJiBvcmlnaW5hdGluZ1VSTFN0cmluZywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGxp bmtJY29uVVJMU3RyaW5ncywgY29uc3QgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3QmIHBheW1lbnRSZXF1ZXN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQogewogICAgIC8vIEZJWE1FOiBNYWtlIHRoaXMgYSBtZXNzYWdlIGNo ZWNrLgogICAgIEFTU0VSVChjYW5CZWdpbigpKTsKIAotICAgIGlmIChhY3RpdmVQYXltZW50Q29v cmRpbmF0b3JQcm94eSkgewotICAgICAgICBhY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eS0+ aGlkZVBheW1lbnRVSSgpOwotICAgICAgICBhY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eS0+ ZGlkQ2FuY2VsUGF5bWVudFNlc3Npb24oKTsKKyAgICBpZiAoYXV0byYgY29vcmRpbmF0b3IgPSBh Y3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eSgpKSB7CisgICAgICAgIGNvb3JkaW5hdG9yLT5o aWRlUGF5bWVudFVJKCk7CisgICAgICAgIGNvb3JkaW5hdG9yLT5kaWRDYW5jZWxQYXltZW50U2Vz c2lvbigpOwogICAgIH0KIAotICAgIGFjdGl2ZVBheW1lbnRDb29yZGluYXRvclByb3h5ID0gdGhp czsKKyAgICBhY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eSgpID0gbWFrZVdlYWtQdHIodGhp cyk7CiAKICAgICBtX3N0YXRlID0gU3RhdGU6OkFjdGl2YXRpbmc7CiAKQEAgLTExMiwxNyArMTEz LDIwIEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnNob3dQYXkKICAgICBmb3Ig KGNvbnN0IGF1dG8mIGxpbmtJY29uVVJMU3RyaW5nIDogbGlua0ljb25VUkxTdHJpbmdzKQogICAg ICAgICBsaW5rSWNvblVSTHMuYXBwZW5kKFVSTChVUkwoKSwgbGlua0ljb25VUkxTdHJpbmcpKTsK IAotICAgIHBsYXRmb3JtU2hvd1BheW1lbnRVSShvcmlnaW5hdGluZ1VSTCwgbGlua0ljb25VUkxz LCBwYXltZW50UmVxdWVzdCwgW3RoaXNdKGJvb2wgcmVzdWx0KSB7Ci0gICAgICAgIEFTU0VSVCht X3N0YXRlID09IFN0YXRlOjpBY3RpdmF0aW5nKTsKKyAgICBwbGF0Zm9ybVNob3dQYXltZW50VUko b3JpZ2luYXRpbmdVUkwsIGxpbmtJY29uVVJMcywgcGF5bWVudFJlcXVlc3QsIFt3ZWFrVGhpcyA9 IG1ha2VXZWFrUHRyKCp0aGlzKV0oYm9vbCByZXN1bHQpIHsKKyAgICAgICAgaWYgKCF3ZWFrVGhp cykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBBU1NFUlQod2Vha1RoaXMtPm1fc3Rh dGUgPT0gU3RhdGU6OkFjdGl2YXRpbmcpOwogICAgICAgICBpZiAoIXJlc3VsdCkgewotICAgICAg ICAgICAgZGlkQ2FuY2VsUGF5bWVudFNlc3Npb24oKTsKKyAgICAgICAgICAgIHdlYWtUaGlzLT5k aWRDYW5jZWxQYXltZW50U2Vzc2lvbigpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKLSAgICAgICAgbV9zdGF0ZSA9IFN0YXRlOjpBY3RpdmU7CisgICAgICAgIHdlYWtUaGlzLT5t X3N0YXRlID0gU3RhdGU6OkFjdGl2ZTsKICAgICB9KTsKIAotICAgIHJlc3VsdCA9IHRydWU7Cisg ICAgY29tcGxldGlvbkhhbmRsZXIodHJ1ZSk7CiB9CiAKICAgICAKQEAgLTMzMiw4ICszMzYsOCBA QCB2b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpkaWRSZWFjCiAgICAgbV9zdGF0ZSA9 IFN0YXRlOjpJZGxlOwogICAgIG1fbWVyY2hhbnRWYWxpZGF0aW9uU3RhdGUgPSBNZXJjaGFudFZh bGlkYXRpb25TdGF0ZTo6SWRsZTsKIAotICAgIEFTU0VSVChhY3RpdmVQYXltZW50Q29vcmRpbmF0 b3JQcm94eSA9PSB0aGlzKTsKLSAgICBhY3RpdmVQYXltZW50Q29vcmRpbmF0b3JQcm94eSA9IG51 bGxwdHI7CisgICAgQVNTRVJUKGFjdGl2ZVBheW1lbnRDb29yZGluYXRvclByb3h5KCkgPT0gdGhp cyk7CisgICAgYWN0aXZlUGF5bWVudENvb3JkaW5hdG9yUHJveHkoKSA9IG51bGxwdHI7CiB9CiAK IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29y ZGluYXRvclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBw bGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkuaAkocmV2aXNpb24gMjQxNDQxKQorKysg U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzgsMTEgKzc4LDExIEBAIHByaXZhdGU6CiAgICAgdm9p ZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJiwg c3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKSBvdmVycmlkZTsKIAogICAgIC8vIE1lc3Nh Z2UgaGFuZGxlcnMuCi0gICAgdm9pZCBhdmFpbGFibGVQYXltZW50TmV0d29ya3MoVmVjdG9yPFN0 cmluZz4mKTsKLSAgICB2b2lkIGNhbk1ha2VQYXltZW50cyhib29sJiByZXBseSk7CisgICAgdm9p ZCBhdmFpbGFibGVQYXltZW50TmV0d29ya3MoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8 U3RyaW5nPiYmKT4mJik7CisgICAgdm9pZCBjYW5NYWtlUGF5bWVudHMoQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChib29sKT4mJik7CiAgICAgdm9pZCBjYW5NYWtlUGF5bWVudHNXaXRoQWN0aXZlQ2Fy ZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5O YW1lLCB1aW50NjRfdCByZXF1ZXN0SUQpOwogICAgIHZvaWQgb3BlblBheW1lbnRTZXR1cChjb25z dCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCB1 aW50NjRfdCByZXF1ZXN0SUQpOwotICAgIHZvaWQgc2hvd1BheW1lbnRVSShjb25zdCBTdHJpbmcm IG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgbGlua0ljb25VUkxT dHJpbmdzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYsIGJv b2wmIHJlc3VsdCk7CisgICAgdm9pZCBzaG93UGF5bWVudFVJKGNvbnN0IFN0cmluZyYgb3JpZ2lu YXRpbmdVUkxTdHJpbmcsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBsaW5rSWNvblVSTFN0cmluZ3Ms IGNvbnN0IFdlYkNvcmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0JiwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAgICAgdm9pZCBjb21wbGV0ZU1lcmNoYW50VmFsaWRh dGlvbihjb25zdCBXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uJik7CiAgICAgdm9pZCBj b21wbGV0ZVNoaXBwaW5nTWV0aG9kU2VsZWN0aW9uKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OlNo aXBwaW5nTWV0aG9kVXBkYXRlPiYpOwogICAgIHZvaWQgY29tcGxldGVTaGlwcGluZ0NvbnRhY3RT ZWxlY3Rpb24oY29uc3QgT3B0aW9uYWw8V2ViQ29yZTo6U2hpcHBpbmdDb250YWN0VXBkYXRlPiYp OwpAQCAtMTAyLDcgKzEwMiw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBwbGF0Zm9ybUNhbk1ha2VQ YXltZW50cygpOwogICAgIHZvaWQgcGxhdGZvcm1DYW5NYWtlUGF5bWVudHNXaXRoQWN0aXZlQ2Fy ZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5O YW1lLCBXVEY6OkZ1bmN0aW9uPHZvaWQgKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKICAg ICB2b2lkIHBsYXRmb3JtT3BlblBheW1lbnRTZXR1cChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRl bnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBXVEY6OkZ1bmN0aW9uPHZvaWQgKGJv b2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKLSAgICB2b2lkIHBsYXRmb3JtU2hvd1BheW1lbnRV SShjb25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJMPiYgbGlua0ljb25V UkxzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYsIFdURjo6 RnVuY3Rpb248dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgdm9pZCBwbGF0 Zm9ybVNob3dQYXltZW50VUkoY29uc3QgVVJMJiBvcmlnaW5hdGluZ1VSTCwgY29uc3QgVmVjdG9y PFVSTD4mIGxpbmtJY29uVVJMcywgY29uc3QgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVu dFJlcXVlc3QmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAgICB2b2lkIHBs YXRmb3JtQ29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oY29uc3QgV2ViQ29yZTo6UGF5bWVudE1l cmNoYW50U2Vzc2lvbiYpOwogICAgIHZvaWQgcGxhdGZvcm1Db21wbGV0ZVNoaXBwaW5nTWV0aG9k U2VsZWN0aW9uKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OlNoaXBwaW5nTWV0aG9kVXBkYXRlPiYp OwogICAgIHZvaWQgcGxhdGZvcm1Db21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlvbihjb25z dCBPcHRpb25hbDxXZWJDb3JlOjpTaGlwcGluZ0NvbnRhY3RVcGRhdGU+Jik7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5t ZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsZVBh eS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjQxNDQx KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5h dG9yUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTI2LDEyICsyNiwxMiBAQAog CiBtZXNzYWdlcyAtPiBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eSB7CiAKLSAgICBBdmFpbGFi bGVQYXltZW50TmV0d29ya3MoKSAtPiAoVmVjdG9yPFN0cmluZz4gYXZhaWxhYmxlUGF5bWVudE5l dHdvcmtzKSBMZWdhY3lTeW5jCi0gICAgQ2FuTWFrZVBheW1lbnRzKCkgLT4gKGJvb2wgcmVzdWx0 KSBMZWdhY3lTeW5jCisgICAgQXZhaWxhYmxlUGF5bWVudE5ldHdvcmtzKCkgLT4gKFZlY3RvcjxT dHJpbmc+IGF2YWlsYWJsZVBheW1lbnROZXR3b3JrcykgRGVsYXllZAorICAgIENhbk1ha2VQYXlt ZW50cygpIC0+IChib29sIHJlc3VsdCkgRGVsYXllZAogICAgIENhbk1ha2VQYXltZW50c1dpdGhB Y3RpdmVDYXJkKFN0cmluZyBtZXJjaGFudElkZW50aWZpZXIsIFN0cmluZyBkb21haW5OYW1lLCB1 aW50NjRfdCByZXF1ZXN0SUQpCiAgICAgT3BlblBheW1lbnRTZXR1cChTdHJpbmcgbWVyY2hhbnRJ ZGVudGlmaWVyLCBTdHJpbmcgZG9tYWluTmFtZSwgdWludDY0X3QgcmVxdWVzdElEKQogCi0gICAg U2hvd1BheW1lbnRVSShTdHJpbmcgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+ IGxpbmtJY29uVVJMU3RyaW5ncywgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVl c3QgcGF5bWVudFJlcXVlc3QpIC0+IChib29sIHJlc3VsdCkgTGVnYWN5U3luYworICAgIFNob3dQ YXltZW50VUkoU3RyaW5nIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBWZWN0b3I8U3RyaW5nPiBsaW5r SWNvblVSTFN0cmluZ3MsIFdlYkNvcmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0IHBh eW1lbnRSZXF1ZXN0KSAtPiAoYm9vbCByZXN1bHQpIERlbGF5ZWQKICAgICBDb21wbGV0ZU1lcmNo YW50VmFsaWRhdGlvbihXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uIHBheW1lbnRNZXJj aGFudFNlc3Npb24pCiAgICAgQ29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbihPcHRpb25h bDxXZWJDb3JlOjpTaGlwcGluZ01ldGhvZFVwZGF0ZT4gdXBkYXRlKQogICAgIENvbXBsZXRlU2hp cHBpbmdDb250YWN0U2VsZWN0aW9uKE9wdGlvbmFsPFdlYkNvcmU6OlNoaXBwaW5nQ29udGFjdFVw ZGF0ZT4gdXBkYXRlKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGVQYXkvaW9z L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5SU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FwcGxlUGF5L2lvcy9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eUlP Uy5tbQkocmV2aXNpb24gMjQxNDQxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGVQ YXkvaW9zL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5SU9TLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0zOCw3ICszOCw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIFdlYlBheW1lbnRD b29yZGluYXRvclByb3h5OjpwbGF0Zm9ybVNob3dQYXltZW50VUkoY29uc3QgVVJMJiBvcmlnaW5h dGluZ1VSTCwgY29uc3QgVmVjdG9yPFVSTD4mIGxpbmtJY29uVVJMU3RyaW5ncywgY29uc3QgV2Vi Q29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3QmIHJlcXVlc3QsIFdURjo6RnVuY3Rp b248dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2ViUGF5bWVudENvb3Jk aW5hdG9yUHJveHk6OnBsYXRmb3JtU2hvd1BheW1lbnRVSShjb25zdCBVUkwmIG9yaWdpbmF0aW5n VVJMLCBjb25zdCBWZWN0b3I8VVJMPiYgbGlua0ljb25VUkxTdHJpbmdzLCBjb25zdCBXZWJDb3Jl OjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYgcmVxdWVzdCwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBVSVZpZXdDb250cm9s bGVyICpwcmVzZW50aW5nVmlld0NvbnRyb2xsZXIgPSBtX3dlYlBhZ2VQcm94eS51aUNsaWVudCgp LnByZXNlbnRpbmdWaWV3Q29udHJvbGxlcigpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BcHBsZVBheS9tYWMvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGVQYXkvbWFjL1dlYlBheW1lbnRD b29yZGluYXRvclByb3h5TWFjLm1tCShyZXZpc2lvbiAyNDE0NDEpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BcHBsZVBheS9tYWMvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTM1LDE2ICszNSwxNiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1TaG93UGF5bWVudFVJ KGNvbnN0IFVSTCYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IFZlY3RvcjxVUkw+JiBsaW5rSWNvblVS TFN0cmluZ3MsIGNvbnN0IFdlYkNvcmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0JiBy ZXF1ZXN0LCBXVEY6OkZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2 b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9ybVNob3dQYXltZW50VUkoY29u c3QgVVJMJiBvcmlnaW5hdGluZ1VSTCwgY29uc3QgVmVjdG9yPFVSTD4mIGxpbmtJY29uVVJMU3Ry aW5ncywgY29uc3QgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3QmIHJlcXVl c3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7 CiAgICAgYXV0byBwYXltZW50UmVxdWVzdCA9IHRvUEtQYXltZW50UmVxdWVzdChtX3dlYlBhZ2VQ cm94eSwgb3JpZ2luYXRpbmdVUkwsIGxpbmtJY29uVVJMU3RyaW5ncywgcmVxdWVzdCk7CiAKICAg ICBhdXRvIHNob3dQYXltZW50VUlSZXF1ZXN0U2VlZCA9IG1fc2hvd1BheW1lbnRVSVJlcXVlc3RT ZWVkOwogICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7Ci0gICAgW1BBTDo6 Z2V0UEtQYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyQ2xhc3MoKSByZXF1ZXN0Vmll d0NvbnRyb2xsZXJXaXRoUGF5bWVudFJlcXVlc3Q6cGF5bWVudFJlcXVlc3QuZ2V0KCkgY29tcGxl dGlvbjptYWtlQmxvY2tQdHIoW3BheW1lbnRSZXF1ZXN0LCBzaG93UGF5bWVudFVJUmVxdWVzdFNl ZWQsIHdlYWtUaGlzLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpXShQS1BheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXIgKnZpZXdDb250cm9sbGVy LCBOU0Vycm9yICplcnJvcikgeworICAgIFtQQUw6OmdldFBLUGF5bWVudEF1dGhvcml6YXRpb25W aWV3Q29udHJvbGxlckNsYXNzKCkgcmVxdWVzdFZpZXdDb250cm9sbGVyV2l0aFBheW1lbnRSZXF1 ZXN0OnBheW1lbnRSZXF1ZXN0LmdldCgpIGNvbXBsZXRpb246bWFrZUJsb2NrUHRyKFtwYXltZW50 UmVxdWVzdCwgc2hvd1BheW1lbnRVSVJlcXVlc3RTZWVkLCB3ZWFrVGhpcywgY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oUEtQYXltZW50QXV0aG9yaXphdGlv blZpZXdDb250cm9sbGVyICp2aWV3Q29udHJvbGxlciwgTlNFcnJvciAqZXJyb3IpIG11dGFibGUg ewogICAgICAgICBhdXRvIHBheW1lbnRDb29yZGluYXRvclByb3h5ID0gd2Vha1RoaXMuZ2V0KCk7 CiAgICAgICAgIGlmICghcGF5bWVudENvb3JkaW5hdG9yUHJveHkpCi0gICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoZmFsc2UpOwogCiAgICAg ICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgTE9HX0VSUk9SKCIrW1BLUGF5bWVudEF1dGhv cml6YXRpb25WaWV3Q29udHJvbGxlciByZXF1ZXN0Vmlld0NvbnRyb2xsZXJXaXRoUGF5bWVudFJl cXVlc3Q6Y29tcGxldGlvbjpdIGVycm9yICVAIiwgZXJyb3IpOwpAQCAtNTUsNyArNTUsNyBAQCB2 b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9yCiAKICAgICAgICAgaWYgKHNo b3dQYXltZW50VUlSZXF1ZXN0U2VlZCAhPSBwYXltZW50Q29vcmRpbmF0b3JQcm94eS0+bV9zaG93 UGF5bWVudFVJUmVxdWVzdFNlZWQpIHsKICAgICAgICAgICAgIC8vIFdlJ3ZlIGFscmVhZHkgYmVl biBhc2tlZCB0byBoaWRlIHRoZSBwYXltZW50IFVJLiBEb24ndCBhdHRlbXB0IHRvIHNob3cgaXQu Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRs ZXIoZmFsc2UpOwogICAgICAgICB9CiAKICAgICAgICAgQVNTRVJUKHZpZXdDb250cm9sbGVyKTsK