51269 2010-12-17 12:06:16 -0800 Text area does not update when you arrow through a <select> in WebKit2 2010-12-17 13:09:17 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 bweinstein bweinstein aroben bweinstein jhoneycutt oldest_to_newest 323916 0 bweinstein 2010-12-17 12:06:16 -0800 Text area does not update when you arrow through a <select> in WebKit2. <rdar://problem/8612853> 323945 1 76904 bweinstein 2010-12-17 12:54:35 -0800 Created attachment 76904 [PATCH] Fix 323948 2 76904 andersca 2010-12-17 12:56:52 -0800 Comment on attachment 76904 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=76904&action=review > WebKit2/UIProcess/WebPageProxy.h:104 > +class WebPageProxy : public APIObject, public WebPopupMenuProxy::Client { Please remove public here. 323953 3 bweinstein 2010-12-17 13:05:36 -0800 (In reply to comment #2) > (From update of attachment 76904 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=76904&action=review > > > WebKit2/UIProcess/WebPageProxy.h:104 > > +class WebPageProxy : public APIObject, public WebPopupMenuProxy::Client { > > Please remove public here. I get a compile error in WebView.cpp if I do :-(. I'll land this patch as-is + a change to UIProcess/qt/WebPopupMenuProxyQt.cpp 323956 4 bweinstein 2010-12-17 13:09:17 -0800 Landed in r74285. 76904 2010-12-17 12:54:35 -0800 2010-12-17 12:56:52 -0800 [PATCH] Fix popup_arrow_when_open.patch text/plain 22399 bweinstein SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDI4MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNjUgQEAKKzIwMTAtMTItMTcgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRleHQgYXJlYSBkb2VzIG5vdCB1cGRhdGUgd2hlbiB5b3UgYXJyb3cgdGhyb3VnaCBhIDxz ZWxlY3Q+IGluIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUxMjY5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NjEyODUzPgorICAgICAg ICAKKyAgICAgICAgUGF0Y2ggYnkgU2FtIFdlaW5pZy4KKyAgICAgICAgCisgICAgICAgIEluc3Rl YWVkIG9mIGtlZXBpbmcgdHJhY2sgb2YgdGhlIHNlbGVjdGVkIGluZGV4IG9mIGEgPHNlbGVjdD4g anVzdCBpbiB0aGUgVUkgcHJvY2Vzcywgd2UKKyAgICAgICAgbmVlZCB0byBwYXNzIHRoaXMgaW5m b3JtYXRpb24gYWxvbmcgdG8gdGhlIHdlYiBwcm9jZXNzIHNvIHRoYXQgdGhlIHdlYiBwcm9jZXNz IGNhbiBkcmF3CisgICAgICAgIHRoZSBjb3JyZWN0IHRleHQgaW4gdGhlIHRleHQgZmllbGQgYXQg dGhlIHRvcCBvZiB0aGUgc2VsZWN0LCB3aGVuIHRoZSBzZWxlY3Rpb24gY2hhbmdlcyAodmlhCisg ICAgICAgIHRoZSBhcnJvd3Mgb3Igb3RoZXIgdHlwaW5nIHdoaWxlIHRoZSBzZWxlY3QgaXMgb3Bl bmVkKS4KKyAgICAgICAgCisgICAgICAgIFdoZW4gdGhlIHNlbGVjdGVkIGl0ZW0gaW4gYSBwb3B1 cCBjaGFuZ2VzLCB0aGUgVUkgcHJvY2VzcyBzZW5kcyBhIG1lc3NhZ2UgdG8gdGhlIHdlYiBwcm9j ZXNzLCB0ZWxsaW5nCisgICAgICAgIGl0IGFib3V0IHRoZSBuZXcgc2VsZWN0ZWQgaW5kZXguIFRo ZSB3ZWIgcHJvY2VzcyBnZXRzIHRoaXMgbWVzc2FnZSwgYW5kIHRoZW4gc2V0cyB0aGUgdGV4dCB0 aGF0CisgICAgICAgIGlzIHZpc2libGUgaW4gdGhlIHNlbGVjdCBlbGVtZW50LgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDogQ3JlYXRlUG9wdXBNZW51UHJv eHkgbm93IHRha2VzIGEgV2ViUGFnZVByb3h5LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFj L1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6Y3Jl YXRlUG9wdXBNZW51UHJveHkpOiBQYXNzIHRoZSBXZWJQYWdlUHJveHkgdG8gY3JlYXRlLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlUHJp dmF0ZTo6Y3JlYXRlUG9wdXBNZW51UHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv cXdrcGFnZV9wLmg6IENyZWF0ZVBvcHVwTWVudVByb3h5IG5vdyB0YWtlcyBhIFdlYlBhZ2VQcm94 eS4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOiBDcmVhdGVQb3B1cE1lbnVQcm94 eSBub3cgdGFrZXMgYSBXZWJQYWdlUHJveHkuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmFsdWVDaGFuZ2VkRm9y UG9wdXBNZW51KTogU2VuZCB0aGF0IHRoZSBzZWxlY3RlZCBpbmRleCBjaGFuZ2VkIHRvIHRoZSAK KyAgICAgICAgICAgIHdlYiBwcm9jZXNzLnNlbGVjdGVkCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6c2V0VGV4dEZyb21JdGVtRm9yUG9wdXBNZW51KTogU2VuZCB0aGF0IHdlIHNob3Vs ZCB1cGRhdGUgdGhlIHRleHQgZm9yIHRoZQorICAgICAgICAgICAgYWN0aXZlIHBvcHVwIG1lbnUg KHdpdGggdGhlIGluZGV4IG9mIHRoZSBpdGVtIHRvIHNob3cpLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNob3dQb3B1cE1lbnUpOiBQYXNzIHRoZSBXZWJQYWdlUHJveHkgdG8gY3Jl YXRlUG9wdXBNZW51UHJveHkuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQb3B1cE1lbnVQcm94eS5oOiBBZGQgYSBjbGllbnQgd2hv IGhhcyB2aXJ0dWFsIGZ1bmN0aW9ucyBmb3IgdGhlIHN0YXRlIGNoYW5naW5nIG9mIHRoZQorICAg ICAgICAgICAgcG9wdXAgbWVudS4gU2hvd1BvcHVwTWVudSBkb2Vzbid0IHRha2UgYSBuZXcgc2Vs ZWN0ZWQgaW5kZXggYW55bW9yZSwgdGhhdCBpcyBoYW5kbGVkIGJ5IHRoZSBjbGllbnQsCisgICAg ICAgICAgICBhbmQgY2FsbGluZyBkb3duIHRvIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAgICAgKFdl YktpdDo6V2ViUG9wdXBNZW51UHJveHk6OkNsaWVudDo6fkNsaWVudCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBvcHVwTWVudVByb3h5OjpXZWJQb3B1cE1lbnVQcm94eSk6IEluaXRpYWxpemUgdGhl IGNsaWVudC4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVByb3h5TWFjLmg6 CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudVByb3h5TWFjOjpjcmVhdGUpOiBUYWtlcyBh IFdlYlBvcHVwTWVudVByb3h5OjpDbGllbnQsIGFuZCBwYXNzZXMgaXQgdG8gdGhlIGNvbnN0cnVj dG9yLgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUG9wdXBNZW51UHJveHlNYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudVByb3h5TWFjOjpXZWJQb3B1cE1lbnVQcm94eU1h Yyk6IFVwZGF0ZSB3aGF0J3MgaW5pdGlhbGl6ZWQgYnkgdGhlIGNvbnN0cnVjdG9yLgorICAgICAg ICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eU1hYzo6c2hvd1BvcHVwTWVudSk6IENhbGwgdGhy b3VnaCB0byB0aGUgd2ViIHByb2Nlc3MgdGhhdCB0aGUgdmFsdWUgY2hhbmdlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvcXQvV2ViUG9wdXBNZW51UHJveHlRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBvcHVwTWVudVByb3h5UXQ6OldlYlBvcHVwTWVudVByb3h5UXQpOiBVcGRhdGUgd2hhdCdz IGluaXRpYWxpemVkIGJ5IHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgKiBVSVByb2Nlc3Mvd2lu L1dlYlBvcHVwTWVudVByb3h5V2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51 UHJveHlXaW46OldlYlBvcHVwTWVudVByb3h5V2luKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6 OldlYlBvcHVwTWVudVByb3h5V2luOjpzaG93UG9wdXBNZW51KTogQ2FsbCB0aHJvdWdoIHRvIHRo ZSB3ZWIgcHJvY2VzcyB0aGF0IHRoZSB2YWx1ZSBjaGFuZ2VkLgorICAgICAgICAoV2ViS2l0OjpX ZWJQb3B1cE1lbnVQcm94eVdpbjo6c2V0Rm9jdXNlZEluZGV4KTogUmVzb2x2ZSBhIEZJWE1FIHRv IHNldCB0aGUgdGV4dCBvZiB0aGUgcG9wdXAgbWVudS4KKyAgICAgICAgKiBVSVByb2Nlc3Mvd2lu L1dlYlBvcHVwTWVudVByb3h5V2luLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudVBy b3h5V2luOjpjcmVhdGUpOiBUYWtlIGluIGEgV2ViUG9wdXBNZW51UHJveHk6OmNsaWVudCwgYW5k IHBhc3MgaXQgdG8gdGhlIGNvbnN0cnVjdG9yLgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2Vi Vmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmNyZWF0ZVBvcHVwTWVudVByb3h5 KTogUGFzcyB0aGUgV2ViUGFnZVByb3h5IHRvIGNyZWF0ZS4KKyAgICAgICAgKiBVSVByb2Nlc3Mv d2luL1dlYlZpZXcuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlBv cHVwTWVudS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudTo6c2V0VGV4dEZvcklu ZGV4KTogQ2FsbCB0aHJvdWdoIHRvIHNldFRleHRGcm9tSXRlbSB0byBzZXQgdGhlIHNlbGVjdCB0 ZXh0LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUG9wdXBNZW51Lmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOiBDYWxsIHRocm91Z2gg dG8gc2V0VGV4dEZvckluZGV4IG9uIHRoZSBhY3RpdmUgcG9wdXAgbWVudS4KKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6c2V0VGV4dEZvckFjdGl2ZVBvcHVwTWVudSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbjogQWRkIGEgbmV3IG1lc3NhZ2UuCisKIDIwMTAtMTItMTcgIERh biBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHJldmlzaW9uIDc0MjE5KQorKysg V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw3ICs4 Miw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RIYW5kbGVLZXlFdmVudChj b25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JikgPSAwOwogCi0gICAgdmlydHVhbCBQYXNzUmVm UHRyPFdlYlBvcHVwTWVudVByb3h5PiBjcmVhdGVQb3B1cE1lbnVQcm94eSgpID0gMDsKKyAgICB2 aXJ0dWFsIFBhc3NSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5 KFdlYlBhZ2VQcm94eSopID0gMDsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29udGV4dE1l bnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkqKSA9IDA7CiAKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RmluZEluZGljYXRvcihQYXNzUmVmUHRyPEZpbmRJbmRpY2F0b3I+ LCBib29sIGZhZGVPdXQpID0gMDsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko cmV2aXNpb24gNzQyMTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNDI1LDE3ICsxNDI1LDI0IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRGYWlsVG9GaW5kU3RyaW5nKGMKICAgICBtX2ZpbmRDbGllbnQuZGlkRmFpbFRvRmluZFN0cmlu Zyh0aGlzLCBzdHJpbmcpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6dmFsdWVDaGFuZ2VkRm9y UG9wdXBNZW51KFdlYlBvcHVwTWVudVByb3h5KiwgaW50MzJfdCBuZXdTZWxlY3RlZEluZGV4KQor eworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkQ2hhbmdlU2VsZWN0 ZWRJbmRleEZvckFjdGl2ZVBvcHVwTWVudShuZXdTZWxlY3RlZEluZGV4KSwgbV9wYWdlSUQpOwor fQorCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0VGV4dEZyb21JdGVtRm9yUG9wdXBNZW51KFdlYlBv cHVwTWVudVByb3h5KiwgaW50MzJfdCBpbmRleCkKK3sKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldFRleHRGb3JBY3RpdmVQb3B1cE1lbnUoaW5kZXgpLCBtX3BhZ2VJ RCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3Qm IHJlY3QsIGNvbnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxlY3Rl ZEluZGV4LCBjb25zdCBQbGF0Zm9ybVBvcHVwTWVudURhdGEmIGRhdGEpCiB7CiAgICAgaWYgKG1f YWN0aXZlUG9wdXBNZW51KQogICAgICAgICBtX2FjdGl2ZVBvcHVwTWVudS0+aGlkZVBvcHVwTWVu dSgpOwogICAgIGVsc2UKLSAgICAgICAgbV9hY3RpdmVQb3B1cE1lbnUgPSBtX3BhZ2VDbGllbnQt PmNyZWF0ZVBvcHVwTWVudVByb3h5KCk7CisgICAgICAgIG1fYWN0aXZlUG9wdXBNZW51ID0gbV9w YWdlQ2xpZW50LT5jcmVhdGVQb3B1cE1lbnVQcm94eSh0aGlzKTsKIAotICAgIGludDMyX3QgbmV3 U2VsZWN0ZWRJbmRleCA9IDA7Ci0gICAgbV9hY3RpdmVQb3B1cE1lbnUtPnNob3dQb3B1cE1lbnUo cmVjdCwgaXRlbXMsIGRhdGEsIHNlbGVjdGVkSW5kZXgsIG5ld1NlbGVjdGVkSW5kZXgpOwotCi0g ICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRDaGFuZ2VTZWxlY3RlZElu ZGV4Rm9yQWN0aXZlUG9wdXBNZW51KG5ld1NlbGVjdGVkSW5kZXgpLCBtX3BhZ2VJRCk7CisgICAg bV9hY3RpdmVQb3B1cE1lbnUtPnNob3dQb3B1cE1lbnUocmVjdCwgaXRlbXMsIGRhdGEsIHNlbGVj dGVkSW5kZXgpOwogICAgIG1fYWN0aXZlUG9wdXBNZW51ID0gMDsKIH0KIApJbmRleDogV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAKICNpbmNsdWRl ICJXZWJJbnNwZWN0b3JQcm94eS5oIgogI2luY2x1ZGUgIldlYkxvYWRlckNsaWVudC5oIgogI2lu Y2x1ZGUgIldlYlBvbGljeUNsaWVudC5oIgorI2luY2x1ZGUgIldlYlBvcHVwTWVudVByb3h5Lmgi CiAjaW5jbHVkZSAiV2ViVUlDbGllbnQuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0VkaXRBY3Rpb24u aD4KICNpbmNsdWRlIDxXZWJDb3JlL0VkaXRvci5oPgpAQCAtMTAwLDcgKzEwMSw3IEBAIHR5cGVk ZWYgR2VuZXJpY0NhbGxiYWNrPFdLU3RyaW5nUmVmLCBTdHIKIHR5cGVkZWYgR2VuZXJpY0NhbGxi YWNrPFdLU3RyaW5nUmVmLCBTdHJpbmdJbXBsKj4gU2NyaXB0UmV0dXJuVmFsdWVDYWxsYmFjazsK IHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPFdLU3RyaW5nUmVmLCBTdHJpbmdJbXBsKj4gQ29udGVu dHNBc1N0cmluZ0NhbGxiYWNrOwogCi1jbGFzcyBXZWJQYWdlUHJveHkgOiBwdWJsaWMgQVBJT2Jq ZWN0IHsKK2NsYXNzIFdlYlBhZ2VQcm94eSA6IHB1YmxpYyBBUElPYmplY3QsIHB1YmxpYyBXZWJQ b3B1cE1lbnVQcm94eTo6Q2xpZW50IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgVHlwZSBB UElUeXBlID0gVHlwZVBhZ2U7CiAKQEAgLTI5NSw2ICsyOTYsMTAgQEAgcHJpdmF0ZToKIAogICAg IHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogCisgICAgLy8g V2ViUG9wdXBNZW51UHJveHk6OkNsaWVudAorICAgIHZpcnR1YWwgdm9pZCB2YWx1ZUNoYW5nZWRG b3JQb3B1cE1lbnUoV2ViUG9wdXBNZW51UHJveHkqLCBpbnQzMl90IG5ld1NlbGVjdGVkSW5kZXgp OworICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0RnJvbUl0ZW1Gb3JQb3B1cE1lbnUoV2ViUG9wdXBN ZW51UHJveHkqLCBpbnQzMl90IGluZGV4KTsKKwogICAgIC8vIEltcGxlbWVudGVkIGluIGdlbmVy YXRlZCBXZWJQYWdlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCiAgICAgdm9pZCBkaWRSZWNlaXZl V2ViUGFnZVByb3h5TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2Fn ZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqKTsKICAgICBDb3JlSVBDOjpTeW5jUmVwbHlN b2RlIGRpZFJlY2VpdmVTeW5jV2ViUGFnZVByb3h5TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9u KiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBDb3JlSVBD OjpBcmd1bWVudEVuY29kZXIqKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBvcHVwTWVu dVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9wdXBNZW51UHJv eHkuaAkocmV2aXNpb24gNzQyMTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQb3B1cE1lbnVQ cm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCwxOCArNDAsMzIgQEAgc3RydWN0IFBsYXRmb3Jt UG9wdXBNZW51RGF0YTsKIHN0cnVjdCBXZWJQb3B1cEl0ZW07CiAKIGNsYXNzIFdlYlBvcHVwTWVu dVByb3h5IDogcHVibGljIFJlZkNvdW50ZWQ8V2ViUG9wdXBNZW51UHJveHk+IHsKLXB1YmxpYzog ICAgCitwdWJsaWM6CisgICAgY2xhc3MgQ2xpZW50IHsKKyAgICBwcm90ZWN0ZWQ6CisgICAgICAg IHZpcnR1YWwgfkNsaWVudCgpCisgICAgICAgIHsKKyAgICAgICAgfQorCisgICAgcHVibGljOgor ICAgICAgICB2aXJ0dWFsIHZvaWQgdmFsdWVDaGFuZ2VkRm9yUG9wdXBNZW51KFdlYlBvcHVwTWVu dVByb3h5KiwgaW50MzJfdCBuZXdTZWxlY3RlZEluZGV4KSA9IDA7CisgICAgICAgIHZpcnR1YWwg dm9pZCBzZXRUZXh0RnJvbUl0ZW1Gb3JQb3B1cE1lbnUoV2ViUG9wdXBNZW51UHJveHkqLCBpbnQz Ml90IGluZGV4KSA9IDA7CisgICAgfTsKKwogICAgIHZpcnR1YWwgfldlYlBvcHVwTWVudVByb3h5 KCkKICAgICB7CiAgICAgfQogCi0gICAgdmlydHVhbCB2b2lkIHNob3dQb3B1cE1lbnUoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgcmVjdCwgY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4mIGl0ZW1z LCBjb25zdCBQbGF0Zm9ybVBvcHVwTWVudURhdGEmLCBpbnQzMl90IHNlbGVjdGVkSW5kZXgsIGlu dDMyX3QmIG5ld1NlbGVjdGVkSW5kZXgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd1BvcHVw TWVudShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0LCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJ dGVtPiYgaXRlbXMsIGNvbnN0IFBsYXRmb3JtUG9wdXBNZW51RGF0YSYsIGludDMyX3Qgc2VsZWN0 ZWRJbmRleCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBoaWRlUG9wdXBNZW51KCkgPSAwOwogCiBw cm90ZWN0ZWQ6Ci0gICAgV2ViUG9wdXBNZW51UHJveHkoKQorICAgIFdlYlBvcHVwTWVudVByb3h5 KENsaWVudCogY2xpZW50KQorICAgICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICB7CiAgICAg fQorCisgICAgQ2xpZW50KiBtX2NsaWVudDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAkocmV2aXNp b24gNzQyMTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJ KHdvcmtpbmcgY29weSkKQEAgLTY2LDcgKzY2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZv aWQgZGlkTm90SGFuZGxlS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYpOwog ICAgIHZpcnR1YWwgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKGJvb2wsIGJvb2wsIGJvb2wsIGJvb2ws IHVpbnQ2NF90LCB1aW50NjRfdCk7CiAKLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViUG9wdXBN ZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KCk7CisgICAgdmlydHVhbCBQYXNzUmVmUHRy PFdlYlBvcHVwTWVudVByb3h5PiBjcmVhdGVQb3B1cE1lbnVQcm94eShXZWJQYWdlUHJveHkqKTsK ICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4 dE1lbnVQcm94eShXZWJQYWdlUHJveHkqKTsKIAogICAgIHZvaWQgc2V0RmluZEluZGljYXRvcihQ YXNzUmVmUHRyPEZpbmRJbmRpY2F0b3I+LCBib29sIGZhZGVPdXQpOwpJbmRleDogV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiA3NDIxOSkKKysr IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHdvcmtpbmcgY29w eSkKQEAgLTI0Nyw5ICsyNDcsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWROb3RIYW5kbGVL ZXlFdmVuCiAgICAgfQogfQogCi1QYXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBQYWdlQ2xp ZW50SW1wbDo6Y3JlYXRlUG9wdXBNZW51UHJveHkoKQorUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQ cm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSog cGFnZSkKIHsKLSAgICByZXR1cm4gV2ViUG9wdXBNZW51UHJveHlNYWM6OmNyZWF0ZShtX3drVmll dyk7CisgICAgcmV0dXJuIFdlYlBvcHVwTWVudVByb3h5TWFjOjpjcmVhdGUobV93a1ZpZXcsIHBh Z2UpOwogfQogCiBQYXNzUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBs OjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSogcGFnZSkKSW5kZXg6IFdlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNyArMTM2 LDcgQEAgdm9pZCBRV0tQYWdlUHJpdmF0ZTo6ZGlkTm90SGFuZGxlS2V5RXZlbgogewogfQogCi1Q YXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBRV0tQYWdlUHJpdmF0ZTo6Y3JlYXRlUG9wdXBN ZW51UHJveHkoKQorUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94eT4gUVdLUGFnZVByaXZhdGU6 OmNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSopCiB7CiAgICAgcmV0dXJuIFdlYlBv cHVwTWVudVByb3h5UXQ6OmNyZWF0ZSgpOwogfQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F3a3BhZ2VfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2twYWdlX3AuaAkocmV2aXNpb24gNzQyMTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXdrcGFnZV9wLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkTm90SGFuZGxlS2V5RXZlbnQo Y29uc3QgV2ViS2l0OjpOYXRpdmVXZWJLZXlib2FyZEV2ZW50Jik7CiAgICAgdmlydHVhbCB2b2lk IHNlbGVjdGlvbkNoYW5nZWQoYm9vbCwgYm9vbCwgYm9vbCwgYm9vbCk7Ci0gICAgdmlydHVhbCBQ YXNzUmVmUHRyPFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5 KCk7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHk+IGNy ZWF0ZVBvcHVwTWVudVByb3h5KFdlYktpdDo6V2ViUGFnZVByb3h5Kik7CiAgICAgdmlydHVhbCBQ YXNzUmVmUHRyPFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQ cm94eShXZWJLaXQ6OldlYlBhZ2VQcm94eSopOwogCiAgICAgdmlydHVhbCB2b2lkIHNldEZpbmRJ bmRpY2F0b3IoUGFzc1JlZlB0cjxXZWJLaXQ6OkZpbmRJbmRpY2F0b3I+LCBib29sIGZhZGVPdXQp OwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVByb3h5TWFjLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVByb3h5TWFjLmgJ KHJldmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVBy b3h5TWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDE3ICs0MywxNyBAQCBjbGFzcyBXZWJQYWdl UHJveHk7CiAKIGNsYXNzIFdlYlBvcHVwTWVudVByb3h5TWFjIDogcHVibGljIFdlYlBvcHVwTWVu dVByb3h5IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94 eU1hYz4gY3JlYXRlKFdLVmlldyogd2ViVmlldykKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQ b3B1cE1lbnVQcm94eU1hYz4gY3JlYXRlKFdLVmlldyogd2ViVmlldywgV2ViUG9wdXBNZW51UHJv eHk6OkNsaWVudCogY2xpZW50KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBX ZWJQb3B1cE1lbnVQcm94eU1hYyh3ZWJWaWV3KSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihu ZXcgV2ViUG9wdXBNZW51UHJveHlNYWMod2ViVmlldywgY2xpZW50KSk7CiAgICAgfQogICAgIH5X ZWJQb3B1cE1lbnVQcm94eU1hYygpOwogCi0gICAgdmlydHVhbCB2b2lkIHNob3dQb3B1cE1lbnUo Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNvbnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+JiwgY29u c3QgUGxhdGZvcm1Qb3B1cE1lbnVEYXRhJiwgaW50MzJfdCBzZWxlY3RlZEluZGV4LCBpbnQzMl90 JiBuZXdTZWxlY3RlZEluZGV4KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd1BvcHVwTWVudShjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4mLCBjb25zdCBQ bGF0Zm9ybVBvcHVwTWVudURhdGEmLCBpbnQzMl90IHNlbGVjdGVkSW5kZXgpOwogICAgIHZpcnR1 YWwgdm9pZCBoaWRlUG9wdXBNZW51KCk7CiAKIHByaXZhdGU6Ci0gICAgV2ViUG9wdXBNZW51UHJv eHlNYWMoV0tWaWV3Kik7CisgICAgV2ViUG9wdXBNZW51UHJveHlNYWMoV0tWaWV3KiwgV2ViUG9w dXBNZW51UHJveHk6OkNsaWVudCogY2xpZW50KTsKIAogICAgIHZvaWQgcG9wdWxhdGUoY29uc3Qg VmVjdG9yPFdlYlBvcHVwSXRlbT4mKTsKIApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dl YlBvcHVwTWVudVByb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJQb3B1cE1lbnVQcm94eU1hYy5tbQkocmV2aXNpb24gNzQyMTkpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV2ViUG9wdXBNZW51UHJveHlNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1 LDggKzM1LDkgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCi1XZWJQb3B1cE1lbnVQcm94eU1hYzo6V2ViUG9wdXBNZW51UHJveHlNYWMoV0tWaWV3KiB3 ZWJWaWV3KQotICAgIDogbV93ZWJWaWV3KHdlYlZpZXcpCitXZWJQb3B1cE1lbnVQcm94eU1hYzo6 V2ViUG9wdXBNZW51UHJveHlNYWMoV0tWaWV3KiB3ZWJWaWV3LCBXZWJQb3B1cE1lbnVQcm94eTo6 Q2xpZW50KiBjbGllbnQpCisgICAgOiBXZWJQb3B1cE1lbnVQcm94eShjbGllbnQpCisgICAgLCBt X3dlYlZpZXcod2ViVmlldykKIHsKIH0KIApAQCAtNzAsNyArNzEsNyBAQCB2b2lkIFdlYlBvcHVw TWVudVByb3h5TWFjOjpwb3B1bGF0ZShjb25zCiAgICAgfQogfQogCi12b2lkIFdlYlBvcHVwTWVu dVByb3h5TWFjOjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IFZlY3Rv cjxXZWJQb3B1cEl0ZW0+JiBpdGVtcywgY29uc3QgUGxhdGZvcm1Qb3B1cE1lbnVEYXRhJiwgaW50 MzJfdCBzZWxlY3RlZEluZGV4LCBpbnQzMl90JiBuZXdTZWxlY3RlZEluZGV4KQordm9pZCBXZWJQ b3B1cE1lbnVQcm94eU1hYzo6c2hvd1BvcHVwTWVudShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25z dCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYgaXRlbXMsIGNvbnN0IFBsYXRmb3JtUG9wdXBNZW51RGF0 YSYsIGludDMyX3Qgc2VsZWN0ZWRJbmRleCkKIHsKICAgICBwb3B1bGF0ZShpdGVtcyk7CiAKQEAg LTk2LDcgKzk3LDcgQEAgdm9pZCBXZWJQb3B1cE1lbnVQcm94eU1hYzo6c2hvd1BvcHVwTWVudQog ICAgIFttX3BvcHVwLmdldCgpIGRpc21pc3NQb3BVcF07CiAgICAgW2R1bW15Vmlldy5nZXQoKSBy ZW1vdmVGcm9tU3VwZXJ2aWV3XTsKIAotICAgIG5ld1NlbGVjdGVkSW5kZXggPSBbbV9wb3B1cC5n ZXQoKSBpbmRleE9mU2VsZWN0ZWRJdGVtXTsKKyAgICBtX2NsaWVudC0+dmFsdWVDaGFuZ2VkRm9y UG9wdXBNZW51KHRoaXMsIFttX3BvcHVwLmdldCgpIGluZGV4T2ZTZWxlY3RlZEl0ZW1dKTsKIH0K IAogdm9pZCBXZWJQb3B1cE1lbnVQcm94eU1hYzo6aGlkZVBvcHVwTWVudSgpCkluZGV4OiBXZWJL aXQyL1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAkocmV2aXNpb24gNzQy MTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIG5h bWVzcGFjZSBXZWJLaXQgewogCiBXZWJQb3B1cE1lbnVQcm94eVF0OjpXZWJQb3B1cE1lbnVQcm94 eVF0KCkKKyAgICA6IFdlYlBvcHVwTWVudVByb3h5KDApCiB7CiB9CiAKSW5kZXg6IFdlYktpdDIv VUlQcm9jZXNzL3dpbi9XZWJQb3B1cE1lbnVQcm94eVdpbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlBvcHVwTWVudVByb3h5V2luLmNwcAkocmV2aXNpb24gNzQy MTkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViUG9wdXBNZW51UHJveHlXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTgsOCArMTU4LDkgQEAgYm9vbCBXZWJQb3B1cE1lbnVQcm94eVdp bjo6cmVnaXN0ZXJXaW5kbwogICAgIHJldHVybiAhITo6UmVnaXN0ZXJDbGFzc0V4KCZ3Y2V4KTsK IH0KIAotV2ViUG9wdXBNZW51UHJveHlXaW46OldlYlBvcHVwTWVudVByb3h5V2luKFdlYlZpZXcq IHdlYlZpZXcpCi0gICAgOiBtX3dlYlZpZXcod2ViVmlldykKK1dlYlBvcHVwTWVudVByb3h5V2lu OjpXZWJQb3B1cE1lbnVQcm94eVdpbihXZWJWaWV3KiB3ZWJWaWV3LCBXZWJQb3B1cE1lbnVQcm94 eTo6Q2xpZW50KiBjbGllbnQpCisgICAgOiBXZWJQb3B1cE1lbnVQcm94eShjbGllbnQpCisgICAg LCBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fbmV3U2VsZWN0ZWRJbmRleCgwKQogICAgICwg bV9wb3B1cCgwKQogICAgICwgbV9EQygwKQpAQCAtMTg2LDcgKzE4Nyw3IEBAIFdlYlBvcHVwTWVu dVByb3h5V2luOjp+V2ViUG9wdXBNZW51UHJveHkKICAgICAgICAgbV9zY3JvbGxiYXItPnNldFBh cmVudCgwKTsKIH0KIAotdm9pZCBXZWJQb3B1cE1lbnVQcm94eVdpbjo6c2hvd1BvcHVwTWVudShj b25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYgaXRlbXMsIGNv bnN0IFBsYXRmb3JtUG9wdXBNZW51RGF0YSYgZGF0YSwgaW50MzJfdCBzZWxlY3RlZEluZGV4LCBp bnQzMl90JiBuZXdTZWxlY3RlZEluZGV4KQordm9pZCBXZWJQb3B1cE1lbnVQcm94eVdpbjo6c2hv d1BvcHVwTWVudShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVt PiYgaXRlbXMsIGNvbnN0IFBsYXRmb3JtUG9wdXBNZW51RGF0YSYgZGF0YSwgaW50MzJfdCBzZWxl Y3RlZEluZGV4KQogewogICAgIG1faXRlbXMgPSBpdGVtczsKICAgICBtX2RhdGEgPSBkYXRhOwpA QCAtMzIyLDcgKzMyMyw3IEBAIHZvaWQgV2ViUG9wdXBNZW51UHJveHlXaW46OnNob3dQb3B1cE1l bnUKICAgICBtX3Nob3dQb3B1cCA9IGZhbHNlOwogICAgIDo6U2hvd1dpbmRvdyhtX3BvcHVwLCBT V19ISURFKTsKIAotICAgIG5ld1NlbGVjdGVkSW5kZXggPSBtX25ld1NlbGVjdGVkSW5kZXg7Cisg ICAgbV9jbGllbnQtPnZhbHVlQ2hhbmdlZEZvclBvcHVwTWVudSh0aGlzLCBtX25ld1NlbGVjdGVk SW5kZXgpOwogfQogCiB2b2lkIFdlYlBvcHVwTWVudVByb3h5V2luOjpoaWRlUG9wdXBNZW51KCkK QEAgLTg0Niw5ICs4NDcsOCBAQCBib29sIFdlYlBvcHVwTWVudVByb3h5V2luOjpzZXRGb2N1c2Vk SW5kCiAKICAgICBtX2ZvY3VzZWRJbmRleCA9IGk7CiAKLSAgICAvLyBGSVhNRTogSWYgd2UgYXJl IG5vdCBob3RUcmFja2luZywgd2UgbmVlZCB0byBzZW5kIGEgbWVzc2FnZSBiYWNrIHRvIHRoZSBX ZWJQcm9jZXNzIHRvCi0gICAgLy8gY2FsbCB0aGUgcG9wdXBNZW51Q2xpZW50J3Mgc2V0VGV4dEZy b21JdGVtIGZ1bmN0aW9uIG9mIHRoaXMgaW5kZXguICBUaGlzIHdpbGwgdXBkYXRlCi0gICAgLy8g dGhlIGN1cnJlbnRseSBkaXNwbGF5ZWQgaXRlbSBhdCB0aGUgdG9wIG9mIHRoZSBsaXN0LgorICAg IGlmICghaG90VHJhY2tpbmcpCisgICAgICAgIG1fY2xpZW50LT5zZXRUZXh0RnJvbUl0ZW1Gb3JQ b3B1cE1lbnUodGhpcywgaSk7CiAKICAgICBpZiAoIXNjcm9sbFRvUmV2ZWFsU2VsZWN0aW9uKCkp CiAgICAgICAgIDo6VXBkYXRlV2luZG93KG1fcG9wdXApOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3Mvd2luL1dlYlBvcHVwTWVudVByb3h5V2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVBy b2Nlc3Mvd2luL1dlYlBvcHVwTWVudVByb3h5V2luLmgJKHJldmlzaW9uIDc0MjE5KQorKysgV2Vi S2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlBvcHVwTWVudVByb3h5V2luLmgJKHdvcmtpbmcgY29weSkK QEAgLTQyLDE5ICs0MiwxOSBAQCBjbGFzcyBXZWJWaWV3OwogCiBjbGFzcyBXZWJQb3B1cE1lbnVQ cm94eVdpbiA6IHB1YmxpYyBXZWJQb3B1cE1lbnVQcm94eSwgcHJpdmF0ZSBXZWJDb3JlOjpTY3Jv bGxiYXJDbGllbnQgIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQb3B1cE1l bnVQcm94eVdpbj4gY3JlYXRlKFdlYlZpZXcqIHdlYlZpZXcpCisgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViUG9wdXBNZW51UHJveHlXaW4+IGNyZWF0ZShXZWJWaWV3KiB3ZWJWaWV3LCBXZWJQb3B1 cE1lbnVQcm94eTo6Q2xpZW50KiBjbGllbnQpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRS ZWYobmV3IFdlYlBvcHVwTWVudVByb3h5V2luKHdlYlZpZXcpKTsKKyAgICAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBXZWJQb3B1cE1lbnVQcm94eVdpbih3ZWJWaWV3LCBjbGllbnQpKTsKICAgICB9 CiAgICAgfldlYlBvcHVwTWVudVByb3h5V2luKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2hvd1Bv cHVwTWVudShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRl bT4mLCBjb25zdCBQbGF0Zm9ybVBvcHVwTWVudURhdGEmLCBpbnQzMl90IHNlbGVjdGVkSW5kZXgs IGludDMyX3QmIG5ld1NlbGVjdGVkSW5kZXgpOworICAgIHZpcnR1YWwgdm9pZCBzaG93UG9wdXBN ZW51KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYs IGNvbnN0IFBsYXRmb3JtUG9wdXBNZW51RGF0YSYsIGludDMyX3Qgc2VsZWN0ZWRJbmRleCk7CiAg ICAgdmlydHVhbCB2b2lkIGhpZGVQb3B1cE1lbnUoKTsKIAogICAgIHZvaWQgaGlkZSgpIHsgaGlk ZVBvcHVwTWVudSgpOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViUG9wdXBNZW51UHJveHlXaW4oV2Vi VmlldyopOworICAgIFdlYlBvcHVwTWVudVByb3h5V2luKFdlYlZpZXcqLCBXZWJQb3B1cE1lbnVQ cm94eTo6Q2xpZW50Kik7CiAKICAgICBXZWJDb3JlOjpTY3JvbGxiYXIqIHNjcm9sbGJhcigpIGNv bnN0IHsgcmV0dXJuIG1fc2Nyb2xsYmFyLmdldCgpOyB9CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4v V2ViVmlldy5jcHAJKHJldmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dl YlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MjYsOSArOTI2LDkgQEAgdm9pZCBXZWJWaWV3 OjpkaWROb3RIYW5kbGVLZXlFdmVudChjb25zdAogICAgIDo6RGVmV2luZG93UHJvY1coZXZlbnQu bmF0aXZlRXZlbnQoKS0+aHduZCwgZXZlbnQubmF0aXZlRXZlbnQoKS0+bWVzc2FnZSwgZXZlbnQu bmF0aXZlRXZlbnQoKS0+d1BhcmFtLCBldmVudC5uYXRpdmVFdmVudCgpLT5sUGFyYW0pOwogfQog Ci1QYXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBXZWJWaWV3OjpjcmVhdGVQb3B1cE1lbnVQ cm94eSgpCitQYXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBXZWJWaWV3OjpjcmVhdGVQb3B1 cE1lbnVQcm94eShXZWJQYWdlUHJveHkqIHBhZ2UpCiB7Ci0gICAgcmV0dXJuIFdlYlBvcHVwTWVu dVByb3h5V2luOjpjcmVhdGUodGhpcyk7CisgICAgcmV0dXJuIFdlYlBvcHVwTWVudVByb3h5V2lu OjpjcmVhdGUodGhpcywgcGFnZSk7CiB9CiAKIFBhc3NSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94 eT4gV2ViVmlldzo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkqIHBhZ2UpCklu ZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9V SVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTE4LDcgKzExOCw3IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZE5vdEhhbmRsZUtleUV2ZW50KGNvbnN0IE5h dGl2ZVdlYktleWJvYXJkRXZlbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0aW9uQ2hhbmdl ZChib29sLCBib29sLCBib29sLCBib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgY29tcG9zaXRpb25T ZWxlY3Rpb25DaGFuZ2VkKGJvb2wpOwotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJQb3B1cE1l bnVQcm94eT4gY3JlYXRlUG9wdXBNZW51UHJveHkoKTsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8 V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSopOwog ICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb250ZXh0TWVudVByb3h5PiBjcmVhdGVDb250ZXh0 TWVudVByb3h5KFdlYlBhZ2VQcm94eSopOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGaW5kSW5kaWNh dG9yKFBhc3NSZWZQdHI8RmluZEluZGljYXRvcj4sIGJvb2wgZmFkZU91dCk7CiAKSW5kZXg6IFdl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQb3B1cE1lbnUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQb3B1cE1lbnUuY3Bw CShyZXZpc2lvbiA3NDIxOSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJQb3B1cE1lbnUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2MywxNCBAQCB2b2lkIFdl YlBvcHVwTWVudTo6ZGlkQ2hhbmdlU2VsZWN0ZWRJbmRlCiAgICAgICAgIG1fcG9wdXBDbGllbnQt PnZhbHVlQ2hhbmdlZChuZXdJbmRleCk7CiB9CiAKK3ZvaWQgV2ViUG9wdXBNZW51OjpzZXRUZXh0 Rm9ySW5kZXgoaW50IGluZGV4KQoreworICAgIGlmICghbV9wb3B1cENsaWVudCkKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9wb3B1cENsaWVudC0+c2V0VGV4dEZyb21JdGVtKGluZGV4KTsKK30K KwogVmVjdG9yPFdlYlBvcHVwSXRlbT4gV2ViUG9wdXBNZW51Ojpwb3B1bGF0ZUl0ZW1zKCkKIHsK ICAgICBzaXplX3Qgc2l6ZSA9IG1fcG9wdXBDbGllbnQtPmxpc3RTaXplKCk7CkluZGV4OiBXZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUG9wdXBNZW51LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlBvcHVwTWVudS5oCShyZXZp c2lvbiA3NDIxOSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQb3B1 cE1lbnUuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIGRpc2Nvbm5lY3RGcm9tUGFnZSgpIHsgbV9wYWdlID0gMDsgfQogICAgIHZvaWQgZGlkQ2hh bmdlU2VsZWN0ZWRJbmRleChpbnQgbmV3SW5kZXgpOworICAgIHZvaWQgc2V0VGV4dEZvckluZGV4 KGludCBuZXdJbmRleCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2hvdyhjb25zdCBXZWJDb3JlOjpJ bnRSZWN0JiwgV2ViQ29yZTo6RnJhbWVWaWV3KiwgaW50IGluZGV4KTsKICAgICB2aXJ0dWFsIHZv aWQgaGlkZSgpOwpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJl dmlzaW9uIDc0MjE5KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTExMTYsNiArMTExNiwxNCBAQCB2b2lkIFdlYlBhZ2U6OmRpZENh bmNlbEZvck9wZW5QYW5lbCgpCiAgICAgbV9hY3RpdmVPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lciA9 IDA7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6c2V0VGV4dEZvckFjdGl2ZVBvcHVwTWVudShpbnQzMl90 IGluZGV4KQoreworICAgIGlmICghbV9hY3RpdmVQb3B1cE1lbnUpCisgICAgICAgIHJldHVybjsK KworICAgIG1fYWN0aXZlUG9wdXBNZW51LT5zZXRUZXh0Rm9ySW5kZXgoaW5kZXgpOworfQorCiB2 b2lkIFdlYlBhZ2U6OmRpZFNlbGVjdEl0ZW1Gcm9tQWN0aXZlQ29udGV4dE1lbnUoY29uc3QgV2Vi Q29udGV4dE1lbnVJdGVtRGF0YSYgaXRlbSkKIHsKICAgICBBU1NFUlQobV9jb250ZXh0TWVudSk7 CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA3NDIxOSkK KysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpA QCAtMzM2LDYgKzMzNiw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIHZvaWQgZGlkQ2hhbmdl U2VsZWN0ZWRJbmRleEZvckFjdGl2ZVBvcHVwTWVudShpbnQzMl90IG5ld0luZGV4KTsKKyAgICB2 b2lkIHNldFRleHRGb3JBY3RpdmVQb3B1cE1lbnUoaW50MzJfdCBpbmRleCk7CiAKICAgICB2b2lk IGRpZENob29zZUZpbGVzRm9yT3BlblBhbmVsKGNvbnN0IFZlY3RvcjxTdHJpbmc+Jik7CiAgICAg dm9pZCBkaWRDYW5jZWxGb3JPcGVuUGFuZWwoKTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gNzQyMjUpCisrKyBXZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkp CkBAIC04Niw2ICs4Niw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogCiAgICAgIyBQb3B1cCBt ZW51LgogICAgIERpZENoYW5nZVNlbGVjdGVkSW5kZXhGb3JBY3RpdmVQb3B1cE1lbnUoaW50MzJf dCBuZXdJbmRleCk7CisgICAgU2V0VGV4dEZvckFjdGl2ZVBvcHVwTWVudShpbnQzMl90IGluZGV4 KTsKICAgICAKICAgICAjIENvbnRleHQgbWVudS4KICAgICBEaWRTZWxlY3RJdGVtRnJvbUFjdGl2 ZUNvbnRleHRNZW51KFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0YSBtZW51SXRlbSk7Cg==