69357 2011-10-04 11:27:56 -0700 Remove PlatformWheelEvent::m_isAccepted 2011-10-04 13:10:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 477784 0 andersca 2011-10-04 11:27:56 -0700 Remove PlatformWheelEvent::m_isAccepted 477790 1 109658 andersca 2011-10-04 11:30:09 -0700 Created attachment 109658 Patch 477863 2 andersca 2011-10-04 13:10:05 -0700 Committed r96633: <http://trac.webkit.org/changeset/96633> 109658 2011-10-04 11:30:09 -0700 2011-10-04 11:32:19 -0700 Patch bug-69357-20111004113009.patch text/plain 16787 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjIwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTEtMTAtMDQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgUGxhdGZvcm1X aGVlbEV2ZW50OjptX2lzQWNjZXB0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY5MzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVtb3ZlIFBsYXRmb3JtV2hlZWxFdmVudDo6bV9pc0FjY2VwdGVkIGFu ZCBhbGwgdGhlIGdldHRlcnMvc2V0dGVycy4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlV2hlZWxFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZUdlc3R1cmVFdmVudCk6Cisg ICAgICAgICogcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRIYW5kbGVyOjp3aGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9QbGF0Zm9ybVdo ZWVsRXZlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVudDo6UGxhdGZv cm1XaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBDb250YWluZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UG9wdXBDb250YWluZXI6OmhhbmRsZUdlc3R1cmVFdmVudCk6CisgICAgICAgICogcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2VmbC9QbGF0Zm9ybVdoZWVsRXZlbnRFZmwuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQpOgorICAgICAg ICAqIHBsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvV2hlZWxFdmVudE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxF dmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9XaGVlbEV2 ZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9y bVdoZWVsRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9XaGVlbEV2ZW50V2luLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50 KToKKyAgICAgICAgKiBwbGF0Zm9ybS93eC9Nb3VzZVdoZWVsRXZlbnRXeC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudCk6CisKIDIw MTEtMTAtMDMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTMxNwpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkocmV2aXNpb24gOTY2MTcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNzYsMzIgKzIxNzYs MjIgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQoUGxhdAogICAgICAgICAK ICAgICAgICAgaWYgKGlzT3ZlcldpZGdldCAmJiB0YXJnZXQgJiYgdGFyZ2V0LT5pc1dpZGdldCgp KSB7CiAgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0KHRhcmdldCkt PndpZGdldCgpOwotICAgICAgICAgICAgaWYgKHdpZGdldCAmJiBwYXNzV2hlZWxFdmVudFRvV2lk Z2V0KGUsIHdpZGdldCkpIHsKLSAgICAgICAgICAgICAgICBlLmFjY2VwdCgpOworICAgICAgICAg ICAgaWYgKHdpZGdldCAmJiBwYXNzV2hlZWxFdmVudFRvV2lkZ2V0KGUsIHdpZGdldCkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAg ICAgICBub2RlID0gbm9kZS0+c2hhZG93QW5jZXN0b3JOb2RlKCk7Ci0gICAgICAgIGlmIChub2Rl ICYmICFub2RlLT5kaXNwYXRjaFdoZWVsRXZlbnQoZSkpIHsKLSAgICAgICAgICAgIGUuYWNjZXB0 KCk7CisgICAgICAgIGlmIChub2RlICYmICFub2RlLT5kaXNwYXRjaFdoZWVsRXZlbnQoZSkpCiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQogICAgIH0KIAogCi0gICAgLy8gaXNB Y2NlcHRlZCBjYW4ndCBiZSB0cnVlIGhlcmUsIGJlY2F1c2UgdGhlbiB3ZSB3b3VsZCBhbHJlYWR5 IGhhdmUgcmV0dXJuZWQgZnJvbSB0aGlzIGZ1bmN0aW9uLgotICAgIEFTU0VSVCghZS5pc0FjY2Vw dGVkKCkpOwotCiAgICAgLy8gV2UgZG8gYW5vdGhlciBjaGVjayBvbiB0aGUgZnJhbWUgdmlldyBi ZWNhdXNlIHRoZSBldmVudCBoYW5kbGVyIGNhbiBydW4gSlMgd2hpY2ggcmVzdWx0cyBpbiB0aGUg ZnJhbWUgZ2V0dGluZyBkZXN0cm95ZWQuCiAgICAgdmlldyA9IG1fZnJhbWUtPnZpZXcoKTsKICAg ICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKLSAgICBib29sIGhhbmRs ZWQgPSB2aWV3LT53aGVlbEV2ZW50KGUpOwotICAgIEFTU0VSVChoYW5kbGVkID09IGUuaXNBY2Nl cHRlZCgpKTsKLQotICAgIHJldHVybiBoYW5kbGVkOworICAgIHJldHVybiB2aWV3LT53aGVlbEV2 ZW50KGUpOwogfQogICAgIAogdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRXaGVlbEV2ZW50SGFu ZGxlcihOb2RlKiBzdGFydE5vZGUsIFdoZWVsRXZlbnQqIHdoZWVsRXZlbnQpCkBAIC0yMjUxLDcg KzIyNDEsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlR2VzdHVyZUV2ZW50KGNvCiAgICAg ICAgIC8vIEZJWE1FOiBSZXBsYWNlIHRoaXMgaW50ZXJpbSBpbXBsZW1lbnRhdGlvbiBvbmNlIHRo ZSBhYm92ZSBmaXhtZSBoYXMgYmVlbiBhZGRyZXNzZWQuCiAgICAgICAgIEludFBvaW50IHBvaW50 KGdlc3R1cmVFdmVudC5wb3NpdGlvbigpLngoKSwgZ2VzdHVyZUV2ZW50LnBvc2l0aW9uKCkueSgp KTsKICAgICAgICAgSW50UG9pbnQgZ2xvYmFsUG9pbnQoZ2VzdHVyZUV2ZW50Lmdsb2JhbFBvc2l0 aW9uKCkueCgpLCBnZXN0dXJlRXZlbnQuZ2xvYmFsUG9zaXRpb24oKS55KCkpOwotICAgICAgICBQ bGF0Zm9ybVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWxFdmVudChwb2ludCwgZ2xvYmFsUG9pbnQs IGdlc3R1cmVFdmVudC5kZWx0YVgoKSwgZ2VzdHVyZUV2ZW50LmRlbHRhWSgpLCBnZXN0dXJlRXZl bnQuZGVsdGFYKCkgLyB0aWNrRGl2aXNvciwgZ2VzdHVyZUV2ZW50LmRlbHRhWSgpIC8gdGlja0Rp dmlzb3IsIFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50LCAvKiBpc0FjY2VwdGVkICovIGZhbHNlLCBn ZXN0dXJlRXZlbnQuc2hpZnRLZXkoKSwgZ2VzdHVyZUV2ZW50LmN0cmxLZXkoKSwgZ2VzdHVyZUV2 ZW50LmFsdEtleSgpLCBnZXN0dXJlRXZlbnQubWV0YUtleSgpKTsKKyAgICAgICAgUGxhdGZvcm1X aGVlbEV2ZW50IHN5bnRoZXRpY1doZWVsRXZlbnQocG9pbnQsIGdsb2JhbFBvaW50LCBnZXN0dXJl RXZlbnQuZGVsdGFYKCksIGdlc3R1cmVFdmVudC5kZWx0YVkoKSwgZ2VzdHVyZUV2ZW50LmRlbHRh WCgpIC8gdGlja0Rpdmlzb3IsIGdlc3R1cmVFdmVudC5kZWx0YVkoKSAvIHRpY2tEaXZpc29yLCBT Y3JvbGxCeVBpeGVsV2hlZWxFdmVudCwgZ2VzdHVyZUV2ZW50LnNoaWZ0S2V5KCksIGdlc3R1cmVF dmVudC5jdHJsS2V5KCksIGdlc3R1cmVFdmVudC5hbHRLZXkoKSwgZ2VzdHVyZUV2ZW50Lm1ldGFL ZXkoKSk7CiAgICAgICAgIGhhbmRsZVdoZWVsRXZlbnQoc3ludGhldGljV2hlZWxFdmVudCk7CiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFj L0V2ZW50SGFuZGxlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21h Yy9FdmVudEhhbmRsZXJNYWMubW0JKHJldmlzaW9uIDk2NjE1KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsMTAgKzEw Niw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjp3aGVlbEV2ZW50KE5TRXZlbnQgKmUKICAgICBDdXJy ZW50RXZlbnRTY29wZSBzY29wZShldmVudCk7CiAKICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQgd2hl ZWxFdmVudChldmVudCwgcGFnZS0+Y2hyb21lKCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKLSAg ICBib29sIGhhbmRsZWQgPSBoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwotCi0gICAgQVNT RVJUKGhhbmRsZWQgPT0gd2hlZWxFdmVudC5pc0FjY2VwdGVkKCkpOwotICAgIHJldHVybiBoYW5k bGVkOworICAgIHJldHVybiBoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogfQogCiBib29s IEV2ZW50SGFuZGxlcjo6a2V5RXZlbnQoTlNFdmVudCAqZXZlbnQpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaAkocmV2aXNpb24gOTY2MTUpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaAkod29ya2luZyBj b3B5KQpAQCAtOTIsNyArOTIsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAs IG1fd2hlZWxUaWNrc1goMCkKICAgICAgICAgICAgICwgbV93aGVlbFRpY2tzWSgwKQogICAgICAg ICAgICAgLCBtX2dyYW51bGFyaXR5KFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50KQotICAgICAgICAg ICAgLCBtX2lzQWNjZXB0ZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fc2hpZnRLZXkoZmFsc2Up CiAgICAgICAgICAgICAsIG1fY3RybEtleShmYWxzZSkKICAgICAgICAgICAgICwgbV9hbHRLZXko ZmFsc2UpCkBAIC0xMDcsNyArMTA2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB7 CiAgICAgICAgIH0KIAotICAgICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQoSW50UG9pbnQgcG9zaXRp b24sIEludFBvaW50IGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwg ZmxvYXQgd2hlZWxUaWNrc1gsIGZsb2F0IHdoZWVsVGlja3NZLCBQbGF0Zm9ybVdoZWVsRXZlbnRH cmFudWxhcml0eSBncmFudWxhcml0eSwgYm9vbCBpc0FjY2VwdGVkLCBib29sIHNoaWZ0S2V5LCBi b29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIG1ldGFLZXkpCisgICAgICAgIFBsYXRmb3Jt V2hlZWxFdmVudChJbnRQb2ludCBwb3NpdGlvbiwgSW50UG9pbnQgZ2xvYmFsUG9zaXRpb24sIGZs b2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9hdCB3aGVlbFRpY2tzWCwgZmxvYXQgd2hlZWxU aWNrc1ksIFBsYXRmb3JtV2hlZWxFdmVudEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBib29sIHNo aWZ0S2V5LCBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIG1ldGFLZXkpCiAgICAgICAg ICAgICA6IG1fcG9zaXRpb24ocG9zaXRpb24pCiAgICAgICAgICAgICAsIG1fZ2xvYmFsUG9zaXRp b24oZ2xvYmFsUG9zaXRpb24pCiAgICAgICAgICAgICAsIG1fZGVsdGFYKGRlbHRhWCkKQEAgLTEx NSw3ICsxMTQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fd2hlZWxU aWNrc1god2hlZWxUaWNrc1gpCiAgICAgICAgICAgICAsIG1fd2hlZWxUaWNrc1kod2hlZWxUaWNr c1kpCiAgICAgICAgICAgICAsIG1fZ3JhbnVsYXJpdHkoZ3JhbnVsYXJpdHkpCi0gICAgICAgICAg ICAsIG1faXNBY2NlcHRlZChpc0FjY2VwdGVkKQogICAgICAgICAgICAgLCBtX3NoaWZ0S2V5KHNo aWZ0S2V5KQogICAgICAgICAgICAgLCBtX2N0cmxLZXkoY3RybEtleSkKICAgICAgICAgICAgICwg bV9hbHRLZXkoYWx0S2V5KQpAQCAtMTQxLDcgKzEzOSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogICAgICAgICBQbGF0Zm9ybVdoZWVsRXZlbnRHcmFudWxhcml0eSBncmFudWxhcml0eSgpIGNv bnN0IHsgcmV0dXJuIG1fZ3JhbnVsYXJpdHk7IH0KIAotICAgICAgICBib29sIGlzQWNjZXB0ZWQo KSBjb25zdCB7IHJldHVybiBtX2lzQWNjZXB0ZWQ7IH0KICAgICAgICAgYm9vbCBzaGlmdEtleSgp IGNvbnN0IHsgcmV0dXJuIG1fc2hpZnRLZXk7IH0KICAgICAgICAgYm9vbCBjdHJsS2V5KCkgY29u c3QgeyByZXR1cm4gbV9jdHJsS2V5OyB9CiAgICAgICAgIGJvb2wgYWx0S2V5KCkgY29uc3QgeyBy ZXR1cm4gbV9hbHRLZXk7IH0KQEAgLTE1NCw5ICsxNTEsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgYm9vbCB3ZWJraXREaXJlY3Rpb25JbnZlcnRlZEZyb21EZXZpY2UoKSBjb25z dCB7IHJldHVybiBtX2RpcmVjdGlvbkludmVydGVkRnJvbURldmljZTsgfQogCi0gICAgICAgIHZv aWQgYWNjZXB0KCkgeyBtX2lzQWNjZXB0ZWQgPSB0cnVlOyB9Ci0gICAgICAgIHZvaWQgaWdub3Jl KCkgeyBtX2lzQWNjZXB0ZWQgPSBmYWxzZTsgfQotCiAgICAgICAgIHZvaWQgdHVyblZlcnRpY2Fs VGlja3NJbnRvSG9yaXpvbnRhbCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIG1fZGVsdGFYID0g bV9kZWx0YVk7CkBAIC0yMTQsNyArMjA4LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBmbG9hdCBtX3doZWVsVGlja3NYOwogICAgICAgICBmbG9hdCBtX3doZWVsVGlja3NZOwogICAg ICAgICBQbGF0Zm9ybVdoZWVsRXZlbnRHcmFudWxhcml0eSBtX2dyYW51bGFyaXR5OwotICAgICAg ICBib29sIG1faXNBY2NlcHRlZDsKICAgICAgICAgYm9vbCBtX3NoaWZ0S2V5OwogICAgICAgICBi b29sIG1fY3RybEtleTsKICAgICAgICAgYm9vbCBtX2FsdEtleTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAJKHJldmlzaW9uIDk2NjE3KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC05OSw3ICs5OSw2IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoUGwK ICAgICAgICAgfHwgKGRlbHRhWCA+IDAgJiYgbWF4QmFja3dhcmRTY3JvbGxEZWx0YS53aWR0aCgp ID4gMCkKICAgICAgICAgfHwgKGRlbHRhWSA8IDAgJiYgbWF4Rm9yd2FyZFNjcm9sbERlbHRhLmhl aWdodCgpID4gMCkKICAgICAgICAgfHwgKGRlbHRhWSA+IDAgJiYgbWF4QmFja3dhcmRTY3JvbGxE ZWx0YS5oZWlnaHQoKSA+IDApKSB7Ci0gICAgICAgIGUuYWNjZXB0KCk7CiAgICAgICAgIGhhbmRs ZWQgPSB0cnVlOwogICAgICAgICBpZiAoZS5ncmFudWxhcml0eSgpID09IFNjcm9sbEJ5UGFnZVdo ZWVsRXZlbnQpIHsKICAgICAgICAgICAgIEFTU0VSVCghZS5kZWx0YVgoKSk7CkBAIC0xMTUsNyAr MTE0LDYgQEAgYm9vbCBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudChQbAogICAgICAg ICAgICAgc2Nyb2xsKEhvcml6b250YWxTY3JvbGxiYXIsIFNjcm9sbEJ5UGl4ZWwsIGhvcml6b250 YWxTY3JvbGxiYXItPnBpeGVsU3RlcCgpLCAtZGVsdGFYKTsKICAgICB9CiAKLSAgICBBU1NFUlQo ZS5pc0FjY2VwdGVkKCkgPT0gaGFuZGxlZCk7CiAgICAgcmV0dXJuIGhhbmRsZWQ7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwQ29udGFpbmVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cENvbnRh aW5lci5jcHAJKHJldmlzaW9uIDk2NjE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vUG9wdXBDb250YWluZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDksNyArMzA5LDcg QEAgYm9vbCBQb3B1cENvbnRhaW5lcjo6aGFuZGxlR2VzdHVyZUV2ZW50KAogICAgIGNhc2UgUGxh dGZvcm1HZXN0dXJlRXZlbnQ6OkRvdWJsZVRhcFR5cGU6CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgUGxhdGZvcm1HZXN0dXJlRXZlbnQ6OlNjcm9sbFVwZGF0ZVR5cGU6IHsKLSAgICAgICAgUGxh dGZvcm1XaGVlbEV2ZW50IHN5bnRoZXRpY1doZWVsRXZlbnQoZ2VzdHVyZUV2ZW50LnBvc2l0aW9u KCksIGdlc3R1cmVFdmVudC5nbG9iYWxQb3NpdGlvbigpLCBnZXN0dXJlRXZlbnQuZGVsdGFYKCks IGdlc3R1cmVFdmVudC5kZWx0YVkoKSwgZ2VzdHVyZUV2ZW50LmRlbHRhWCgpIC8gMTIwLjBmLCBn ZXN0dXJlRXZlbnQuZGVsdGFZKCkgLyAxMjAuMGYsIFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50LCAv KiBpc0FjY2VwdGVkICovIGZhbHNlLCBnZXN0dXJlRXZlbnQuc2hpZnRLZXkoKSwgZ2VzdHVyZUV2 ZW50LmN0cmxLZXkoKSwgZ2VzdHVyZUV2ZW50LmFsdEtleSgpLCBnZXN0dXJlRXZlbnQubWV0YUtl eSgpKTsKKyAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IHN5bnRoZXRpY1doZWVsRXZlbnQoZ2Vz dHVyZUV2ZW50LnBvc2l0aW9uKCksIGdlc3R1cmVFdmVudC5nbG9iYWxQb3NpdGlvbigpLCBnZXN0 dXJlRXZlbnQuZGVsdGFYKCksIGdlc3R1cmVFdmVudC5kZWx0YVkoKSwgZ2VzdHVyZUV2ZW50LmRl bHRhWCgpIC8gMTIwLjBmLCBnZXN0dXJlRXZlbnQuZGVsdGFZKCkgLyAxMjAuMGYsIFNjcm9sbEJ5 UGl4ZWxXaGVlbEV2ZW50LCBnZXN0dXJlRXZlbnQuc2hpZnRLZXkoKSwgZ2VzdHVyZUV2ZW50LmN0 cmxLZXkoKSwgZ2VzdHVyZUV2ZW50LmFsdEtleSgpLCBnZXN0dXJlRXZlbnQubWV0YUtleSgpKTsK ICAgICAgICAgaGFuZGxlV2hlZWxFdmVudChzeW50aGV0aWNXaGVlbEV2ZW50KTsKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1tCShyZXZp c2lvbiA5NjYxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFu aW1hdG9yQ2hyb21pdW1NYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTgzMiwxMyArODMyLDExIEBA IGJvb2wgU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYzo6aGFuZGxlV2gKICAgICBpZiAobV9pZ25v cmVNb21lbnR1bVNjcm9sbHMgJiYgKGlzTW9tZW50dW1TY3JvbGxFdmVudCB8fCBtX3NuYXBSdWJi ZXJCYW5kVGltZXIuaXNBY3RpdmUoKSkpIHsKICAgICAgICAgaWYgKHdoZWVsRXZlbnQubW9tZW50 dW1QaGFzZSgpID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlRW5kZWQpIHsKICAgICAgICAgICAg IG1faWdub3JlTW9tZW50dW1TY3JvbGxzID0gZmFsc2U7Ci0gICAgICAgICAgICB3aGVlbEV2ZW50 LmFjY2VwdCgpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHdoZWVsRXZlbnQuYWNjZXB0KCk7CiAgICAgc21v b3RoU2Nyb2xsV2l0aEV2ZW50KHdoZWVsRXZlbnQpOwogICAgIHJldHVybiB0cnVlOwogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtV2hlZWxFdmVudEVmbC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtV2hlZWxF dmVudEVmbC5jcHAJKHJldmlzaW9uIDk2NjE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v ZWZsL1BsYXRmb3JtV2hlZWxFdmVudEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2 LDYgQEAgUGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQoYwogICAgIDogbV9w b3NpdGlvbihJbnRQb2ludChldi0+Y2FudmFzLngsIGV2LT5jYW52YXMueSkpCiAgICAgLCBtX2ds b2JhbFBvc2l0aW9uKEludFBvaW50KGV2LT5jYW52YXMueCwgZXYtPmNhbnZhcy55KSkKICAgICAs IG1fZ3JhbnVsYXJpdHkoU2Nyb2xsQnlQaXhlbFdoZWVsRXZlbnQpCi0gICAgLCBtX2lzQWNjZXB0 ZWQoZmFsc2UpCiAgICAgLCBtX3NoaWZ0S2V5KGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldi0+ bW9kaWZpZXJzLCAiU2hpZnQiKSkKICAgICAsIG1fY3RybEtleShldmFzX2tleV9tb2RpZmllcl9p c19zZXQoZXYtPm1vZGlmaWVycywgIkNvbnRyb2wiKSkKICAgICAsIG1fYWx0S2V5KGV2YXNfa2V5 X21vZGlmaWVyX2lzX3NldChldi0+bW9kaWZpZXJzLCAiQWx0IikpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCShyZXZpc2lvbiA5 NjYxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtODQ0LDEzICs4NDQsMTEgQEAgYm9vbCBTY3JvbGxBbmltYXRv ck1hYzo6aGFuZGxlV2hlZWxFdmVudAogICAgIGlmIChtX2lnbm9yZU1vbWVudHVtU2Nyb2xscyAm JiAoaXNNb21lbnR1bVNjcm9sbEV2ZW50IHx8IG1fc25hcFJ1YmJlckJhbmRUaW1lci5pc0FjdGl2 ZSgpKSkgewogICAgICAgICBpZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZv cm1XaGVlbEV2ZW50UGhhc2VFbmRlZCkgewogICAgICAgICAgICAgbV9pZ25vcmVNb21lbnR1bVNj cm9sbHMgPSBmYWxzZTsKLSAgICAgICAgICAgIHdoZWVsRXZlbnQuYWNjZXB0KCk7CiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQogCi0gICAgd2hlZWxFdmVudC5hY2NlcHQoKTsKICAgICBzbW9vdGhTY3JvbGxXaXRoRXZlbnQo d2hlZWxFdmVudCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvV2hlZWxFdmVudE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2hlZWxFdmVudE1hYy5tbQkocmV2aXNpb24gOTY2MTUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2hlZWxFdmVudE1hYy5tbQkod29ya2luZyBjb3B5KQpA QCAtOTMsNyArOTMsNiBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChO CiAgICAgOiBtX3Bvc2l0aW9uKHBvaW50Rm9yRXZlbnQoZXZlbnQsIHdpbmRvd1ZpZXcpKQogICAg ICwgbV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb2ludEZvckV2ZW50KGV2ZW50KSkKICAgICAsIG1f Z3JhbnVsYXJpdHkoU2Nyb2xsQnlQaXhlbFdoZWVsRXZlbnQpCi0gICAgLCBtX2lzQWNjZXB0ZWQo ZmFsc2UpCiAgICAgLCBtX3NoaWZ0S2V5KFtldmVudCBtb2RpZmllckZsYWdzXSAmIE5TU2hpZnRL ZXlNYXNrKQogICAgICwgbV9jdHJsS2V5KFtldmVudCBtb2RpZmllckZsYWdzXSAmIE5TQ29udHJv bEtleU1hc2spCiAgICAgLCBtX2FsdEtleShbZXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0FsdGVy bmF0ZUtleU1hc2spCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9XaGVlbEV2ZW50 UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1doZWVsRXZl bnRRdC5jcHAJKHJldmlzaW9uIDk2NjE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQv V2hlZWxFdmVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNiBAQCBQbGF0Zm9y bVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChRCiAgICAgOiBtX3Bvc2l0aW9uKGUtPnBv cygpLnRvUG9pbnQoKSkKICAgICAsIG1fZ2xvYmFsUG9zaXRpb24oZS0+c2NyZWVuUG9zKCkpCiAg ICAgLCBtX2dyYW51bGFyaXR5KFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50KQotICAgICwgbV9pc0Fj Y2VwdGVkKGZhbHNlKQogICAgICwgbV9zaGlmdEtleShlLT5tb2RpZmllcnMoKSAmIFF0OjpTaGlm dE1vZGlmaWVyKQogICAgICwgbV9jdHJsS2V5KGUtPm1vZGlmaWVycygpICYgUXQ6OkNvbnRyb2xN b2RpZmllcikKICAgICAsIG1fYWx0S2V5KGUtPm1vZGlmaWVycygpICYgUXQ6OkFsdE1vZGlmaWVy KQpAQCAtODIsNyArODEsNiBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVu dChRCiAgICAgOiBtX3Bvc2l0aW9uKGUtPnBvcygpKQogICAgICwgbV9nbG9iYWxQb3NpdGlvbihl LT5nbG9iYWxQb3MoKSkKICAgICAsIG1fZ3JhbnVsYXJpdHkoU2Nyb2xsQnlQaXhlbFdoZWVsRXZl bnQpCi0gICAgLCBtX2lzQWNjZXB0ZWQoZmFsc2UpCiAgICAgLCBtX3NoaWZ0S2V5KGUtPm1vZGlm aWVycygpICYgUXQ6OlNoaWZ0TW9kaWZpZXIpCiAgICAgLCBtX2N0cmxLZXkoZS0+bW9kaWZpZXJz KCkgJiBRdDo6Q29udHJvbE1vZGlmaWVyKQogICAgICwgbV9hbHRLZXkoZS0+bW9kaWZpZXJzKCkg JiBRdDo6QWx0TW9kaWZpZXIpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2hl ZWxFdmVudFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2lu L1doZWVsRXZlbnRXaW4uY3BwCShyZXZpc2lvbiA5NjYxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3dpbi9XaGVlbEV2ZW50V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYsOCArNjYs NyBAQCBzdGF0aWMgaW50IHZlcnRpY2FsU2Nyb2xsTGluZXMoKQogfQogCiBQbGF0Zm9ybVdoZWVs RXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChIV05EIGhXbmQsIGNvbnN0IEZsb2F0U2l6ZSYgZGVs dGEsIGNvbnN0IEZsb2F0UG9pbnQmIGxvY2F0aW9uKQotICAgIDogbV9pc0FjY2VwdGVkKGZhbHNl KQotICAgICwgbV9zaGlmdEtleShmYWxzZSkKKyAgICA6IG1fc2hpZnRLZXkoZmFsc2UpCiAgICAg LCBtX2N0cmxLZXkoZmFsc2UpCiAgICAgLCBtX2FsdEtleShmYWxzZSkKICAgICAsIG1fbWV0YUtl eShmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3d4L01vdXNlV2hlZWxFdmVu dFd4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93eC9Nb3VzZVdo ZWVsRXZlbnRXeC5jcHAJKHJldmlzaW9uIDk2NjE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd3gvTW91c2VXaGVlbEV2ZW50V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCw3ICs0NCw2 IEBAIFBsYXRmb3JtV2hlZWxFdmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KGMKICAgICAsIG1fZGVs dGFZKGV2ZW50LkdldFdoZWVsUm90YXRpb24oKSAvIGV2ZW50LkdldFdoZWVsRGVsdGEoKSkKICAg ICAsIG1fd2hlZWxUaWNrc1gobV9kZWx0YVgpCiAgICAgLCBtX3doZWVsVGlja3NZKG1fZGVsdGFZ KQotICAgICwgbV9pc0FjY2VwdGVkKGZhbHNlKQogICAgICwgbV9kaXJlY3Rpb25JbnZlcnRlZEZy b21EZXZpY2UoZmFsc2UpCiB7CiAgICAgLy8gRklYTUU6IHJldHJpZXZlIHRoZSB1c2VyIHNldHRp bmcgZm9yIHRoZSBudW1iZXIgb2YgbGluZXMgdG8gc2Nyb2xsIG9uIGVhY2ggd2hlZWwgZXZlbnQK SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA5NjYyMCkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMTAtMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZW1vdmUgUGxhdGZvcm1XaGVlbEV2ZW50OjptX2lzQWNjZXB0ZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MzU3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViSW5wdXRFdmVu dENvbnZlcnNpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpQbGF0Zm9ybVdoZWVsRXZlbnRCdWls ZGVyOjpQbGF0Zm9ybVdoZWVsRXZlbnRCdWlsZGVyKToKKyAgICAgICAgbV9pc0FjY2VwdGVkIGhh cyBiZWVuIHJlbW92ZWQuCisKKyAgICAgICAgKiBzcmMvV2ViU2Nyb2xsYmFySW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNjcm9sbGJhckltcGw6Om9uTW91c2VXaGVlbCk6CisgICAgICAg IEp1c3QgcmV0dXJuIHRoZSB2YWx1ZSBvZiBoYW5kbGVXaGVlbEV2ZW50LgorCiAyMDExLTEwLTA0 ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJv bWl1bV0gV2ViIEluc3BlY3Rvcjogc2F2ZSBpbnNwZWN0b3Igc3RhdGUgaW50byBzaW5nbGUgc3Ry aW5nIGluc3RlYWQgb2Ygc3RyaW5nIG1hcApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24gOTY1 OTkpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lv bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4LDcgKzk4LDYgQEAgUGxhdGZvcm1XaGVlbEV2ZW50 QnVpbGRlcjo6UGxhdGZvcm1XaGVlbAogICAgIG1fZGVsdGFZID0gZS5kZWx0YVk7CiAgICAgbV93 aGVlbFRpY2tzWCA9IGUud2hlZWxUaWNrc1g7CiAgICAgbV93aGVlbFRpY2tzWSA9IGUud2hlZWxU aWNrc1k7Ci0gICAgbV9pc0FjY2VwdGVkID0gZmFsc2U7CiAgICAgbV9ncmFudWxhcml0eSA9IGUu c2Nyb2xsQnlQYWdlID8KICAgICAgICAgU2Nyb2xsQnlQYWdlV2hlZWxFdmVudCA6IFNjcm9sbEJ5 UGl4ZWxXaGVlbEV2ZW50OwogICAgIG1fc2hpZnRLZXkgPSAoZS5tb2RpZmllcnMgJiBXZWJJbnB1 dEV2ZW50OjpTaGlmdEtleSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJT Y3JvbGxiYXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJTY3JvbGxiYXJJbXBsLmNwcAkocmV2aXNpb24gOTY1OTkpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJTY3JvbGxiYXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ5 LDggKzI0OSw3IEBAIGJvb2wgV2ViU2Nyb2xsYmFySW1wbDo6b25Nb3VzZVdoZWVsKGNvbnMKIHsK ICAgICBXZWJNb3VzZVdoZWVsRXZlbnQgbW91c2V3aGVlbCA9ICpzdGF0aWNfY2FzdDxjb25zdCBX ZWJNb3VzZVdoZWVsRXZlbnQqPigmZXZlbnQpOwogICAgIFBsYXRmb3JtV2hlZWxFdmVudEJ1aWxk ZXIgcGxhdGZvcm1FdmVudChtX3Njcm9sbGJhci5nZXQoKSwgbW91c2V3aGVlbCk7Ci0gICAgbV9n cm91cC0+aGFuZGxlV2hlZWxFdmVudChwbGF0Zm9ybUV2ZW50KTsKLSAgICByZXR1cm4gcGxhdGZv cm1FdmVudC5pc0FjY2VwdGVkKCk7CisgICAgcmV0dXJuIG1fZ3JvdXAtPmhhbmRsZVdoZWVsRXZl bnQocGxhdGZvcm1FdmVudCk7CiB9CiAKIGJvb2wgV2ViU2Nyb2xsYmFySW1wbDo6b25LZXlEb3du KGNvbnN0IFdlYklucHV0RXZlbnQmIGV2ZW50KQo=