211136 2020-04-28 11:31:46 -0700 Move WebPage::textInputContextsInRect() to WebPageIOS.mm 2020-04-28 17:11:11 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=211135 InRadar P2 Normal --- 1 dbates dbates eric.carlson simon.fraser webkit-bug-importer oldest_to_newest 1646576 0 dbates 2020-04-28 11:31:46 -0700 WebPage::textInputContextsInRect() is only used on iOS at the moment and likely is not relevant to any other port. So, move it to WebPageIOS.mm. 1646585 1 397862 dbates 2020-04-28 11:53:24 -0700 Created attachment 397862 Patch 1646586 2 dbates 2020-04-28 11:54:44 -0700 I wrote this patch on top of the patch for bug #211135. So, it won't apply until that one lands. 1646740 3 397898 dbates 2020-04-28 16:31:08 -0700 Created attachment 397898 Patch 1646741 4 397899 dbates 2020-04-28 16:31:50 -0700 Created attachment 397899 Patch 1646760 5 397899 dbates 2020-04-28 17:01:48 -0700 Comment on attachment 397899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397899&action=review > Source/WebKit/ChangeLog:18 > + I side effect of this change is that I also move WebPageProxy::textInputContextsInRect() I => A 1646761 6 397899 eric.carlson 2020-04-28 17:02:42 -0700 Comment on attachment 397899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397899&action=review > Source/WebKit/ChangeLog:18 > + I side effect of this change is that I also move WebPageProxy::textInputContextsInRect() s/I side effect/A side effect/ (or do you mean "One side effect"?) 1646765 7 397909 dbates 2020-04-28 17:05:42 -0700 Created attachment 397909 To Land 1646767 8 dbates 2020-04-28 17:06:04 -0700 Committed r260857: <https://trac.webkit.org/changeset/260857> 1646771 9 webkit-bug-importer 2020-04-28 17:11:11 -0700 <rdar://problem/62558562> 397862 2020-04-28 11:53:24 -0700 2020-04-28 16:31:07 -0700 Patch bug-211136-20200428115323.patch text/plain 6676 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTIwNDZiZTQ5MDU1NjRk ODhiMjcxYzZiYTcwZWRmYjM4MGViN2IuLmE2OTViYTdmNzZiOTVlOTdlZmM1ZTQzZTdjMzA5Y2Y4 YzA2N2YzOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QoKSB0byBXZWJQYWdlSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb24gV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QgaXMgdmVyeSBzcGVjaWZpYyB0byBhIGNsaWVudCBvbiBpT1MuCisg ICAgICAgIEFsdGhvdWdoIGl0J3MgdGVtcHRpbmcgdG8ga2VlcCB0aGlzIGNyb3NzLXBsYXRmb3Jt IGJlY2F1c2UgaXRzIGltcGxlbWVudGF0aW9uIGRvZXMKKyAgICAgICAgbm90IG1ha2UgdXNlIG9m IGlPUy1zcGVjaWZpYyB0ZWNobm9sb2dpZXMgaXQgZG9lcyBhIHZlcnkgc3BlY2lmaWMgb3BlcmF0 aW9uLCB0aGUKKyAgICAgICAgcmVzdWx0IG9mIHdoaWNoIGlzIGEgbGlzdCBvZiBjb250ZXh0cyB0 byBlZGl0YWJsZSBlbGVtZW50cyBvbiB0aGUgcGFnZS4gVGhlIGNvbnRleHRzCisgICAgICAgIHBy b3ZpZGUgZW5vdWdoIGluZm8gZm9yIHRoZSBzcGVjaWZpYyBpT1MgY2xpZW50LCBidXQgbm90IGVu b3VnaCB0byBldmVyIGJlIHVzZWZ1bAorICAgICAgICB0byBhbnkgb3RoZXIgY2xpZW50LiBUaGVy ZWZvcmUgbW92ZSBpdCB0byBXZWJQYWdlSU9TLm1tLgorCisgICAgICAgIE9ubHkgTWFjIGFuZCBp T1Mgd2VyZSBldmVyIHVzaW5nIHRoaXMgZnVuY3Rpb24uIFRoZSBmb3JtZXIgb25seSBmb3IgdGVz dGluZyBwdXJwb3NlcworICAgICAgICB0aGF0IGhhdmUgc2luY2UgYmVlbiByZW1vdmVkLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IERlbGV0ZWQ7IG1vdmVkIHRvIFdl YlBhZ2VJT1MubW0uCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KTogTW92ZWQgZnJvbSBXZWJQYWdlLmNw cC4KKwogMjAyMC0wNC0yOCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHVudXNlZCBXZWJQYWdlOjpmb2N1c1RleHRJbnB1dENvbnRleHQoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBjYjBkM2Nj MGIyZDBmYWQzODI4NGU2ZGQ5Nzc2MTViZjZmMGRkN2I5Li5iMDdiYjMwYmJkZjMyMTg0YjM1N2Vm ODk1ZTMwOWJkODgxMDg4YjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcApAQCAtNjg5MCwyMSArNjg5MCw2IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRl SW5wdXRDb250ZXh0QWZ0ZXJCbHVycmluZ0FuZFJlZm9jdXNpbmdFbGVtZW50SWZOZWVkZWQoRWxl bWVuCiAKICNlbmRpZiAvLyAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKIAotdm9pZCBXZWJQYWdlOjp0 ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+ Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgYXV0byBjb250ZXh0cyA9IG1fcGFnZS0+ ZWRpdGFibGVFbGVtZW50c0luUmVjdChzZWFyY2hSZWN0KS5tYXAoWyZdIChjb25zdCBhdXRvJiBl bGVtZW50KSB7Ci0gICAgICAgIGF1dG8mIGRvY3VtZW50ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsK LQotICAgICAgICBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCBjb250ZXh0OwotICAgICAgICBjb250 ZXh0LndlYlBhZ2VJZGVudGlmaWVyID0gbV9pZGVudGlmaWVyOwotICAgICAgICBjb250ZXh0LmRv Y3VtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXIoKTsKLSAgICAgICAgY29udGV4 dC5lbGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50KGVsZW1l bnQpOwotICAgICAgICBjb250ZXh0LmJvdW5kaW5nUmVjdCA9IGVsZW1lbnQtPmNsaWVudFJlY3Qo KTsKLSAgICAgICAgcmV0dXJuIGNvbnRleHQ7Ci0gICAgfSk7Ci0gICAgY29tcGxldGlvbkhhbmRs ZXIoY29udGV4dHMpOwotfQotCiB2b2lkIFdlYlBhZ2U6OnNldENhblNob3dQbGFjZWhvbGRlcihj b25zdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCYgZWxlbWVudENvbnRleHQsIGJvb2wgY2FuU2hv d1BsYWNlaG9sZGVyKQogewogICAgIFJlZlB0cjxFbGVtZW50PiBlbGVtZW50ID0gZWxlbWVudEZv ckNvbnRleHQoZWxlbWVudENvbnRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCmluZGV4IDdiYjAyZGNiYjk3MzQwZjA2Yzg0YTFhZjQzOTNkOTZiNjgxN2Fk MTMuLjMyOWIwYzk0YjMxZDJhYTE4MThjZDdlMjhlYzFhYTYyZjg2Y2YyY2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY0NCwxMCArNjQ0LDEwIEBA IHB1YmxpYzoKICAgICB2b2lkIGV4ZWN1dGVFZGl0Q29tbWFuZFdpdGhDYWxsYmFjayhjb25zdCBT dHJpbmcmLCBjb25zdCBTdHJpbmcmIGFyZ3VtZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYpOwogICAgIHZvaWQgc2VsZWN0QWxsKCk7CiAKLSAgICB2b2lkIHRleHRJbnB1dENvbnRleHRz SW5SZWN0KFdlYkNvcmU6OkZsb2F0UmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBW ZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYpOwogICAgIHZvaWQgc2V0Q2FuU2hv d1BsYWNlaG9sZGVyKGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgYm9vbCk7CiAKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIHZvaWQgdGV4dElucHV0Q29udGV4dHNJblJlY3Qo V2ViQ29yZTo6RmxvYXRSZWN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxX ZWJDb3JlOjpFbGVtZW50Q29udGV4dD4mKT4mJik7CiAgICAgdm9pZCBmb2N1c1RleHRJbnB1dENv bnRleHRBbmRQbGFjZUNhcmV0KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKIAog ICAgIGJvb2wgc2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKCkgY29u c3QgeyByZXR1cm4gbV9zaG91bGRSZXZlYWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb247 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluCmluZGV4IDY5NzBjODQ5ZDNlOTZiZjI5NTUzYTczNmI5M2JhNjdhNmRhYzQ0ZmMu LmMwN2M4ZmQ4ZmVhMTdhZDhiY2M0OTBkMGE3NjlhYTg4NjJlY2RhNjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAt MTIxLDYgKzEyMSw3IEBAIEdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50 OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlCiAgICAgU2V0U2hvdWxkUmV2 ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZWFsQ3VycmVu dFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKQogICAgIEluc2VydFRleHRQbGFjZWhvbGRlcihXZWJD b3JlOjpJbnRTaXplIHNpemUpIC0+IChPcHRpb25hbDxXZWJDb3JlOjpFbGVtZW50Q29udGV4dD4g cGxhY2Vob2xkZXIpIEFzeW5jCiAgICAgUmVtb3ZlVGV4dFBsYWNlaG9sZGVyKHN0cnVjdCBXZWJD b3JlOjpFbGVtZW50Q29udGV4dCBwbGFjZWhvbGRlcikgLT4gKCkgQXN5bmMKKyAgICBUZXh0SW5w dXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkgLT4gKFZlY3RvcjxzdHJ1 Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IGNvbnRleHRzKSBBc3luYwogICAgIEZvY3VzVGV4 dElucHV0Q29udGV4dEFuZFBsYWNlQ2FyZXQoc3RydWN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0 IGNvbnRleHQsIFdlYkNvcmU6OkludFBvaW50IHBvaW50KSAtPiAoYm9vbCBzdWNjZXNzKSBBc3lu YwogICAgIENsZWFyU2VydmljZVdvcmtlckVudGl0bGVtZW50T3ZlcnJpZGUoKSAtPiAoKSBBc3lu YwogI2VuZGlmCkBAIC01NzcsNyArNTc4LDYgQEAgR2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29t bWFuZChlbnVtOnVpbnQ4X3QgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUKICAg ICBWb2ljZXNEaWRDaGFuZ2UoKQogI2VuZGlmCiAKLSAgICBUZXh0SW5wdXRDb250ZXh0c0luUmVj dChXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkgLT4gKFZlY3RvcjxzdHJ1Y3QgV2ViQ29yZTo6RWxl bWVudENvbnRleHQ+IGNvbnRleHRzKSBBc3luYwogICAgIFNldENhblNob3dQbGFjZWhvbGRlcihz dHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQgY29udGV4dCwgYm9vbCBjYW5TaG93UGxhY2Vo b2xkZXIpCiAKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCAx YTgxMjZjNjNlMjY4NjNiODg1ODkzZGU1NTE0MzU0MjZkODg2N2RkLi44YjIwYzNhZjRlZjcxMDU5 Y2JhZDZmZjI3NmU2MzQ2ZmFkNGZhYmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtNDMxMyw2ICs0MzEzLDIxIEBAIHZv aWQgV2ViUGFnZTo6c2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9u KGJvb2wgc2hvdWxkUmV2ZWFsQ3VyCiAgICAgc2NoZWR1bGVGdWxsRWRpdG9yU3RhdGVVcGRhdGUo KTsKIH0KIAordm9pZCBXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChGbG9hdFJlY3Qg c2VhcmNoUmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8RWxlbWVudENv bnRleHQ+Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAgYXV0byBjb250ZXh0cyA9IG1f cGFnZS0+ZWRpdGFibGVFbGVtZW50c0luUmVjdChzZWFyY2hSZWN0KS5tYXAoWyZdIChjb25zdCBh dXRvJiBlbGVtZW50KSB7CisgICAgICAgIGF1dG8mIGRvY3VtZW50ID0gZWxlbWVudC0+ZG9jdW1l bnQoKTsKKworICAgICAgICBFbGVtZW50Q29udGV4dCBjb250ZXh0OworICAgICAgICBjb250ZXh0 LndlYlBhZ2VJZGVudGlmaWVyID0gbV9pZGVudGlmaWVyOworICAgICAgICBjb250ZXh0LmRvY3Vt ZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXIoKTsKKyAgICAgICAgY29udGV4dC5l bGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQp OworICAgICAgICBjb250ZXh0LmJvdW5kaW5nUmVjdCA9IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsK KyAgICAgICAgcmV0dXJuIGNvbnRleHQ7CisgICAgfSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIo Y29udGV4dHMpOworfQorCiB2b2lkIFdlYlBhZ2U6OmZvY3VzVGV4dElucHV0Q29udGV4dEFuZFBs YWNlQ2FyZXQoY29uc3QgRWxlbWVudENvbnRleHQmIGVsZW1lbnRDb250ZXh0LCBjb25zdCBJbnRQ b2ludCYgcG9pbnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhh bmRsZXIpCiB7CiAgICAgYXV0byB0YXJnZXQgPSBlbGVtZW50Rm9yQ29udGV4dChlbGVtZW50Q29u dGV4dCk7Cg== 397898 2020-04-28 16:31:08 -0700 2020-04-28 16:31:49 -0700 Patch bug-211136-20200428163108.patch text/plain 10120 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTIwNDZiZTQ5MDU1NjRk ODhiMjcxYzZiYTcwZWRmYjM4MGViN2IuLmJhYTBkMzEyNjY2ODcyNjJiYWEyYmM3MzUxZGJjZjE2 YzA1OTA5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDQtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QoKSB0byBXZWJQYWdlSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb24gV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QgaXMgdmVyeSBzcGVjaWZpYyB0byBhIGNsaWVudCBvbiBpT1MuCisg ICAgICAgIEFsdGhvdWdoIGl0J3MgdGVtcHRpbmcgdG8ga2VlcCB0aGlzIGNyb3NzLXBsYXRmb3Jt IGJlY2F1c2UgaXRzIGltcGxlbWVudGF0aW9uIGRvZXMKKyAgICAgICAgbm90IG1ha2UgdXNlIG9m IGlPUy1zcGVjaWZpYyB0ZWNobm9sb2dpZXMgaXQgZG9lcyBhIHZlcnkgc3BlY2lmaWMgb3BlcmF0 aW9uLCB0aGUKKyAgICAgICAgcmVzdWx0IG9mIHdoaWNoIGlzIGEgbGlzdCBvZiBjb250ZXh0cyB0 byBlZGl0YWJsZSBlbGVtZW50cyBvbiB0aGUgcGFnZS4gVGhlIGNvbnRleHRzCisgICAgICAgIHBy b3ZpZGUgZW5vdWdoIGluZm8gZm9yIHRoZSBzcGVjaWZpYyBpT1MgY2xpZW50LCBidXQgbm90IGVu b3VnaCB0byBldmVyIGJlIHVzZWZ1bAorICAgICAgICB0byBhbnkgb3RoZXIgY2xpZW50LiBUaGVy ZWZvcmUgbW92ZSBpdCB0byBXZWJQYWdlSU9TLm1tLgorCisgICAgICAgIE9ubHkgTWFjIGFuZCBp T1Mgd2VyZSBldmVyIHVzaW5nIHRoaXMgZnVuY3Rpb24uIFRoZSBmb3JtZXIgb25seSBmb3IgdGVz dGluZyBwdXJwb3NlcworICAgICAgICB0aGF0IGhhdmUgc2luY2UgYmVlbiByZW1vdmVkLgorCisg ICAgICAgIEkgc2lkZSBlZmZlY3Qgb2YgdGhpcyBjaGFuZ2UgaXMgdGhhdCBJIGFsc28gbW92ZSBX ZWJQYWdlUHJveHk6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KCkKKyAgICAgICAgZnJvbSBXZWJQ YWdlUHJveHkuY3BwIHRvIFdlYlBhZ2VQcm94eUlPUy5tbS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnRleHRJ bnB1dENvbnRleHRzSW5SZWN0KTogRGVsZXRlZDsgbW92ZWQgdG8gV2ViUGFnZVByb3h5SU9TLm1t CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KTogTW92ZWQgZnJvbSBXZWJQYWdlUHJveHkuY3BwLgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6dGV4dElucHV0Q29udGV4dHNJblJlY3QpOiBEZWxldGVkOyBtb3ZlZCB0byBX ZWJQYWdlSU9TLm1tLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IE1vdmVkIGZyb20gV2ViUGFnZS5j cHAuCisKIDIwMjAtMDQtMjggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbW92ZSB1bnVzZWQgV2ViUGFnZTo6Zm9jdXNUZXh0SW5wdXRDb250ZXh0KCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGM0MTU3ZTY3YmNjZmYz NTI0MDBiZmRlNDI5Yjc4ZWJhMDQ1MjEzY2QuLjYxODRkMGY4ZDdjM2ViYTQ5ZGJlYmQ4N2YwMzA0 ZDI2NmY2OWE2MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApA QCAtMTAwMjIsMTYgKzEwMDIyLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OndlYlZpZXdEaWRNb3Zl VG9XaW5kb3coKQogICAgIH0KIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnRleHRJbnB1dENvbnRl eHRzSW5SZWN0KFdlYkNvcmU6OkZsb2F0UmVjdCByZWN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50Q29udGV4dD4mKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKLXsKLSAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpIHsKLSAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoeyB9KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIHNlbmRXaXRo QXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6VGV4dElucHV0Q29udGV4dHNJblJlY3QocmVj dCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLX0KLQogdm9pZCBXZWJQYWdlUHJveHk6 OnNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCYgY29u dGV4dCwgYm9vbCBjYW5TaG93UGxhY2Vob2xkZXIpCiB7CiAgICAgaWYgKGhhc1J1bm5pbmdQcm9j ZXNzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGUzNGMwYmQ1 ZjRiNTI0OGUwZGM2MmYzYWUzYmMxODA1Y2Q3ZmI1OGIuLmEzOGQ0M2VhODA0ZDg1N2UzN2YzNTg5 NjkwNDNkZGFkODlmMWEzYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CkBAIC03MDYsNyArNzA2LDYgQEAgcHVibGljOgogICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRyaWJ1 dGVzQXRTZWxlY3Rpb25TdGFydChGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRy aWJ1dGVzJiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+JiYpOwogICAgIHZvaWQgZm9udEF0dHJpYnV0 ZXNDYWxsYmFjayhjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYsIENhbGxiYWNrSUQpOwog Ci0gICAgdm9pZCB0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3QsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0 PiYpPiYmKTsKICAgICB2b2lkIHNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpF bGVtZW50Q29udGV4dCYsIGJvb2wpOwogCiAjaWYgRU5BQkxFKFVJX1NJREVfQ09NUE9TSVRJTkcp CkBAIC03MTQsNiArNzEzLDcgQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgIHZvaWQgdGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRS ZWN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50 Q29udGV4dD4mKT4mJik7CiAgICAgdm9pZCBmb2N1c1RleHRJbnB1dENvbnRleHRBbmRQbGFjZUNh cmV0KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKIAogICAgIHZvaWQgc2V0U2hv dWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKGJvb2wpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KaW5kZXggMzhjODBmZTRm ZDkzMGNjMTljZjc3ODUyMmYyYjRjZWQ3NWUyYzA1Ny4uZWY5MjVmMTQ4ZGM5NTY3MGQyNWE4NDk5 YzliNDIzZmQ3MDg4YzE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2Vi UGFnZVByb3h5SU9TLm1tCkBAIC0xNTQ2LDYgKzE1NDYsMTYgQEAgYm9vbCBXZWJQYWdlUHJveHk6 OnNob3VsZEZvcmNlRm9yZWdyb3VuZFByaW9yaXR5Rm9yQ2xpZW50TmF2aWdhdGlvbigpIGNvbnN0 CiAgICAgcmV0dXJuIHBhZ2VDbGllbnQoKS5pc0FwcGxpY2F0aW9uVmlzaWJsZSgpOwogfQogCit2 b2lkIFdlYlBhZ2VQcm94eTo6dGV4dElucHV0Q29udGV4dHNJblJlY3QoRmxvYXRSZWN0IHJlY3Qs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPEVsZW1lbnRDb250ZXh0PiYpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewor ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlOjpUZXh0SW5wdXRDb250 ZXh0c0luUmVjdChyZWN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworfQorCiB2b2lk IFdlYlBhZ2VQcm94eTo6Zm9jdXNUZXh0SW5wdXRDb250ZXh0QW5kUGxhY2VDYXJldChjb25zdCBF bGVtZW50Q29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICghaGFz UnVubmluZ1Byb2Nlc3MoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAppbmRleCBjYjBkM2NjMGIyZDBmYWQzODI4NGU2ZGQ5Nzc2MTViZjZmMGRkN2I5 Li5iMDdiYjMwYmJkZjMyMTg0YjM1N2VmODk1ZTMwOWJkODgxMDg4YjQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNjg5MCwyMSArNjg5MCw2 IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlSW5wdXRDb250ZXh0QWZ0ZXJCbHVycmluZ0FuZFJlZm9j dXNpbmdFbGVtZW50SWZOZWVkZWQoRWxlbWVuCiAKICNlbmRpZiAvLyAhUExBVEZPUk0oSU9TX0ZB TUlMWSkKIAotdm9pZCBXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpG bG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8 V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAg YXV0byBjb250ZXh0cyA9IG1fcGFnZS0+ZWRpdGFibGVFbGVtZW50c0luUmVjdChzZWFyY2hSZWN0 KS5tYXAoWyZdIChjb25zdCBhdXRvJiBlbGVtZW50KSB7Ci0gICAgICAgIGF1dG8mIGRvY3VtZW50 ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsKLQotICAgICAgICBXZWJDb3JlOjpFbGVtZW50Q29udGV4 dCBjb250ZXh0OwotICAgICAgICBjb250ZXh0LndlYlBhZ2VJZGVudGlmaWVyID0gbV9pZGVudGlm aWVyOwotICAgICAgICBjb250ZXh0LmRvY3VtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50 aWZpZXIoKTsKLSAgICAgICAgY29udGV4dC5lbGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50Lmlk ZW50aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQpOwotICAgICAgICBjb250ZXh0LmJvdW5kaW5nUmVj dCA9IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsKLSAgICAgICAgcmV0dXJuIGNvbnRleHQ7Ci0gICAg fSk7Ci0gICAgY29tcGxldGlvbkhhbmRsZXIoY29udGV4dHMpOwotfQotCiB2b2lkIFdlYlBhZ2U6 OnNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCYgZWxl bWVudENvbnRleHQsIGJvb2wgY2FuU2hvd1BsYWNlaG9sZGVyKQogewogICAgIFJlZlB0cjxFbGVt ZW50PiBlbGVtZW50ID0gZWxlbWVudEZvckNvbnRleHQoZWxlbWVudENvbnRleHQpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDdiYjAyZGNiYjk3MzQw ZjA2Yzg0YTFhZjQzOTNkOTZiNjgxN2FkMTMuLjMyOWIwYzk0YjMxZDJhYTE4MThjZDdlMjhlYzFh YTYyZjg2Y2YyY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKQEAgLTY0NCwxMCArNjQ0LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIGV4ZWN1dGVFZGl0Q29t bWFuZFdpdGhDYWxsYmFjayhjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGFyZ3VtZW50LCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2VsZWN0QWxsKCk7CiAKLSAg ICB2b2lkIHRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNvcmU6OkZsb2F0UmVjdCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+ JiYpOwogICAgIHZvaWQgc2V0Q2FuU2hvd1BsYWNlaG9sZGVyKGNvbnN0IFdlYkNvcmU6OkVsZW1l bnRDb250ZXh0JiwgYm9vbCk7CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIHZvaWQg dGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0LCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50Q29udGV4dD4mKT4mJik7CiAg ICAgdm9pZCBmb2N1c1RleHRJbnB1dENvbnRleHRBbmRQbGFjZUNhcmV0KGNvbnN0IFdlYkNvcmU6 OkVsZW1lbnRDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGJvb2wpPiYmKTsKIAogICAgIGJvb2wgc2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVj dGlvbkFmdGVySW5zZXJ0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRSZXZlYWxDdXJyZW50 U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb247IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDY5NzBjODQ5ZDNlOTZiZjI5 NTUzYTczNmI5M2JhNjdhNmRhYzQ0ZmMuLmMwN2M4ZmQ4ZmVhMTdhZDhiY2M0OTBkMGE3NjlhYTg4 NjJlY2RhNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMTIxLDYgKzEyMSw3IEBAIEdlbmVyYXRlU3ludGhldGlj RWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1h bmRUeXBlCiAgICAgU2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9u KGJvb2wgc2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKQogICAgIElu c2VydFRleHRQbGFjZWhvbGRlcihXZWJDb3JlOjpJbnRTaXplIHNpemUpIC0+IChPcHRpb25hbDxX ZWJDb3JlOjpFbGVtZW50Q29udGV4dD4gcGxhY2Vob2xkZXIpIEFzeW5jCiAgICAgUmVtb3ZlVGV4 dFBsYWNlaG9sZGVyKHN0cnVjdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCBwbGFjZWhvbGRlcikg LT4gKCkgQXN5bmMKKyAgICBUZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJl Y3QgcmVjdCkgLT4gKFZlY3RvcjxzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IGNvbnRl eHRzKSBBc3luYwogICAgIEZvY3VzVGV4dElucHV0Q29udGV4dEFuZFBsYWNlQ2FyZXQoc3RydWN0 IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0IGNvbnRleHQsIFdlYkNvcmU6OkludFBvaW50IHBvaW50 KSAtPiAoYm9vbCBzdWNjZXNzKSBBc3luYwogICAgIENsZWFyU2VydmljZVdvcmtlckVudGl0bGVt ZW50T3ZlcnJpZGUoKSAtPiAoKSBBc3luYwogI2VuZGlmCkBAIC01NzcsNyArNTc4LDYgQEAgR2Vu ZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChlbnVtOnVpbnQ4X3QgV2ViS2l0OjpTeW50aGV0 aWNFZGl0aW5nQ29tbWFuZFR5cGUKICAgICBWb2ljZXNEaWRDaGFuZ2UoKQogI2VuZGlmCiAKLSAg ICBUZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkgLT4gKFZl Y3RvcjxzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IGNvbnRleHRzKSBBc3luYwogICAg IFNldENhblNob3dQbGFjZWhvbGRlcihzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQgY29u dGV4dCwgYm9vbCBjYW5TaG93UGxhY2Vob2xkZXIpCiAKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9B RF9TVEFUSVNUSUNTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQppbmRleCAxYTgxMjZjNjNlMjY4NjNiODg1ODkzZGU1NTE0MzU0MjZk ODg2N2RkLi44YjIwYzNhZjRlZjcxMDU5Y2JhZDZmZjI3NmU2MzQ2ZmFkNGZhYmE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpA QCAtNDMxMyw2ICs0MzEzLDIxIEBAIHZvaWQgV2ViUGFnZTo6c2V0U2hvdWxkUmV2ZWFsQ3VycmVu dFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZWFsQ3VyCiAgICAgc2NoZWR1 bGVGdWxsRWRpdG9yU3RhdGVVcGRhdGUoKTsKIH0KIAordm9pZCBXZWJQYWdlOjp0ZXh0SW5wdXRD b250ZXh0c0luUmVjdChGbG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBWZWN0b3I8RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7 CisgICAgYXV0byBjb250ZXh0cyA9IG1fcGFnZS0+ZWRpdGFibGVFbGVtZW50c0luUmVjdChzZWFy Y2hSZWN0KS5tYXAoWyZdIChjb25zdCBhdXRvJiBlbGVtZW50KSB7CisgICAgICAgIGF1dG8mIGRv Y3VtZW50ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsKKworICAgICAgICBFbGVtZW50Q29udGV4dCBj b250ZXh0OworICAgICAgICBjb250ZXh0LndlYlBhZ2VJZGVudGlmaWVyID0gbV9pZGVudGlmaWVy OworICAgICAgICBjb250ZXh0LmRvY3VtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZp ZXIoKTsKKyAgICAgICAgY29udGV4dC5lbGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50 aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQpOworICAgICAgICBjb250ZXh0LmJvdW5kaW5nUmVjdCA9 IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIGNvbnRleHQ7CisgICAgfSk7 CisgICAgY29tcGxldGlvbkhhbmRsZXIoY29udGV4dHMpOworfQorCiB2b2lkIFdlYlBhZ2U6OmZv Y3VzVGV4dElucHV0Q29udGV4dEFuZFBsYWNlQ2FyZXQoY29uc3QgRWxlbWVudENvbnRleHQmIGVs ZW1lbnRDb250ZXh0LCBjb25zdCBJbnRQb2ludCYgcG9pbnQsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgYXV0byB0YXJnZXQgPSBlbGVt ZW50Rm9yQ29udGV4dChlbGVtZW50Q29udGV4dCk7Cg== 397899 2020-04-28 16:31:50 -0700 2020-04-28 17:05:40 -0700 Patch bug-211136-20200428163150.patch text/plain 10121 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTIwNDZiZTQ5MDU1NjRk ODhiMjcxYzZiYTcwZWRmYjM4MGViN2IuLjJhYTNjN2EwMTY2ODJmMzNmNzNkMWE3MGI5NTA5NmEw ZDk4YzZkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDQtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QoKSB0byBXZWJQYWdlSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb24gV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QgaXMgdmVyeSBzcGVjaWZpYyB0byBhIGNsaWVudCBvbiBpT1MuCisg ICAgICAgIEFsdGhvdWdoIGl0J3MgdGVtcHRpbmcgdG8ga2VlcCB0aGlzIGNyb3NzLXBsYXRmb3Jt IGJlY2F1c2UgaXRzIGltcGxlbWVudGF0aW9uIGRvZXMKKyAgICAgICAgbm90IG1ha2UgdXNlIG9m IGlPUy1zcGVjaWZpYyB0ZWNobm9sb2dpZXMgaXQgZG9lcyBhIHZlcnkgc3BlY2lmaWMgb3BlcmF0 aW9uLCB0aGUKKyAgICAgICAgcmVzdWx0IG9mIHdoaWNoIGlzIGEgbGlzdCBvZiBjb250ZXh0cyB0 byBlZGl0YWJsZSBlbGVtZW50cyBvbiB0aGUgcGFnZS4gVGhlIGNvbnRleHRzCisgICAgICAgIHBy b3ZpZGUgZW5vdWdoIGluZm8gZm9yIHRoZSBzcGVjaWZpYyBpT1MgY2xpZW50LCBidXQgbm90IGVu b3VnaCB0byBldmVyIGJlIHVzZWZ1bAorICAgICAgICB0byBhbnkgb3RoZXIgY2xpZW50LiBUaGVy ZWZvcmUgbW92ZSBpdCB0byBXZWJQYWdlSU9TLm1tLgorCisgICAgICAgIE9ubHkgTWFjIGFuZCBp T1Mgd2VyZSBldmVyIHVzaW5nIHRoaXMgZnVuY3Rpb24uIFRoZSBmb3JtZXIgb25seSBmb3IgdGVz dGluZyBwdXJwb3NlcworICAgICAgICB0aGF0IGhhdmUgc2luY2UgYmVlbiByZW1vdmVkLgorCisg ICAgICAgIEkgc2lkZSBlZmZlY3Qgb2YgdGhpcyBjaGFuZ2UgaXMgdGhhdCBJIGFsc28gbW92ZSBX ZWJQYWdlUHJveHk6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KCkKKyAgICAgICAgZnJvbSBXZWJQ YWdlUHJveHkuY3BwIHRvIFdlYlBhZ2VQcm94eUlPUy5tbS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnRleHRJ bnB1dENvbnRleHRzSW5SZWN0KTogRGVsZXRlZDsgbW92ZWQgdG8gV2ViUGFnZVByb3h5SU9TLm1t LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 Ojp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IE1vdmVkIGZyb20gV2ViUGFnZVByb3h5LmNwcC4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KTogRGVsZXRlZDsgbW92ZWQgdG8g V2ViUGFnZUlPUy5tbS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6dGV4dElucHV0Q29udGV4dHNJblJlY3QpOiBNb3ZlZCBmcm9tIFdlYlBhZ2Uu Y3BwLgorCiAyMDIwLTA0LTI4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgdW51c2VkIFdlYlBhZ2U6OmZvY3VzVGV4dElucHV0Q29udGV4dCgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjNDE1N2U2N2JjY2Zm MzUyNDAwYmZkZTQyOWI3OGViYTA0NTIxM2NkLi42MTg0ZDBmOGQ3YzNlYmE0OWRiZWJkODdmMDMw NGQyNjZmNjlhNjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTEwMDIyLDE2ICsxMDAyMiw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3ZWJWaWV3RGlkTW92 ZVRvV2luZG93KCkKICAgICB9CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojp0ZXh0SW5wdXRDb250 ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxldGlvbkhh bmRsZXIpCi17Ci0gICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKSB7Ci0gICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKHsgfSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBzZW5kV2l0 aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2U6OlRleHRJbnB1dENvbnRleHRzSW5SZWN0KHJl Y3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5 OjpzZXRDYW5TaG93UGxhY2Vob2xkZXIoY29uc3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQmIGNv bnRleHQsIGJvb2wgY2FuU2hvd1BsYWNlaG9sZGVyKQogewogICAgIGlmIChoYXNSdW5uaW5nUHJv Y2VzcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBlMzRjMGJk NWY0YjUyNDhlMGRjNjJmM2FlM2JjMTgwNWNkN2ZiNThiLi5hMzhkNDNlYTgwNGQ4NTdlMzdmMzU4 OTY5MDQzZGRhZDg5ZjFhM2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aApAQCAtNzA2LDcgKzcwNiw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlcXVlc3RGb250QXR0cmli dXRlc0F0U2VsZWN0aW9uU3RhcnQoRnVuY3Rpb248dm9pZChjb25zdCBXZWJDb3JlOjpGb250QXR0 cmlidXRlcyYsIENhbGxiYWNrQmFzZTo6RXJyb3IpPiYmKTsKICAgICB2b2lkIGZvbnRBdHRyaWJ1 dGVzQ2FsbGJhY2soY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmLCBDYWxsYmFja0lEKTsK IAotICAgIHZvaWQgdGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0LCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50Q29udGV4 dD4mKT4mJik7CiAgICAgdm9pZCBzZXRDYW5TaG93UGxhY2Vob2xkZXIoY29uc3QgV2ViQ29yZTo6 RWxlbWVudENvbnRleHQmLCBib29sKTsKIAogI2lmIEVOQUJMRShVSV9TSURFX0NPTVBPU0lUSU5H KQpAQCAtNzE0LDYgKzcxMyw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKKyAgICB2b2lkIHRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNvcmU6OkZsb2F0 UmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVu dENvbnRleHQ+Jik+JiYpOwogICAgIHZvaWQgZm9jdXNUZXh0SW5wdXRDb250ZXh0QW5kUGxhY2VD YXJldChjb25zdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCYsIGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAKICAgICB2b2lkIHNldFNo b3VsZFJldmVhbEN1cnJlbnRTZWxlY3Rpb25BZnRlckluc2VydGlvbihib29sKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCmluZGV4IDM4YzgwZmU0 ZmQ5MzBjYzE5Y2Y3Nzg1MjJmMmI0Y2VkNzVlMmMwNTcuLmVmOTI1ZjE0OGRjOTU2NzBkMjVhODQ5 OWM5YjQyM2ZkNzA4OGMxODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dl YlBhZ2VQcm94eUlPUy5tbQpAQCAtMTU0Niw2ICsxNTQ2LDE2IEBAIGJvb2wgV2ViUGFnZVByb3h5 OjpzaG91bGRGb3JjZUZvcmVncm91bmRQcmlvcml0eUZvckNsaWVudE5hdmlnYXRpb24oKSBjb25z dAogICAgIHJldHVybiBwYWdlQ2xpZW50KCkuaXNBcHBsaWNhdGlvblZpc2libGUoKTsKIH0KIAor dm9pZCBXZWJQYWdlUHJveHk6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KEZsb2F0UmVjdCByZWN0 LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxFbGVtZW50Q29udGV4dD4mKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpIHsK KyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6VGV4dElucHV0Q29u dGV4dHNJblJlY3QocmVjdCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKK30KKwogdm9p ZCBXZWJQYWdlUHJveHk6OmZvY3VzVGV4dElucHV0Q29udGV4dEFuZFBsYWNlQ2FyZXQoY29uc3Qg RWxlbWVudENvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFBvaW50JiBwb2ludCwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBpZiAoIWhh c1J1bm5pbmdQcm9jZXNzKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKaW5kZXggY2IwZDNjYzBiMmQwZmFkMzgyODRlNmRkOTc3NjE1YmY2ZjBkZDdi OS4uYjA3YmIzMGJiZGYzMjE4NGIzNTdlZjg5NWUzMDliZDg4MTA4OGI0MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTY4OTAsMjEgKzY4OTAs NiBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZUlucHV0Q29udGV4dEFmdGVyQmx1cnJpbmdBbmRSZWZv Y3VzaW5nRWxlbWVudElmTmVlZGVkKEVsZW1lbgogCiAjZW5kaWYgLy8gIVBMQVRGT1JNKElPU19G QU1JTFkpCiAKLXZvaWQgV2ViUGFnZTo6dGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6 RmxvYXRSZWN0IHNlYXJjaFJlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9y PFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0PiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQotewotICAg IGF1dG8gY29udGV4dHMgPSBtX3BhZ2UtPmVkaXRhYmxlRWxlbWVudHNJblJlY3Qoc2VhcmNoUmVj dCkubWFwKFsmXSAoY29uc3QgYXV0byYgZWxlbWVudCkgewotICAgICAgICBhdXRvJiBkb2N1bWVu dCA9IGVsZW1lbnQtPmRvY3VtZW50KCk7Ci0KLSAgICAgICAgV2ViQ29yZTo6RWxlbWVudENvbnRl eHQgY29udGV4dDsKLSAgICAgICAgY29udGV4dC53ZWJQYWdlSWRlbnRpZmllciA9IG1faWRlbnRp ZmllcjsKLSAgICAgICAgY29udGV4dC5kb2N1bWVudElkZW50aWZpZXIgPSBkb2N1bWVudC5pZGVu dGlmaWVyKCk7Ci0gICAgICAgIGNvbnRleHQuZWxlbWVudElkZW50aWZpZXIgPSBkb2N1bWVudC5p ZGVudGlmaWVyRm9yRWxlbWVudChlbGVtZW50KTsKLSAgICAgICAgY29udGV4dC5ib3VuZGluZ1Jl Y3QgPSBlbGVtZW50LT5jbGllbnRSZWN0KCk7Ci0gICAgICAgIHJldHVybiBjb250ZXh0OwotICAg IH0pOwotICAgIGNvbXBsZXRpb25IYW5kbGVyKGNvbnRleHRzKTsKLX0KLQogdm9pZCBXZWJQYWdl OjpzZXRDYW5TaG93UGxhY2Vob2xkZXIoY29uc3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQmIGVs ZW1lbnRDb250ZXh0LCBib29sIGNhblNob3dQbGFjZWhvbGRlcikKIHsKICAgICBSZWZQdHI8RWxl bWVudD4gZWxlbWVudCA9IGVsZW1lbnRGb3JDb250ZXh0KGVsZW1lbnRDb250ZXh0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA3YmIwMmRjYmI5NzM0 MGYwNmM4NGExYWY0MzkzZDk2YjY4MTdhZDEzLi4zMjliMGM5NGIzMWQyYWExODE4Y2Q3ZTI4ZWMx YWE2MmY4NmNmMmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCkBAIC02NDQsMTAgKzY0NCwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBleGVjdXRlRWRpdENv bW1hbmRXaXRoQ2FsbGJhY2soY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBhcmd1bWVudCwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIHNlbGVjdEFsbCgpOwogCi0g ICAgdm9pZCB0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3QsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0PiYp PiYmKTsKICAgICB2b2lkIHNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVt ZW50Q29udGV4dCYsIGJvb2wpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICB2b2lk IHRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNvcmU6OkZsb2F0UmVjdCwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYpOwog ICAgIHZvaWQgZm9jdXNUZXh0SW5wdXRDb250ZXh0QW5kUGxhY2VDYXJldChjb25zdCBXZWJDb3Jl OjpFbGVtZW50Q29udGV4dCYsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChib29sKT4mJik7CiAKICAgICBib29sIHNob3VsZFJldmVhbEN1cnJlbnRTZWxl Y3Rpb25BZnRlckluc2VydGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUmV2ZWFsQ3VycmVu dFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCA2OTcwYzg0OWQzZTk2YmYy OTU1M2E3MzZiOTNiYTY3YTZkYWM0NGZjLi5jMDdjOGZkOGZlYTE3YWQ4YmNjNDkwZDBhNzY5YWE4 ODYyZWNkYTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTEyMSw2ICsxMjEsNyBAQCBHZW5lcmF0ZVN5bnRoZXRp Y0VkaXRpbmdDb21tYW5kKGVudW06dWludDhfdCBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21t YW5kVHlwZQogICAgIFNldFNob3VsZFJldmVhbEN1cnJlbnRTZWxlY3Rpb25BZnRlckluc2VydGlv bihib29sIHNob3VsZFJldmVhbEN1cnJlbnRTZWxlY3Rpb25BZnRlckluc2VydGlvbikKICAgICBJ bnNlcnRUZXh0UGxhY2Vob2xkZXIoV2ViQ29yZTo6SW50U2l6ZSBzaXplKSAtPiAoT3B0aW9uYWw8 V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IHBsYWNlaG9sZGVyKSBBc3luYwogICAgIFJlbW92ZVRl eHRQbGFjZWhvbGRlcihzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQgcGxhY2Vob2xkZXIp IC0+ICgpIEFzeW5jCisgICAgVGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRS ZWN0IHJlY3QpIC0+IChWZWN0b3I8c3RydWN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0PiBjb250 ZXh0cykgQXN5bmMKICAgICBGb2N1c1RleHRJbnB1dENvbnRleHRBbmRQbGFjZUNhcmV0KHN0cnVj dCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCBjb250ZXh0LCBXZWJDb3JlOjpJbnRQb2ludCBwb2lu dCkgLT4gKGJvb2wgc3VjY2VzcykgQXN5bmMKICAgICBDbGVhclNlcnZpY2VXb3JrZXJFbnRpdGxl bWVudE92ZXJyaWRlKCkgLT4gKCkgQXN5bmMKICNlbmRpZgpAQCAtNTc3LDcgKzU3OCw2IEBAIEdl bmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhl dGljRWRpdGluZ0NvbW1hbmRUeXBlCiAgICAgVm9pY2VzRGlkQ2hhbmdlKCkKICNlbmRpZgogCi0g ICAgVGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0IHJlY3QpIC0+IChW ZWN0b3I8c3RydWN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0PiBjb250ZXh0cykgQXN5bmMKICAg ICBTZXRDYW5TaG93UGxhY2Vob2xkZXIoc3RydWN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0IGNv bnRleHQsIGJvb2wgY2FuU2hvd1BsYWNlaG9sZGVyKQogCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xP QURfU1RBVElTVElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMWE4MTI2YzYzZTI2ODYzYjg4NTg5M2RlNTUxNDM1NDI2 ZDg4NjdkZC4uOGIyMGMzYWY0ZWY3MTA1OWNiYWQ2ZmYyNzZlNjM0NmZhZDRmYWJhNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K QEAgLTQzMTMsNiArNDMxMywyMSBAQCB2b2lkIFdlYlBhZ2U6OnNldFNob3VsZFJldmVhbEN1cnJl bnRTZWxlY3Rpb25BZnRlckluc2VydGlvbihib29sIHNob3VsZFJldmVhbEN1cgogICAgIHNjaGVk dWxlRnVsbEVkaXRvclN0YXRlVXBkYXRlKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6dGV4dElucHV0 Q29udGV4dHNJblJlY3QoRmxvYXRSZWN0IHNlYXJjaFJlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgVmVjdG9yPEVsZW1lbnRDb250ZXh0PiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQor eworICAgIGF1dG8gY29udGV4dHMgPSBtX3BhZ2UtPmVkaXRhYmxlRWxlbWVudHNJblJlY3Qoc2Vh cmNoUmVjdCkubWFwKFsmXSAoY29uc3QgYXV0byYgZWxlbWVudCkgeworICAgICAgICBhdXRvJiBk b2N1bWVudCA9IGVsZW1lbnQtPmRvY3VtZW50KCk7CisKKyAgICAgICAgRWxlbWVudENvbnRleHQg Y29udGV4dDsKKyAgICAgICAgY29udGV4dC53ZWJQYWdlSWRlbnRpZmllciA9IG1faWRlbnRpZmll cjsKKyAgICAgICAgY29udGV4dC5kb2N1bWVudElkZW50aWZpZXIgPSBkb2N1bWVudC5pZGVudGlm aWVyKCk7CisgICAgICAgIGNvbnRleHQuZWxlbWVudElkZW50aWZpZXIgPSBkb2N1bWVudC5pZGVu dGlmaWVyRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICAgICAgY29udGV4dC5ib3VuZGluZ1JlY3Qg PSBlbGVtZW50LT5jbGllbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBjb250ZXh0OworICAgIH0p OworICAgIGNvbXBsZXRpb25IYW5kbGVyKGNvbnRleHRzKTsKK30KKwogdm9pZCBXZWJQYWdlOjpm b2N1c1RleHRJbnB1dENvbnRleHRBbmRQbGFjZUNhcmV0KGNvbnN0IEVsZW1lbnRDb250ZXh0JiBl bGVtZW50Q29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGF1dG8gdGFyZ2V0ID0gZWxl bWVudEZvckNvbnRleHQoZWxlbWVudENvbnRleHQpOwo= 397909 2020-04-28 17:05:42 -0700 2020-04-28 17:05:42 -0700 To Land bug-211136-20200428170541.patch text/plain 10135 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVmYmYxOWUwNTFiMGE0MDMy MjMyMDRmNmUxZTBkNTlhMjlkYjE1NmQuLjllZTJlNWI1YzViN2U5OWU1OWUxZmEwMjY0ODM2MDQy NTkxNzQ3YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDQtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QoKSB0byBXZWJQYWdlSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExMzYKKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIENhcmxzb24uCisKKyAgICAgICAgVGhlIGZ1bmN0aW9uIFdlYlBhZ2U6OnRleHRJbnB1 dENvbnRleHRzSW5SZWN0IGlzIHZlcnkgc3BlY2lmaWMgdG8gYSBjbGllbnQgb24gaU9TLgorICAg ICAgICBBbHRob3VnaCBpdCdzIHRlbXB0aW5nIHRvIGtlZXAgdGhpcyBjcm9zcy1wbGF0Zm9ybSBi ZWNhdXNlIGl0cyBpbXBsZW1lbnRhdGlvbiBkb2VzCisgICAgICAgIG5vdCBtYWtlIHVzZSBvZiBp T1Mtc3BlY2lmaWMgdGVjaG5vbG9naWVzIGl0IGRvZXMgYSB2ZXJ5IHNwZWNpZmljIG9wZXJhdGlv biwgdGhlCisgICAgICAgIHJlc3VsdCBvZiB3aGljaCBpcyBhIGxpc3Qgb2YgY29udGV4dHMgdG8g ZWRpdGFibGUgZWxlbWVudHMgb24gdGhlIHBhZ2UuIFRoZSBjb250ZXh0cworICAgICAgICBwcm92 aWRlIGVub3VnaCBpbmZvIGZvciB0aGUgc3BlY2lmaWMgaU9TIGNsaWVudCwgYnV0IG5vdCBlbm91 Z2ggdG8gZXZlciBiZSB1c2VmdWwKKyAgICAgICAgdG8gYW55IG90aGVyIGNsaWVudC4gVGhlcmVm b3JlIG1vdmUgaXQgdG8gV2ViUGFnZUlPUy5tbS4KKworICAgICAgICBPbmx5IE1hYyBhbmQgaU9T IHdlcmUgZXZlciB1c2luZyB0aGlzIGZ1bmN0aW9uLiBUaGUgZm9ybWVyIG9ubHkgZm9yIHRlc3Rp bmcgcHVycG9zZXMKKyAgICAgICAgdGhhdCBoYXZlIHNpbmNlIGJlZW4gcmVtb3ZlZC4KKworICAg ICAgICBBIHNpZGUgZWZmZWN0IG9mIHRoaXMgY2hhbmdlIGlzIHRoYXQgSSBhbHNvIG1vdmUgV2Vi UGFnZVByb3h5Ojp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCgpCisgICAgICAgIGZyb20gV2ViUGFn ZVByb3h5LmNwcCB0byBXZWJQYWdlUHJveHlJT1MubW0uCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZXh0SW5w dXRDb250ZXh0c0luUmVjdCk6IERlbGV0ZWQ7IG1vdmVkIHRvIFdlYlBhZ2VQcm94eUlPUy5tbS4K KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz L2lvcy9XZWJQYWdlUHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 dGV4dElucHV0Q29udGV4dHNJblJlY3QpOiBNb3ZlZCBmcm9tIFdlYlBhZ2VQcm94eS5jcHAuCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IERlbGV0ZWQ7IG1vdmVkIHRvIFdl YlBhZ2VJT1MubW0uCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KTogTW92ZWQgZnJvbSBXZWJQYWdlLmNw cC4KKwogMjAyMC0wNC0yOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdW1dLMl0gRHJvcCBwcm9jZXNzIGFzc2VydGlvbiBsb2dpYyBmb3IgaG9sZGluZyBs b2NrZWQgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4 IDNhMjI3ZTU1OTBmNzlkZmEzYzg1ZjhhOTQ4ZTNiZDZmOTYzNDk3YzcuLjBkMzA4ZTZjYmY2ODY3 OTI2ZDQxNzc5MWEwMzQyYWRmYWY3NWMxMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcApAQCAtMTAwMjYsMTYgKzEwMDI2LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OndlYlZpZXdEaWRNb3ZlVG9XaW5kb3coKQogICAgIH0KIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6 OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNvcmU6OkZsb2F0UmVjdCByZWN0LCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50Q29udGV4dD4mKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKLXsKLSAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpIHsK LSAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQotICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6VGV4dElucHV0Q29u dGV4dHNJblJlY3QocmVjdCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLX0KLQogdm9p ZCBXZWJQYWdlUHJveHk6OnNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVt ZW50Q29udGV4dCYgY29udGV4dCwgYm9vbCBjYW5TaG93UGxhY2Vob2xkZXIpCiB7CiAgICAgaWYg KGhhc1J1bm5pbmdQcm9jZXNzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CmluZGV4IGUzNGMwYmQ1ZjRiNTI0OGUwZGM2MmYzYWUzYmMxODA1Y2Q3ZmI1OGIuLmEzOGQ0M2Vh ODA0ZDg1N2UzN2YzNTg5NjkwNDNkZGFkODlmMWEzYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCkBAIC03MDYsNyArNzA2LDYgQEAgcHVibGljOgogICAgIHZvaWQgcmVx dWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChGdW5jdGlvbjx2b2lkKGNvbnN0IFdl YkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+JiYpOwogICAgIHZv aWQgZm9udEF0dHJpYnV0ZXNDYWxsYmFjayhjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYs IENhbGxiYWNrSUQpOwogCi0gICAgdm9pZCB0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3Jl OjpGbG9hdFJlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFdlYkNvcmU6 OkVsZW1lbnRDb250ZXh0PiYpPiYmKTsKICAgICB2b2lkIHNldENhblNob3dQbGFjZWhvbGRlcihj b25zdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCYsIGJvb2wpOwogCiAjaWYgRU5BQkxFKFVJX1NJ REVfQ09NUE9TSVRJTkcpCkBAIC03MTQsNiArNzEzLDcgQEAgcHVibGljOgogI2VuZGlmCiAKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIHZvaWQgdGV4dElucHV0Q29udGV4dHNJblJlY3Qo V2ViQ29yZTo6RmxvYXRSZWN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxX ZWJDb3JlOjpFbGVtZW50Q29udGV4dD4mKT4mJik7CiAgICAgdm9pZCBmb2N1c1RleHRJbnB1dENv bnRleHRBbmRQbGFjZUNhcmV0KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKIAog ICAgIHZvaWQgc2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKGJv b2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94 eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0K aW5kZXggMzhjODBmZTRmZDkzMGNjMTljZjc3ODUyMmYyYjRjZWQ3NWUyYzA1Ny4uZWY5MjVmMTQ4 ZGM5NTY3MGQyNWE4NDk5YzliNDIzZmQ3MDg4YzE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCkBAIC0xNTQ2LDYgKzE1NDYsMTYgQEAgYm9v bCBXZWJQYWdlUHJveHk6OnNob3VsZEZvcmNlRm9yZWdyb3VuZFByaW9yaXR5Rm9yQ2xpZW50TmF2 aWdhdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIHBhZ2VDbGllbnQoKS5pc0FwcGxpY2F0aW9uVmlz aWJsZSgpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6dGV4dElucHV0Q29udGV4dHNJblJlY3Qo RmxvYXRSZWN0IHJlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPEVsZW1l bnRDb250ZXh0PiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIGlmICghaGFzUnVubmlu Z1Byb2Nlc3MoKSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdl OjpUZXh0SW5wdXRDb250ZXh0c0luUmVjdChyZWN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cikpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6Zm9jdXNUZXh0SW5wdXRDb250ZXh0QW5kUGxh Y2VDYXJldChjb25zdCBFbGVtZW50Q29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBv aW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQog ewogICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAwNTNiOTkxYjAyMWJiMjg5MmJiNTY4NjE3 YzkwMDgwYzg1Y2E1ZjE1Li44YjNjMDY0OThjNzRkNDNlMDNjMzU0ZWNhMGViNTZmNzdlOGFjNTNk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt NjkxNywyMSArNjkxNyw2IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlSW5wdXRDb250ZXh0QWZ0ZXJC bHVycmluZ0FuZFJlZm9jdXNpbmdFbGVtZW50SWZOZWVkZWQoRWxlbWVuCiAKICNlbmRpZiAvLyAh UExBVEZPUk0oSU9TX0ZBTUlMWSkKIAotdm9pZCBXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0lu UmVjdChXZWJDb3JlOjpGbG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxldGlvbkhh bmRsZXIpCi17Ci0gICAgYXV0byBjb250ZXh0cyA9IG1fcGFnZS0+ZWRpdGFibGVFbGVtZW50c0lu UmVjdChzZWFyY2hSZWN0KS5tYXAoWyZdIChjb25zdCBhdXRvJiBlbGVtZW50KSB7Ci0gICAgICAg IGF1dG8mIGRvY3VtZW50ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsKLQotICAgICAgICBXZWJDb3Jl OjpFbGVtZW50Q29udGV4dCBjb250ZXh0OwotICAgICAgICBjb250ZXh0LndlYlBhZ2VJZGVudGlm aWVyID0gbV9pZGVudGlmaWVyOwotICAgICAgICBjb250ZXh0LmRvY3VtZW50SWRlbnRpZmllciA9 IGRvY3VtZW50LmlkZW50aWZpZXIoKTsKLSAgICAgICAgY29udGV4dC5lbGVtZW50SWRlbnRpZmll ciA9IGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQpOwotICAgICAgICBjb250 ZXh0LmJvdW5kaW5nUmVjdCA9IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsKLSAgICAgICAgcmV0dXJu IGNvbnRleHQ7Ci0gICAgfSk7Ci0gICAgY29tcGxldGlvbkhhbmRsZXIoY29udGV4dHMpOwotfQot CiB2b2lkIFdlYlBhZ2U6OnNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVt ZW50Q29udGV4dCYgZWxlbWVudENvbnRleHQsIGJvb2wgY2FuU2hvd1BsYWNlaG9sZGVyKQogewog ICAgIFJlZlB0cjxFbGVtZW50PiBlbGVtZW50ID0gZWxlbWVudEZvckNvbnRleHQoZWxlbWVudENv bnRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4 IGY4MjQ1Mzc5OTdlMDlkNWY3NGI2NjMxNzE5ZDdlZjcyZmIwZmE5OTkuLmJjOGVhNjYwZmJjMDJm YmViYWM1NGU4NTUyZjU0MmNhMmY1YjAwN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY0NCwxMCArNjQ0LDEwIEBAIHB1YmxpYzoKICAgICB2b2lk IGV4ZWN1dGVFZGl0Q29tbWFuZFdpdGhDYWxsYmFjayhjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJp bmcmIGFyZ3VtZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2Vs ZWN0QWxsKCk7CiAKLSAgICB2b2lkIHRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNvcmU6OkZs b2F0UmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxl bWVudENvbnRleHQ+Jik+JiYpOwogICAgIHZvaWQgc2V0Q2FuU2hvd1BsYWNlaG9sZGVyKGNvbnN0 IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgYm9vbCk7CiAKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQorICAgIHZvaWQgdGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0 LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpFbGVtZW50Q29u dGV4dD4mKT4mJik7CiAgICAgdm9pZCBmb2N1c1RleHRJbnB1dENvbnRleHRBbmRQbGFjZUNhcmV0 KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKIAogICAgIGJvb2wgc2hvdWxkUmV2 ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zaG91 bGRSZXZlYWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb247IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IGFi ZjQyZDc3MWJhNjA4MTc1NDA0YTFkNzVkNjYxN2YwZGQ4OTc5ZTMuLjRkYTI1ZTMyOTVhODA1MzE4 YTgyNTVjMjcxYmY1ZTViYjc3Y2E5YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMTIxLDYgKzEyMSw3IEBAIEdl bmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhl dGljRWRpdGluZ0NvbW1hbmRUeXBlCiAgICAgU2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlv bkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5z ZXJ0aW9uKQogICAgIEluc2VydFRleHRQbGFjZWhvbGRlcihXZWJDb3JlOjpJbnRTaXplIHNpemUp IC0+IChPcHRpb25hbDxXZWJDb3JlOjpFbGVtZW50Q29udGV4dD4gcGxhY2Vob2xkZXIpIEFzeW5j CiAgICAgUmVtb3ZlVGV4dFBsYWNlaG9sZGVyKHN0cnVjdCBXZWJDb3JlOjpFbGVtZW50Q29udGV4 dCBwbGFjZWhvbGRlcikgLT4gKCkgQXN5bmMKKyAgICBUZXh0SW5wdXRDb250ZXh0c0luUmVjdChX ZWJDb3JlOjpGbG9hdFJlY3QgcmVjdCkgLT4gKFZlY3RvcjxzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVu dENvbnRleHQ+IGNvbnRleHRzKSBBc3luYwogICAgIEZvY3VzVGV4dElucHV0Q29udGV4dEFuZFBs YWNlQ2FyZXQoc3RydWN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0IGNvbnRleHQsIFdlYkNvcmU6 OkludFBvaW50IHBvaW50KSAtPiAoYm9vbCBzdWNjZXNzKSBBc3luYwogICAgIENsZWFyU2Vydmlj ZVdvcmtlckVudGl0bGVtZW50T3ZlcnJpZGUoKSAtPiAoKSBBc3luYwogI2VuZGlmCkBAIC01Nzcs NyArNTc4LDYgQEAgR2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChlbnVtOnVpbnQ4X3Qg V2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUKICAgICBWb2ljZXNEaWRDaGFuZ2Uo KQogI2VuZGlmCiAKLSAgICBUZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJl Y3QgcmVjdCkgLT4gKFZlY3RvcjxzdHJ1Y3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IGNvbnRl eHRzKSBBc3luYwogICAgIFNldENhblNob3dQbGFjZWhvbGRlcihzdHJ1Y3QgV2ViQ29yZTo6RWxl bWVudENvbnRleHQgY29udGV4dCwgYm9vbCBjYW5TaG93UGxhY2Vob2xkZXIpCiAKICNpZiBFTkFC TEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCAzOTIzOWFlYzc3Nzk5MThiODAx YTg4ZDhjMTcxZjUxMDNiYTEzMDExLi4xZWQ4YWRlODJkN2VkMGQ5OGNiZjZkYWRjNTY2YmE4ZGQ0 M2VhOTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbQpAQCAtNDMxNSw2ICs0MzE1LDIxIEBAIHZvaWQgV2ViUGFnZTo6c2V0U2hv dWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZWFs Q3VyCiAgICAgc2NoZWR1bGVGdWxsRWRpdG9yU3RhdGVVcGRhdGUoKTsKIH0KIAordm9pZCBXZWJQ YWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChGbG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxl dGlvbkhhbmRsZXIpCit7CisgICAgYXV0byBjb250ZXh0cyA9IG1fcGFnZS0+ZWRpdGFibGVFbGVt ZW50c0luUmVjdChzZWFyY2hSZWN0KS5tYXAoWyZdIChjb25zdCBhdXRvJiBlbGVtZW50KSB7Cisg ICAgICAgIGF1dG8mIGRvY3VtZW50ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsKKworICAgICAgICBF bGVtZW50Q29udGV4dCBjb250ZXh0OworICAgICAgICBjb250ZXh0LndlYlBhZ2VJZGVudGlmaWVy ID0gbV9pZGVudGlmaWVyOworICAgICAgICBjb250ZXh0LmRvY3VtZW50SWRlbnRpZmllciA9IGRv Y3VtZW50LmlkZW50aWZpZXIoKTsKKyAgICAgICAgY29udGV4dC5lbGVtZW50SWRlbnRpZmllciA9 IGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQpOworICAgICAgICBjb250ZXh0 LmJvdW5kaW5nUmVjdCA9IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIGNv bnRleHQ7CisgICAgfSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIoY29udGV4dHMpOworfQorCiB2 b2lkIFdlYlBhZ2U6OmZvY3VzVGV4dElucHV0Q29udGV4dEFuZFBsYWNlQ2FyZXQoY29uc3QgRWxl bWVudENvbnRleHQmIGVsZW1lbnRDb250ZXh0LCBjb25zdCBJbnRQb2ludCYgcG9pbnQsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgYXV0 byB0YXJnZXQgPSBlbGVtZW50Rm9yQ29udGV4dChlbGVtZW50Q29udGV4dCk7Cg==