201875 2019-09-17 10:48:03 -0700 WebPaymentCoordinatorProxy does not need sessionIDs 2019-09-17 12:31:21 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen aestes beidson commit-queue ggaren webkit-bug-importer oldest_to_newest 1571590 0 cdumez 2019-09-17 10:48:03 -0700 WebPaymentCoordinatorProxy does not need sessionIDs so let's stop passing them around. 1571591 1 378974 cdumez 2019-09-17 10:49:10 -0700 Created attachment 378974 Patch 1571603 2 378974 ggaren 2019-09-17 11:47:33 -0700 Comment on attachment 378974 Patch r=me 1571623 3 378974 commit-queue 2019-09-17 12:30:55 -0700 Comment on attachment 378974 Patch Clearing flags on attachment: 378974 Committed r249975: <https://trac.webkit.org/changeset/249975> 1571624 4 commit-queue 2019-09-17 12:30:57 -0700 All reviewed patches have been landed. Closing bug. 1571625 5 webkit-bug-importer 2019-09-17 12:31:21 -0700 <rdar://problem/55449109> 378974 2019-09-17 10:49:10 -0700 2019-09-17 12:30:55 -0700 Patch bug-201875-20190917104909.patch text/plain 15460 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBhOTIxZTZiYTc3NjgwNDNj NDQ3MzQ5MzM4Mzg1N2Q4NDQ3ZDYzYTIuLjFkMmI0ZDZjZWRlMTQzOTQ5YjJhMDI5MGQwODEyYjI3 YzkzMjZiNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDktMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYXltZW50Q29vcmRpbmF0b3JQ cm94eSBkb2VzIG5vdCBuZWVkIHNlc3Npb25JRHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5IGRvZXMgbm90 IG5lZWQgc2Vzc2lvbklEcyBzbyBsZXQncyBzdG9wIHBhc3NpbmcgdGhlbSBhcm91bmQuCisKKyAg ICAgICAgKiBTaGFyZWQvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6Y2FuTWFrZVBheW1l bnRzV2l0aEFjdGl2ZUNhcmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0 b3JQcm94eTo6c2hvd1BheW1lbnRVSSk6CisgICAgICAgICogU2hhcmVkL0FwcGxlUGF5L1dlYlBh eW1lbnRDb29yZGluYXRvclByb3h5Lmg6CisgICAgICAgICogU2hhcmVkL0FwcGxlUGF5L1dlYlBh eW1lbnRDb29yZGluYXRvclByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFNoYXJlZC9BcHBs ZVBheS9jb2NvYS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eUNvY29hLm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1DYW5NYWtlUGF5bWVu dHNXaXRoQWN0aXZlQ2FyZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBheW1lbnRDb29yZGluYXRv clByb3h5OjpwbGF0Zm9ybVBheW1lbnRSZXF1ZXN0KToKKyAgICAgICAgKiBTaGFyZWQvQXBwbGVQ YXkvaW9zL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1TaG93UGF5bWVudFVJKToKKyAg ICAgICAgKiBTaGFyZWQvQXBwbGVQYXkvbWFjL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5TWFj Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZv cm1TaG93UGF5bWVudFVJKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1l bnRDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBheW1lbnRDb29yZGluYXRv cjo6Y2FuTWFrZVBheW1lbnRzV2l0aEFjdGl2ZUNhcmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YXltZW50Q29vcmRpbmF0b3I6OnNob3dQYXltZW50VUkpOgorCiAyMDE5LTA5LTE3ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVGhlcmUgc2hvdWxkIGJlIGEgc2lu Z2xlIENhY2hlU3RvcmFnZUNvbm5lY3Rpb24gcGVyIFdlYlByb2Nlc3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclBy b3h5LmNwcAppbmRleCAyNThjNTViMDNlZmE1ZGUzMjE5NTVjYjdhM2I3MWU3ZGU0NGI3NTZlLi41 OWQxY2E2ODI0YWRjNzUzZTZjZGY2Yjk2MzA4ODJlNGQ2ZTc2N2MyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9y UHJveHkuY3BwCkBAIC03NCw5ICs3NCw5IEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHk6OmNhbk1ha2VQYXltZW50cyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmCiAgICAg cGxhdGZvcm1DYW5NYWtlUGF5bWVudHMoV1RGTW92ZShyZXBseSkpOwogfQogCi12b2lkIFdlYlBh eW1lbnRDb29yZGluYXRvclByb3h5OjpjYW5NYWtlUGF5bWVudHNXaXRoQWN0aXZlQ2FyZChjb25z dCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBQ QUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpjYW5N YWtlUGF5bWVudHNXaXRoQWN0aXZlQ2FyZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmll ciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wp PiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIHBsYXRmb3JtQ2FuTWFrZVBheW1lbnRzV2l0 aEFjdGl2ZUNhcmQobWVyY2hhbnRJZGVudGlmaWVyLCBkb21haW5OYW1lLCBzZXNzaW9uSUQsIFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBwbGF0Zm9ybUNhbk1ha2VQYXltZW50c1dp dGhBY3RpdmVDYXJkKG1lcmNoYW50SWRlbnRpZmllciwgZG9tYWluTmFtZSwgV1RGTW92ZShjb21w bGV0aW9uSGFuZGxlcikpOwogfQogCiB2b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5Ojpv cGVuUGF5bWVudFNldHVwKGNvbnN0IFN0cmluZyYgbWVyY2hhbnRJZGVudGlmaWVyLCBjb25zdCBT dHJpbmcmIGRvbWFpbk5hbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCkBAIC04NCw3ICs4NCw3IEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9y UHJveHk6Om9wZW5QYXltZW50U2V0dXAoY29uc3QgU3RyaW5nJiBtZXJjaGFudElkZW50aWZpCiAg ICAgcGxhdGZvcm1PcGVuUGF5bWVudFNldHVwKG1lcmNoYW50SWRlbnRpZmllciwgZG9tYWluTmFt ZSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCi12b2lkIFdlYlBheW1lbnRDb29y ZGluYXRvclByb3h5OjpzaG93UGF5bWVudFVJKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIGRlc3Rp bmF0aW9uSUQsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5h dGluZ1VSTFN0cmluZywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGxpbmtJY29uVVJMU3RyaW5ncywg Y29uc3QgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3QmIHBheW1lbnRSZXF1 ZXN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQor dm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6c2hvd1BheW1lbnRVSShXZWJDb3JlOjpQ YWdlSWRlbnRpZmllciBkZXN0aW5hdGlvbklELCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJM U3RyaW5nLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgbGlua0ljb25VUkxTdHJpbmdzLCBjb25zdCBX ZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYgcGF5bWVudFJlcXVlc3QsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAg aWYgKGF1dG8mIGNvb3JkaW5hdG9yID0gYWN0aXZlUGF5bWVudENvb3JkaW5hdG9yUHJveHkoKSkK ICAgICAgICAgY29vcmRpbmF0b3ItPmRpZENhbmNlbFBheW1lbnRTZXNzaW9uKCk7CkBAIC0xMDQs NyArMTA0LDcgQEAgdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6c2hvd1BheW1lbnRV SShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBkZXN0aW5hdGkKICAgICBmb3IgKGNvbnN0IGF1dG8m IGxpbmtJY29uVVJMU3RyaW5nIDogbGlua0ljb25VUkxTdHJpbmdzKQogICAgICAgICBsaW5rSWNv blVSTHMuYXBwZW5kKFVSTChVUkwoKSwgbGlua0ljb25VUkxTdHJpbmcpKTsKIAotICAgIHBsYXRm b3JtU2hvd1BheW1lbnRVSShvcmlnaW5hdGluZ1VSTCwgbGlua0ljb25VUkxzLCBzZXNzaW9uSUQs IHBheW1lbnRSZXF1ZXN0LCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldKGJv b2wgcmVzdWx0KSB7CisgICAgcGxhdGZvcm1TaG93UGF5bWVudFVJKG9yaWdpbmF0aW5nVVJMLCBs aW5rSWNvblVSTHMsIHBheW1lbnRSZXF1ZXN0LCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cigqdGhpcyldKGJvb2wgcmVzdWx0KSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAg ICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5 L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBs ZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5oCmluZGV4IGYwYTc2NDRkMzBkZGMxZjRm YmY0ZWJlYWNjNzZlYjE3ZGQ4ZGIzNzYuLjUxNzdjN2EwODA4ODNjZWEyZmQ3MzYwNDQ0YjNlNDgz MjczMjg4NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5L1dlYlBh eW1lbnRDb29yZGluYXRvclByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQXBwbGVQ YXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkuaApAQCAtMTE2LDkgKzExNiw5IEBAIHByaXZh dGU6CiAKICAgICAvLyBNZXNzYWdlIGhhbmRsZXJzCiAgICAgdm9pZCBjYW5NYWtlUGF5bWVudHMo Q29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7Ci0gICAgdm9pZCBjYW5NYWtlUGF5bWVu dHNXaXRoQWN0aXZlQ2FyZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3Qg U3RyaW5nJiBkb21haW5OYW1lLCBQQUw6OlNlc3Npb25JRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChib29sKT4mJik7CisgICAgdm9pZCBjYW5NYWtlUGF5bWVudHNXaXRoQWN0aXZlQ2FyZChjb25z dCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAgICB2b2lkIG9wZW5QYXltZW50U2V0 dXAoY29uc3QgU3RyaW5nJiBtZXJjaGFudElkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZG9tYWlu TmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7Ci0gICAgdm9pZCBzaG93UGF5 bWVudFVJKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIGRlc3RpbmF0aW9uSUQsIFBBTDo6U2Vzc2lv bklELCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgbGlua0ljb25VUkxTdHJpbmdzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25Q YXltZW50UmVxdWVzdCYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOworICAgIHZv aWQgc2hvd1BheW1lbnRVSShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBkZXN0aW5hdGlvbklELCBj b25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg bGlua0ljb25VUkxTdHJpbmdzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50 UmVxdWVzdCYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwogICAgIHZvaWQgY29t cGxldGVNZXJjaGFudFZhbGlkYXRpb24oY29uc3QgV2ViQ29yZTo6UGF5bWVudE1lcmNoYW50U2Vz c2lvbiYpOwogICAgIHZvaWQgY29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbihjb25zdCBP cHRpb25hbDxXZWJDb3JlOjpTaGlwcGluZ01ldGhvZFVwZGF0ZT4mKTsKICAgICB2b2lkIGNvbXBs ZXRlU2hpcHBpbmdDb250YWN0U2VsZWN0aW9uKGNvbnN0IE9wdGlvbmFsPFdlYkNvcmU6OlNoaXBw aW5nQ29udGFjdFVwZGF0ZT4mKTsKQEAgLTEzNywxNiArMTM3LDE2IEBAIHByaXZhdGU6CiAgICAg dm9pZCBoaWRlUGF5bWVudFVJKCk7CiAKICAgICB2b2lkIHBsYXRmb3JtQ2FuTWFrZVBheW1lbnRz KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwotICAgIHZvaWQgcGxhdGZvcm1DYW5N YWtlUGF5bWVudHNXaXRoQWN0aXZlQ2FyZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmll ciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBQQUw6OlNlc3Npb25JRCwgV1RGOjpGdW5jdGlv bjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICB2b2lkIHBsYXRmb3JtQ2Fu TWFrZVBheW1lbnRzV2l0aEFjdGl2ZUNhcmQoY29uc3QgU3RyaW5nJiBtZXJjaGFudElkZW50aWZp ZXIsIGNvbnN0IFN0cmluZyYgZG9tYWluTmFtZSwgV1RGOjpGdW5jdGlvbjx2b2lkKGJvb2wpPiYm IGNvbXBsZXRpb25IYW5kbGVyKTsKICAgICB2b2lkIHBsYXRmb3JtT3BlblBheW1lbnRTZXR1cChj b25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1l LCBXVEY6OkZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpOwotICAgIHZv aWQgcGxhdGZvcm1TaG93UGF5bWVudFVJKGNvbnN0IFVSTCYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0 IFZlY3RvcjxVUkw+JiBsaW5rSWNvblVSTHMsIFBBTDo6U2Vzc2lvbklELCBjb25zdCBXZWJDb3Jl OjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYpOworICAgIHZvaWQgcGxhdGZvcm1TaG93UGF5bWVudFVJKGNvbnN0IFVSTCYgb3Jp Z2luYXRpbmdVUkwsIGNvbnN0IFZlY3RvcjxVUkw+JiBsaW5rSWNvblVSTHMsIGNvbnN0IFdlYkNv cmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChib29sKT4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUNvbXBsZXRlTWVyY2hhbnRWYWxpZGF0aW9u KGNvbnN0IFdlYkNvcmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb24mKTsKICAgICB2b2lkIHBsYXRm b3JtQ29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbihjb25zdCBPcHRpb25hbDxXZWJDb3Jl OjpTaGlwcGluZ01ldGhvZFVwZGF0ZT4mKTsKICAgICB2b2lkIHBsYXRmb3JtQ29tcGxldGVTaGlw cGluZ0NvbnRhY3RTZWxlY3Rpb24oY29uc3QgT3B0aW9uYWw8V2ViQ29yZTo6U2hpcHBpbmdDb250 YWN0VXBkYXRlPiYpOwogICAgIHZvaWQgcGxhdGZvcm1Db21wbGV0ZVBheW1lbnRNZXRob2RTZWxl Y3Rpb24oY29uc3QgT3B0aW9uYWw8V2ViQ29yZTo6UGF5bWVudE1ldGhvZFVwZGF0ZT4mKTsKICAg ICB2b2lkIHBsYXRmb3JtQ29tcGxldGVQYXltZW50U2Vzc2lvbihjb25zdCBPcHRpb25hbDxXZWJD b3JlOjpQYXltZW50QXV0aG9yaXphdGlvblJlc3VsdD4mKTsKICNpZiBQTEFURk9STShDT0NPQSkK LSAgICBSZXRhaW5QdHI8UEtQYXltZW50UmVxdWVzdD4gcGxhdGZvcm1QYXltZW50UmVxdWVzdChj b25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJMPiYgbGlua0ljb25VUkxz LCBQQUw6OlNlc3Npb25JRCwgY29uc3QgV2ViQ29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJl cXVlc3QmKTsKKyAgICBSZXRhaW5QdHI8UEtQYXltZW50UmVxdWVzdD4gcGxhdGZvcm1QYXltZW50 UmVxdWVzdChjb25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJMPiYgbGlu a0ljb25VUkxzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYp OwogI2VuZGlmCiAKICAgICBDbGllbnQmIG1fY2xpZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkubWVzc2FnZXMu aW4gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQ cm94eS5tZXNzYWdlcy5pbgppbmRleCAxZGU0Y2RkY2U0YjEyNjNlMmQwYjk0YmZiOTMxOTE0OGJi YzE4MjM2Li5kY2I5OTQwYWY2ZjYwNGQxN2YwNmE3OWE1ZWE0MzdiYzI3OWJmYWQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQ cm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9XZWJQ YXltZW50Q29vcmRpbmF0b3JQcm94eS5tZXNzYWdlcy5pbgpAQCAtMjcsMTAgKzI3LDEwIEBACiBt ZXNzYWdlcyAtPiBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eSB7CiAKICAgICBDYW5NYWtlUGF5 bWVudHMoKSAtPiAoYm9vbCByZXN1bHQpIFN5bmNocm9ub3VzCi0gICAgQ2FuTWFrZVBheW1lbnRz V2l0aEFjdGl2ZUNhcmQoU3RyaW5nIG1lcmNoYW50SWRlbnRpZmllciwgU3RyaW5nIGRvbWFpbk5h bWUsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkgLT4gKGJvb2wgY2FuTWFrZVBheW1lbnRzKSBB c3luYworICAgIENhbk1ha2VQYXltZW50c1dpdGhBY3RpdmVDYXJkKFN0cmluZyBtZXJjaGFudElk ZW50aWZpZXIsIFN0cmluZyBkb21haW5OYW1lKSAtPiAoYm9vbCBjYW5NYWtlUGF5bWVudHMpIEFz eW5jCiAgICAgT3BlblBheW1lbnRTZXR1cChTdHJpbmcgbWVyY2hhbnRJZGVudGlmaWVyLCBTdHJp bmcgZG9tYWluTmFtZSkgLT4gKGJvb2wgcmVzdWx0KSBBc3luYwogCi0gICAgU2hvd1BheW1lbnRV SShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBkZXN0aW5hdGlvbklELCBQQUw6OlNlc3Npb25JRCBz ZXNzaW9uSUQsIFN0cmluZyBvcmlnaW5hdGluZ1VSTFN0cmluZywgVmVjdG9yPFN0cmluZz4gbGlu a0ljb25VUkxTdHJpbmdzLCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCBw YXltZW50UmVxdWVzdCkgLT4gKGJvb2wgcmVzdWx0KSBTeW5jaHJvbm91cworICAgIFNob3dQYXlt ZW50VUkoV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgZGVzdGluYXRpb25JRCwgU3RyaW5nIG9yaWdp bmF0aW5nVVJMU3RyaW5nLCBWZWN0b3I8U3RyaW5nPiBsaW5rSWNvblVSTFN0cmluZ3MsIFdlYkNv cmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0IHBheW1lbnRSZXF1ZXN0KSAtPiAoYm9v bCByZXN1bHQpIFN5bmNocm9ub3VzCiAgICAgQ29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oV2Vi Q29yZTo6UGF5bWVudE1lcmNoYW50U2Vzc2lvbiBwYXltZW50TWVyY2hhbnRTZXNzaW9uKQogICAg IENvbXBsZXRlU2hpcHBpbmdNZXRob2RTZWxlY3Rpb24oT3B0aW9uYWw8V2ViQ29yZTo6U2hpcHBp bmdNZXRob2RVcGRhdGU+IHVwZGF0ZSkKICAgICBDb21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVj dGlvbihPcHRpb25hbDxXZWJDb3JlOjpTaGlwcGluZ0NvbnRhY3RVcGRhdGU+IHVwZGF0ZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5L2NvY29hL1dlYlBheW1lbnRD b29yZGluYXRvclByb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9j b2NvYS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eUNvY29hLm1tCmluZGV4IDc3NWRlZmJiOGI2 MzRhZmMwNTU5MjE0ZjE1ZWZjYjhlNmZhNGVmYzguLjg3NWMzNDkyNDI3MTgxNTQ3ZDBkY2RhYTFj NDlmZWIyZmFlNGQ2MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5 L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dl YktpdC9TaGFyZWQvQXBwbGVQYXkvY29jb2EvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlDb2Nv YS5tbQpAQCAtNTksNyArNTksNyBAQCBAZW5kCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lk IFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9ybUNhbk1ha2VQYXltZW50c1dpdGhB Y3RpdmVDYXJkKGNvbnN0IFN0cmluZyYgbWVyY2hhbnRJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcm IGRvbWFpbk5hbWUsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV1RGOjpGdW5jdGlvbjx2b2lk KGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3JQ cm94eTo6cGxhdGZvcm1DYW5NYWtlUGF5bWVudHNXaXRoQWN0aXZlQ2FyZChjb25zdCBTdHJpbmcm IG1lcmNoYW50SWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkb21haW5OYW1lLCBXVEY6OkZ1bmN0 aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAjaWYgUExBVEZPUk0oTUFD KQogICAgIGlmICghUEFMOjppc1Bhc3NLaXRGcmFtZXdvcmtBdmFpbGFibGUoKSkKQEAgLTIxOSw3 ICsyMTksNyBAQCBzdGF0aWMgUEtQYXltZW50UmVxdWVzdEFQSVR5cGUgdG9BUElUeXBlKFdlYkNv cmU6OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0OgogfQogI2VuZGlmCiAKLVJldGFpblB0 cjxQS1BheW1lbnRSZXF1ZXN0PiBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1Q YXltZW50UmVxdWVzdChjb25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJM PiYgbGlua0ljb25VUkxzLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIGNvbnN0IFdlYkNvcmU6 OkFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0JiBwYXltZW50UmVxdWVzdCkKK1JldGFpblB0 cjxQS1BheW1lbnRSZXF1ZXN0PiBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1Q YXltZW50UmVxdWVzdChjb25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJM PiYgbGlua0ljb25VUkxzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVx dWVzdCYgcGF5bWVudFJlcXVlc3QpCiB7CiAgICAgYXV0byByZXN1bHQgPSBhZG9wdE5TKFtQQUw6 OmFsbG9jUEtQYXltZW50UmVxdWVzdEluc3RhbmNlKCkgaW5pdF0pOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9pb3MvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHlJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BcHBsZVBheS9pb3MvV2ViUGF5bWVudENv b3JkaW5hdG9yUHJveHlJT1MubW0KaW5kZXggNTE2NDFhZDJjZGIxN2EwNjEzNjg2YzU3MDI1NmU4 MWFkNmQ0NzJiNS4uZTEzZDc2ODhhYzA2MTNiZTQ5NmU1N2FmN2QxMTcwNTYzZmI5MzJiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQXBwbGVQYXkvaW9zL1dlYlBheW1lbnRDb29y ZGluYXRvclByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FwcGxlUGF5L2lv cy9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eUlPUy5tbQpAQCAtNDcsOSArNDcsOSBAQCB2b2lk IFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9ybUNhbk1ha2VQYXltZW50cyhDb21w bGV0aW9uSGFuZGxlcjx2b2lkKAogICAgIH0pOwogfQogCi12b2lkIFdlYlBheW1lbnRDb29yZGlu YXRvclByb3h5OjpwbGF0Zm9ybVNob3dQYXltZW50VUkoY29uc3QgVVJMJiBvcmlnaW5hdGluZ1VS TCwgY29uc3QgVmVjdG9yPFVSTD4mIGxpbmtJY29uVVJMU3RyaW5ncywgUEFMOjpTZXNzaW9uSUQg c2Vzc2lvbklELCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYg cmVxdWVzdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKK3ZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnBsYXRmb3JtU2hvd1BheW1lbnRV SShjb25zdCBVUkwmIG9yaWdpbmF0aW5nVVJMLCBjb25zdCBWZWN0b3I8VVJMPiYgbGlua0ljb25V UkxTdHJpbmdzLCBjb25zdCBXZWJDb3JlOjpBcHBsZVBheVNlc3Npb25QYXltZW50UmVxdWVzdCYg cmVxdWVzdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKIHsKLSAgICBhdXRvIHBheW1lbnRSZXF1ZXN0ID0gcGxhdGZvcm1QYXltZW50UmVxdWVzdChv cmlnaW5hdGluZ1VSTCwgbGlua0ljb25VUkxTdHJpbmdzLCBzZXNzaW9uSUQsIHJlcXVlc3QpOwor ICAgIGF1dG8gcGF5bWVudFJlcXVlc3QgPSBwbGF0Zm9ybVBheW1lbnRSZXF1ZXN0KG9yaWdpbmF0 aW5nVVJMLCBsaW5rSWNvblVSTFN0cmluZ3MsIHJlcXVlc3QpOwogCiAgICAgQVNTRVJUKCFtX2F1 dGhvcml6YXRpb25QcmVzZW50ZXIpOwogICAgIG1fYXV0aG9yaXphdGlvblByZXNlbnRlciA9IG1f Y2xpZW50LnBheW1lbnRDb29yZGluYXRvckF1dGhvcml6YXRpb25QcmVzZW50ZXIoKnRoaXMsIHBh eW1lbnRSZXF1ZXN0LmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Fw cGxlUGF5L21hYy9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0FwcGxlUGF5L21hYy9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eU1hYy5tbQpp bmRleCAzOTE0YTRjMjAxNGE5YTU0YTYzNDg4YTRlNzQzODE5YzZhOGRiM2FmLi5hNDM5YTUxYzQx YWRlNWNmYTJmZmExMTBlMTUxYTUwMDUyYzQ5OWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9BcHBsZVBheS9tYWMvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlNYWMubW0KKysr IGIvU291cmNlL1dlYktpdC9TaGFyZWQvQXBwbGVQYXkvbWFjL1dlYlBheW1lbnRDb29yZGluYXRv clByb3h5TWFjLm1tCkBAIC00NywxMiArNDcsMTIgQEAgdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0 b3JQcm94eTo6cGxhdGZvcm1DYW5NYWtlUGF5bWVudHMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgK ICAgICB9KTsKIH0KIAotdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxhdGZvcm1T aG93UGF5bWVudFVJKGNvbnN0IFVSTCYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IFZlY3RvcjxVUkw+ JiBsaW5rSWNvblVSTFN0cmluZ3MsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgV2Vi Q29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3QmIHJlcXVlc3QsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYlBheW1lbnRD b29yZGluYXRvclByb3h5OjpwbGF0Zm9ybVNob3dQYXltZW50VUkoY29uc3QgVVJMJiBvcmlnaW5h dGluZ1VSTCwgY29uc3QgVmVjdG9yPFVSTD4mIGxpbmtJY29uVVJMU3RyaW5ncywgY29uc3QgV2Vi Q29yZTo6QXBwbGVQYXlTZXNzaW9uUGF5bWVudFJlcXVlc3QmIHJlcXVlc3QsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgaWYgKCFQQUw6 OmlzUGFzc0tpdEZyYW1ld29ya0F2YWlsYWJsZSgpKQogICAgICAgICByZXR1cm4gY29tcGxldGlv bkhhbmRsZXIoZmFsc2UpOwogCi0gICAgYXV0byBwYXltZW50UmVxdWVzdCA9IHBsYXRmb3JtUGF5 bWVudFJlcXVlc3Qob3JpZ2luYXRpbmdVUkwsIGxpbmtJY29uVVJMU3RyaW5ncywgc2Vzc2lvbklE LCByZXF1ZXN0KTsKKyAgICBhdXRvIHBheW1lbnRSZXF1ZXN0ID0gcGxhdGZvcm1QYXltZW50UmVx dWVzdChvcmlnaW5hdGluZ1VSTCwgbGlua0ljb25VUkxTdHJpbmdzLCByZXF1ZXN0KTsKIAogICAg IGF1dG8gc2hvd1BheW1lbnRVSVJlcXVlc3RTZWVkID0gbV9zaG93UGF5bWVudFVJUmVxdWVzdFNl ZWQ7CiAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3Iu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGlu YXRvci5jcHAKaW5kZXggMjQ2OGMwMGFjMTc3ZmQxYjBkNGRmNGMyMjAyZWFjMzEyNDUxOWQyMy4u ZWFkYzM0NWM4NGJkMDNlNzM3ZTgxMDI5YTA0MzdmODM5NGY5MzE0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGlu YXRvci5jcHAKQEAgLTgxLDcgKzgxLDcgQEAgYm9vbCBXZWJQYXltZW50Q29vcmRpbmF0b3I6OmNh bk1ha2VQYXltZW50cygpCiAKIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yOjpjYW5NYWtlUGF5 bWVudHNXaXRoQWN0aXZlQ2FyZChjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgY29u c3QgU3RyaW5nJiBkb21haW5OYW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQogewotICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2Vi UGF5bWVudENvb3JkaW5hdG9yUHJveHk6OkNhbk1ha2VQYXltZW50c1dpdGhBY3RpdmVDYXJkKG1l cmNoYW50SWRlbnRpZmllciwgZG9tYWluTmFtZSwgbV93ZWJQYWdlLnNlc3Npb25JRCgpKSwgV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdl czo6V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OkNhbk1ha2VQYXltZW50c1dpdGhBY3RpdmVD YXJkKG1lcmNoYW50SWRlbnRpZmllciwgZG9tYWluTmFtZSksIFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpKTsKIH0KIAogdm9pZCBXZWJQYXltZW50Q29vcmRpbmF0b3I6Om9wZW5QYXltZW50U2V0 dXAoY29uc3QgU3RyaW5nJiBtZXJjaGFudElkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZG9tYWlu TmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikK QEAgLTk2LDcgKzk2LDcgQEAgYm9vbCBXZWJQYXltZW50Q29vcmRpbmF0b3I6OnNob3dQYXltZW50 VUkoY29uc3QgVVJMJiBvcmlnaW5hdGluZ1VSTCwgY29uc3QgVmVjdG8KICAgICAgICAgbGlua0lj b25VUkxTdHJpbmdzLmFwcGVuZChsaW5rSWNvblVSTC5zdHJpbmcoKSk7CiAKICAgICBib29sIHJl c3VsdDsKLSAgICBpZiAoIXNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYXltZW50Q29vcmRpbmF0b3JQ cm94eTo6U2hvd1BheW1lbnRVSShtX3dlYlBhZ2UuaWRlbnRpZmllcigpLCBtX3dlYlBhZ2Uuc2Vz c2lvbklEKCksIG9yaWdpbmF0aW5nVVJMLnN0cmluZygpLCBsaW5rSWNvblVSTFN0cmluZ3MsIHBh eW1lbnRSZXF1ZXN0KSwgTWVzc2FnZXM6OldlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpTaG93 UGF5bWVudFVJOjpSZXBseShyZXN1bHQpKSkKKyAgICBpZiAoIXNlbmRTeW5jKE1lc3NhZ2VzOjpX ZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6U2hvd1BheW1lbnRVSShtX3dlYlBhZ2UuaWRlbnRp ZmllcigpLCBvcmlnaW5hdGluZ1VSTC5zdHJpbmcoKSwgbGlua0ljb25VUkxTdHJpbmdzLCBwYXlt ZW50UmVxdWVzdCksIE1lc3NhZ2VzOjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6U2hvd1Bh eW1lbnRVSTo6UmVwbHkocmVzdWx0KSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJl dHVybiByZXN1bHQ7Cg==