74407 2011-12-13 06:45:03 -0800 [Qt][WK2] Make QtPageClient dispatch directly to WebView when possible 2011-12-13 13:29:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72943 1 cmarcelo cmarcelo webkit.review.bot zoltan oldest_to_newest 520059 0 cmarcelo 2011-12-13 06:45:03 -0800 [Qt][WK2] Make QtPageClient dispatch directly to WebView when possible 520060 1 119011 cmarcelo 2011-12-13 06:45:53 -0800 Created attachment 119011 Patch 520066 2 119011 hausmann 2011-12-13 07:08:25 -0800 Comment on attachment 119011 Patch r=me. You could also pass the QQuickWebViewPrivate to the PageClient if you feel like it :) 520079 3 cmarcelo 2011-12-13 07:47:54 -0800 Committed r102680: <http://trac.webkit.org/changeset/102680> 119011 2011-12-13 06:45:53 -0800 2011-12-13 07:08:25 -0800 Patch bug-74407-20111213114650.patch text/plain 24052 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTE3MmFmNjU1MGY5Yjc2 YTUyOTA5ZTNkYmFmZDEwYjA0YjY3ZGIzOS4uNDE2NTU4NDUwYmEzNGIzM2UwOWQ4ZTAxMmZmOTg0 N2ZiM2Y4MDFkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDExLTEyLTEzICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKKyAgICAgICAgW1F0XVtXSzJdIE1ha2UgUXRQYWdlQ2xpZW50IGRpc3BhdGNoIGRpcmVjdGx5 IHRvIFdlYlZpZXcgd2hlbiBwb3NzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzQ0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6Cisg ICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6UVF1aWNrV2ViVmlld1ByaXZhdGUpOgorICAg ICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6On5RUXVpY2tXZWJWaWV3UHJpdmF0ZSk6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6cGFnZURpZFJlcXVlc3RTY3JvbGwpOgorICAgICAgICAoUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OnByb2Nlc3NEaWRDcmFzaCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6ZGlkUmVsYXVuY2hQcm9jZXNzKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRl Ojp2aWV3U2l6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZGlkUmVjZWl2ZU1l c3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0V4cGVy aW1lbnRhbDo6UVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbCk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3OjpRUXVpY2tXZWJWaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXdfcF9wLmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5jcHA6Cisg ICAgICAgIChRdFBhZ2VDbGllbnQ6OlF0UGFnZUNsaWVudCk6CisgICAgICAgIChRdFBhZ2VDbGll bnQ6OnNldFZpZXdOZWVkc0Rpc3BsYXkpOgorICAgICAgICAoUXRQYWdlQ2xpZW50OjpwYWdlRGlk UmVxdWVzdFNjcm9sbCk6CisgICAgICAgIChRdFBhZ2VDbGllbnQ6OnByb2Nlc3NEaWRDcmFzaCk6 CisgICAgICAgIChRdFBhZ2VDbGllbnQ6OmRpZFJlbGF1bmNoUHJvY2Vzcyk6CisgICAgICAgIChR dFBhZ2VDbGllbnQ6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAgICAgIChRdFBhZ2VDbGll bnQ6OmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyk6CisgICAgICAgIChRdFBhZ2VDbGllbnQ6 OmNyZWF0ZVBvcHVwTWVudVByb3h5KToKKyAgICAgICAgKFF0UGFnZUNsaWVudDo6ZGlkUmVjZWl2 ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QpOgorICAgICAgICAoUXRQYWdlQ2xpZW50Ojp2 aWV3U2l6ZSk6CisgICAgICAgIChRdFBhZ2VDbGllbnQ6OmlzVmlld0ZvY3VzZWQpOgorICAgICAg ICAoUXRQYWdlQ2xpZW50Ojppc1ZpZXdWaXNpYmxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRQYWdlQ2xpZW50Lmg6CisgICAgICAgIChRdFBhZ2VDbGllbnQ6OmluaXRpYWxpemUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBh Z2VQcm94eTo6UXRXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5oOgorCisyMDExLTEyLTEzICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8g IDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CisKICAgICAgICAgW1F0XVtXSzJdIE1vdmUg bG9hZCAmIG5hdmlnYXRpb24gcmVsYXRlZCBmdW5jdGlvbnMgb3V0IG9mIFF0V2ViUGFnZVByb3h5 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDM5NQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNw cAppbmRleCA4YWI5NDZiOWU1NGNlNTNkNWQ5Yjg5NDdkN2ZmOGRlZTAwMGQwMTZmLi5jZTE2Zjk1 MGQ1ZmVhYjU1MTY5MzNmY2NjYTc1ZjFlYjMxNWY4MmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTM2LDExICszNiwxMCBA QAogCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgogI2lu Y2x1ZGUgPFFGaWxlRGlhbG9nPgotI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4KICNpbmNsdWRlIDxR dFF1aWNrL1FRdWlja0NhbnZhcz4KICNpbmNsdWRlIDxXS09wZW5QYW5lbFJlc3VsdExpc3RlbmVy Lmg+CiAKLVFRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJWaWV3UHJpdmF0ZShRUXVpY2tX ZWJWaWV3KiB2aWV3cG9ydCwgV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVm IHBhZ2VHcm91cFJlZikKK1FRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJWaWV3UHJpdmF0 ZShRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKICAgICA6IHFfcHRyKHZpZXdwb3J0KQogICAgICwg YWxlcnREaWFsb2coMCkKICAgICAsIGNvbmZpcm1EaWFsb2coMCkKQEAgLTUxLDE0ICs1MCwyMSBA QCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6UVF1aWNrV2ViVmlld1ByaXZhdGUoUVF1aWNrV2ViVmll dyogdmlld3BvcnQsIFdLQ29udGV4dFJlZgogICAgICwgcGFnZUlzU3VzcGVuZGVkKGZhbHNlKQog ewogICAgIHZpZXdwb3J0LT5zZXRGbGFncyhRUXVpY2tJdGVtOjpJdGVtQ2xpcHNDaGlsZHJlblRv U2hhcGUpOwotCiAgICAgUU9iamVjdDo6Y29ubmVjdCh2aWV3cG9ydCwgU0lHTkFMKHZpc2libGVD aGFuZ2VkKCkpLCB2aWV3cG9ydCwgU0xPVChfcV9vblZpc2libGVDaGFuZ2VkKCkpKTsKICAgICBw YWdlVmlldy5yZXNldChuZXcgUVF1aWNrV2ViUGFnZSh2aWV3cG9ydCkpOworfQogCi0gICAgcGFn ZUNsaWVudC5yZXNldChuZXcgUXRQYWdlQ2xpZW50KCkpOworUVF1aWNrV2ViVmlld1ByaXZhdGU6 On5RUXVpY2tXZWJWaWV3UHJpdmF0ZSgpCit7CisgICAgaWYgKGludGVyYWN0aW9uRW5naW5lKQor ICAgICAgICBpbnRlcmFjdGlvbkVuZ2luZS0+ZGlzY29ubmVjdCgpOworfQogCisvLyBOb3RlOiB3 ZSBkZWxheSB0aGlzIGluaXRpYWxpemF0aW9uIHRvIG1ha2Ugc3VyZSB0aGF0IFFRdWlja1dlYlZp ZXcgaGFzIGl0cyBkLXB0ciBpbi1wbGFjZS4KK3ZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6Omlu aXRpYWxpemUoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91 cFJlZikKK3sKICAgICBRUXVpY2tXZWJQYWdlUHJpdmF0ZSogY29uc3QgcGFnZVZpZXdQcml2YXRl ID0gcGFnZVZpZXcuZGF0YSgpLT5kOwotICAgIHNldFBhZ2VQcm94eShuZXcgUXRXZWJQYWdlUHJv eHkocGFnZVZpZXcuZGF0YSgpLCBxX3B0ciwgcGFnZUNsaWVudC5kYXRhKCksIGNvbnRleHRSZWYs IHBhZ2VHcm91cFJlZikpOworICAgIHNldFBhZ2VQcm94eShuZXcgUXRXZWJQYWdlUHJveHkocV9w dHIsICZwYWdlQ2xpZW50LCBjb250ZXh0UmVmLCBwYWdlR3JvdXBSZWYpKTsKICAgICBwYWdlVmll d1ByaXZhdGUtPnNldFBhZ2VQcm94eShwYWdlUHJveHkuZGF0YSgpKTsKIAogICAgIHBhZ2VMb2Fk Q2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VMb2FkQ2xpZW50KHBhZ2VQcm94eS0+cGFnZVJlZigp LCBxX3B0cikpOwpAQCAtNzAsNyArNzYsNyBAQCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6UVF1aWNr V2ViVmlld1ByaXZhdGUoUVF1aWNrV2ViVmlldyogdmlld3BvcnQsIFdLQ29udGV4dFJlZgogICAg IHNldFVzZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cihmYWxzZSk7CiAgICAgUVdlYlByZWZl cmVuY2VzUHJpdmF0ZTo6Z2V0KHBhZ2VQcm94eS0+cHJlZmVyZW5jZXMoKSktPnNldEF0dHJpYnV0 ZShRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwg dHJ1ZSk7CiAKLSAgICBwYWdlQ2xpZW50LT5pbml0aWFsaXplKHBhZ2VQcm94eS5kYXRhKCksIGV2 ZW50SGFuZGxlci5kYXRhKCksICZ1bmRvQ29udHJvbGxlcik7CisgICAgcGFnZUNsaWVudC5pbml0 aWFsaXplKHFfcHRyLCBwYWdlUHJveHkuZGF0YSgpLCBldmVudEhhbmRsZXIuZGF0YSgpLCAmdW5k b0NvbnRyb2xsZXIpOwogCiAgICAgLy8gQ3JlYXRlcyBhIHBhZ2Ugd2l0aCB0aGUgcGFnZSBjcmVh dGlvbiBwYXJhbWV0ZXJzLgogICAgIHBhZ2VQcm94eS0+aW5pdChldmVudEhhbmRsZXIuZGF0YSgp KTsKQEAgLTc5LDEyICs4NSw2IEBAIFFRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJWaWV3 UHJpdmF0ZShRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCwgV0tDb250ZXh0UmVmCiAgICAgX3Ffb25W aXNpYmxlQ2hhbmdlZCgpOwogfQogCi1RUXVpY2tXZWJWaWV3UHJpdmF0ZTo6flFRdWlja1dlYlZp ZXdQcml2YXRlKCkKLXsKLSAgICBpZiAoaW50ZXJhY3Rpb25FbmdpbmUpCi0gICAgICAgIGludGVy YWN0aW9uRW5naW5lLT5kaXNjb25uZWN0KCk7Ci19Ci0KIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZh dGU6OmVuYWJsZU1vdXNlRXZlbnRzKCkKIHsKICAgICBRX1EoUVF1aWNrV2ViVmlldyk7CkBAIC0x OTgsNyArMTk4LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZGlkQ2hhbmdlQmFja0Zv cndhcmRMaXN0KCkKICAgICBwYWdlUHJveHktPm5hdmlnYXRpb25IaXN0b3J5KCktPmQtPnJlc2V0 KCk7CiB9CiAKLXZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OnNjcm9sbFBvc2l0aW9uUmVxdWVz dGVkKGNvbnN0IFFQb2ludCYgcG9zKQordm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6cGFnZURp ZFJlcXVlc3RTY3JvbGwoY29uc3QgUVBvaW50JiBwb3MpCiB7CiAgICAgaWYgKHVzZVRyYWRpdGlv bmFsRGVza3RvcEJlaGF2aW91cikKICAgICAgICAgcmV0dXJuOwpAQCAtMjExLDYgKzIxMSwyMSBA QCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpzY3JvbGxQb3NpdGlvblJlcXVlc3RlZChjb25z dCBRUG9pbnQmIHBvcykKICAgICBpbnRlcmFjdGlvbkVuZ2luZS0+cGFnZVBvc2l0aW9uUmVxdWVz dChwb3MpOwogfQogCit2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpwcm9jZXNzRGlkQ3Jhc2go KQoreworICAgIGVtaXQgcV9wdHItPm5hdmlnYXRpb25TdGF0ZUNoYW5nZWQoKTsKKyAgICBldmVu dEhhbmRsZXItPnJlc2V0R2VzdHVyZVJlY29nbml6ZXJzKCk7CisgICAgV2ViQ29yZTo6S1VSTCB1 cmwoV2ViQ29yZTo6UGFyc2VkVVJMU3RyaW5nLCB3ZWJQYWdlUHJveHkoKS0+dXJsQXRQcm9jZXNz RXhpdCgpKTsKKyAgICBxV2FybmluZygiV0FSTklORzogVGhlIHdlYiBwcm9jZXNzIGV4cGVyaWVu Y2VkIGEgY3Jhc2ggb24gJyVzJy4iLCBxUHJpbnRhYmxlKFFVcmwodXJsKS50b1N0cmluZyhRVXJs OjpSZW1vdmVVc2VySW5mbykpKTsKK30KKwordm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZGlk UmVsYXVuY2hQcm9jZXNzKCkKK3sKKyAgICBlbWl0IHFfcHRyLT5uYXZpZ2F0aW9uU3RhdGVDaGFu Z2VkKCk7CisgICAgcVdhcm5pbmcoIldBUk5JTkc6IFRoZSB3ZWIgcHJvY2VzcyBoYXMgYmVlbiBz dWNjZXNzZnVsbHkgcmVzdGFydGVkLiIpOworICAgIHBhZ2VQcm94eS0+c2V0RHJhd2luZ0FyZWFT aXplKHZpZXdTaXplKCkpOworfQorCiB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjp1cGRhdGVW aXNpYmxlQ29udGVudFJlY3QoKQogewogICAgIFFfUShRUXVpY2tXZWJWaWV3KTsKQEAgLTQxMSw2 ICs0MjYsMTkgQEAgV2ViS2l0OjpXZWJQYWdlUHJveHkqIFFRdWlja1dlYlZpZXdQcml2YXRlOjp3 ZWJQYWdlUHJveHkoKSBjb25zdAogICAgIHJldHVybiB0b0ltcGwocGFnZVByb3h5LT5wYWdlUmVm KCkpOwogfQogCitXZWJDb3JlOjpJbnRTaXplIFFRdWlja1dlYlZpZXdQcml2YXRlOjp2aWV3U2l6 ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFdlYkNvcmU6OkludFNpemUocGFnZVZpZXctPndpZHRo KCksIHBhZ2VWaWV3LT5oZWlnaHQoKSk7Cit9CisKK3ZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6 OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYgbWVz c2FnZSkKK3sKKyAgICBRVmFyaWFudE1hcCB2YXJpYW50TWFwOworICAgIHZhcmlhbnRNYXAuaW5z ZXJ0KFFMYXRpbjFTdHJpbmcoImRhdGEiKSwgUVN0cmluZyhtZXNzYWdlKSk7CisgICAgdmFyaWFu dE1hcC5pbnNlcnQoUUxhdGluMVN0cmluZygib3JpZ2luIiksIHFfcHRyLT51cmwoKSk7CisgICAg ZW1pdCBxX3B0ci0+ZXhwZXJpbWVudGFsKCktPm1lc3NhZ2VSZWNlaXZlZCh2YXJpYW50TWFwKTsK K30KKwogLyohCiAgICAgXHFtbHNpZ25hbCBXZWJWaWV3Ojpvbk5hdmlnYXRpb25SZXF1ZXN0ZWQo cmVxdWVzdCkKIApAQCAtNDQ4LDggKzQ3Niw2IEBAIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6 OlFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwoUVF1aWNrV2ViVmlldyAqd2ViVmlldykKICAgICAs IHFfcHRyKHdlYlZpZXcpCiAgICAgLCBkX3B0cih3ZWJWaWV3LT5kX3B0ci5kYXRhKCkpCiB7Ci0g ICAgUV9EKFFRdWlja1dlYlZpZXcpOwotICAgIFFPYmplY3Q6OmNvbm5lY3QoZC0+cGFnZVByb3h5 LmRhdGEoKSwgU0lHTkFMKHJlY2VpdmVkTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChRVmFy aWFudE1hcCkpLCB0aGlzLCBTSUdOQUwobWVzc2FnZVJlY2VpdmVkKFFWYXJpYW50TWFwKSkpOwog fQogCiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjp+UVF1aWNrV2ViVmlld0V4cGVyaW1lbnRh bCgpCkBAIC01NTksMTQgKzU4NSwxNyBAQCBRUXVpY2tXZWJWaWV3OjpRUXVpY2tXZWJWaWV3KFFR dWlja0l0ZW0qIHBhcmVudCkKICAgICAsIG1fZXhwZXJpbWVudGFsKG5ldyBRUXVpY2tXZWJWaWV3 RXhwZXJpbWVudGFsKHRoaXMpKQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKKyAgICBkLT5p bml0aWFsaXplKCk7CiAgICAgZC0+aW5pdGlhbGl6ZVRvdWNoKHRoaXMpOwogfQogCiBRUXVpY2tX ZWJWaWV3OjpRUXVpY2tXZWJWaWV3KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91 cFJlZiBwYWdlR3JvdXBSZWYsIFFRdWlja0l0ZW0qIHBhcmVudCkKICAgICA6IFFRdWlja0l0ZW0o cGFyZW50KQotICAgICwgZF9wdHIobmV3IFFRdWlja1dlYlZpZXdQcml2YXRlKHRoaXMsIGNvbnRl eHRSZWYsIHBhZ2VHcm91cFJlZikpCisgICAgLCBkX3B0cihuZXcgUVF1aWNrV2ViVmlld1ByaXZh dGUodGhpcykpCiAgICAgLCBtX2V4cGVyaW1lbnRhbChuZXcgUVF1aWNrV2ViVmlld0V4cGVyaW1l bnRhbCh0aGlzKSkKIHsKKyAgICBRX0QoUVF1aWNrV2ViVmlldyk7CisgICAgZC0+aW5pdGlhbGl6 ZShjb250ZXh0UmVmLCBwYWdlR3JvdXBSZWYpOwogfQogCiBRUXVpY2tXZWJWaWV3Ojp+UVF1aWNr V2ViVmlldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXdfcF9wLmgKaW5kZXggNWY1YWExM2RmYjEyMTU3OWZmNDM4ZjhmYWE3M2Y3NDJiNTZj Y2Q4Yi4uYTE5Nzg1ZDg4NmNlOWFkNjgwMDA4NWU4NzQ5Mzg5YjM5NWNhMGNjYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApA QCAtNTQsOSArNTQsMTIgQEAgY2xhc3MgUVF1aWNrV2ViVmlld1ByaXZhdGUgewogcHVibGljOgog ICAgIHN0YXRpYyBRUXVpY2tXZWJWaWV3UHJpdmF0ZSogZ2V0KFFRdWlja1dlYlZpZXcqIHEpIHsg cmV0dXJuIHEtPmRfcHRyLmRhdGEoKTsgfQogCi0gICAgUVF1aWNrV2ViVmlld1ByaXZhdGUoUVF1 aWNrV2ViVmlldyogdmlld3BvcnQsIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmID0gMCwgV0tQYWdl R3JvdXBSZWYgcGFnZUdyb3VwUmVmID0gMCk7Ci0gICAgdmlydHVhbCB+UVF1aWNrV2ViVmlld1By aXZhdGUoKTsgCisgICAgUVF1aWNrV2ViVmlld1ByaXZhdGUoUVF1aWNrV2ViVmlldyogdmlld3Bv cnQpOworICAgIHZpcnR1YWwgflFRdWlja1dlYlZpZXdQcml2YXRlKCk7CisKKyAgICB2b2lkIGlu aXRpYWxpemUoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYgPSAwLCBXS1BhZ2VHcm91cFJlZiBwYWdl R3JvdXBSZWYgPSAwKTsKICAgICB2b2lkIHNldFBhZ2VQcm94eShRdFdlYlBhZ2VQcm94eSopOwor CiAgICAgdm9pZCBpbml0aWFsaXplVG91Y2goUVF1aWNrV2ViVmlldyogdmlld3BvcnQpOwogICAg IHZvaWQgaW5pdGlhbGl6ZURlc2t0b3AoUVF1aWNrV2ViVmlldyogdmlld3BvcnQpOwogICAgIHZv aWQgZW5hYmxlTW91c2VFdmVudHMoKTsKQEAgLTY1LDExICs2OCw5IEBAIHB1YmxpYzoKICAgICB2 b2lkIGxvYWREaWRDb21taXQoKTsKIAogICAgIHZvaWQgZGlkRmluaXNoRmlyc3ROb25FbXB0eUxh eW91dCgpOwotICAgIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFFTaXplJiBuZXdT aXplKTsKICAgICB2b2lkIGRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyhjb25zdCBXZWJDb3Jl OjpWaWV3cG9ydEFyZ3VtZW50cyYgYXJncyk7CiAgICAgdm9pZCBkaWRDaGFuZ2VCYWNrRm9yd2Fy ZExpc3QoKTsKIAotICAgIHZvaWQgc2Nyb2xsUG9zaXRpb25SZXF1ZXN0ZWQoY29uc3QgUVBvaW50 JiBwb3MpOwogICAgIHZvaWQgdXBkYXRlVmlld3BvcnRTaXplKCk7CiAgICAgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpDb25zdHJhaW50cyBjb21wdXRlVmlld3BvcnRDb25zdHJhaW50cygp OwogCkBAIC05Miw2ICs5MywxNSBAQCBwdWJsaWM6CiAKICAgICBXZWJLaXQ6OldlYlBhZ2VQcm94 eSogd2ViUGFnZVByb3h5KCkgY29uc3Q7CiAKKyAgICAvLyBQYWdlQ2xpZW50LgorICAgIFdlYkNv cmU6OkludFNpemUgdmlld1NpemUoKSBjb25zdDsKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdl RnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7CisgICAgdm9pZCBw YWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBRUG9pbnQmIHBvcyk7CisgICAgdm9pZCBkaWRDaGFu Z2VDb250ZW50c1NpemUoY29uc3QgUVNpemUmIG5ld1NpemUpOworICAgIHZvaWQgcHJvY2Vzc0Rp ZENyYXNoKCk7CisgICAgdm9pZCBkaWRSZWxhdW5jaFByb2Nlc3MoKTsKKworCiBwcml2YXRlOgog ICAgIC8vIFRoaXMgY2xhc3MgaXMgcmVzcG9uc2libGUgZm9yIGNvbGxlY3RpbmcgYW5kIGFwcGx5 aW5nIGFsbCBwcm9wZXJ0aWVzCiAgICAgLy8gb24gdGhlIHZpZXdwb3J0IGl0ZW0sIHdoZW4gdHJh bnNpdGlvbmluZyBmcm9tIHBhZ2UgQSB0byBwYWdlIEIgaXMgZmluaXNoZWQuCkBAIC0xMjIsOSAr MTMyLDkgQEAgcHJpdmF0ZToKICAgICAgICAgUVBvaW50IHBvc2l0aW9uOwogICAgIH07CiAKKyAg ICBRdFBhZ2VDbGllbnQgcGFnZUNsaWVudDsKICAgICBRdFdlYlVuZG9Db250cm9sbGVyIHVuZG9D b250cm9sbGVyOwogCi0gICAgUVNjb3BlZFBvaW50ZXI8UXRQYWdlQ2xpZW50PiBwYWdlQ2xpZW50 OwogICAgIFFTY29wZWRQb2ludGVyPFF0V2ViUGFnZUV2ZW50SGFuZGxlcj4gZXZlbnRIYW5kbGVy OwogCiAgICAgUVNjb3BlZFBvaW50ZXI8UXRXZWJQYWdlTG9hZENsaWVudD4gcGFnZUxvYWRDbGll bnQ7CkBAIC0xMzcsOCArMTQ3LDYgQEAgcHJpdmF0ZToKICAgICBRUXVpY2tXZWJWaWV3KiBxX3B0 cjsKICAgICBRU2NvcGVkUG9pbnRlcjxRdFdlYlBhZ2VQcm94eT4gcGFnZVByb3h5OwogCi0gICAg T3duUHRyPFFXZWJOYXZpZ2F0aW9uSGlzdG9yeT4gbmF2aWdhdGlvbkhpc3Rvcnk7Ci0KICAgICBR RGVjbGFyYXRpdmVDb21wb25lbnQqIGFsZXJ0RGlhbG9nOwogICAgIFFEZWNsYXJhdGl2ZUNvbXBv bmVudCogY29uZmlybURpYWxvZzsKICAgICBRRGVjbGFyYXRpdmVDb21wb25lbnQqIHByb21wdERp YWxvZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhZ2VDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5jcHAKaW5k ZXggMWJiMmQ5NmJjODFmZmMxNjRlZWUyNDE1YmE3MTAyYTM5Mzk1ZGJiMi4uNWQ3NmY4MDYzMWQz M2UwNjEyNzJmNDM4ODljNzFlYWY3NWZkOTZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0UGFnZUNsaWVudC5jcHAKQEAgLTI2LDggKzI2LDEwIEBACiAjaW5jbHVkZSAiUXRX ZWJVbmRvQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZW51UHJveHlRdC5oIgog I2luY2x1ZGUgIldlYkVkaXRDb21tYW5kUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQb3B1cE1lbnVQ cm94eVF0LmgiCisjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCisjaW5jbHVkZSAicXF1aWNr d2Vidmlld19wX3AuaCIKICNpbmNsdWRlIDxRR3VpQXBwbGljYXRpb24+Ci0jaW5jbHVkZSA8UVVu ZG9TdGFjaz4KICNpbmNsdWRlIDxXZWJDb3JlL0N1cnNvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUv RHJhZ0RhdGEuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgpAQCAtMzcsNyArMzks MTAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBRdFBhZ2VDbGllbnQ6OlF0UGFnZUNsaWVudCgpCi0gICAgOiBtX3F0V2ViUGFnZVByb3h5KDAp CisgICAgOiBtX3dlYlZpZXcoMCkKKyAgICAsIG1fcXRXZWJQYWdlUHJveHkoMCkKKyAgICAsIG1f ZXZlbnRIYW5kbGVyKDApCisgICAgLCBtX3VuZG9Db250cm9sbGVyKDApCiB7CiB9CiAKQEAgLTUy LDMyICs1NywzMiBAQCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IFF0UGFnZUNsaWVudDo6 Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiAKIHZvaWQgUXRQYWdlQ2xpZW50OjpzZXRWaWV3TmVl ZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCiB7Ci0gICAgbV9xdFdlYlBh Z2VQcm94eS0+c2V0Vmlld05lZWRzRGlzcGxheShyZWN0KTsKKyAgICBtX3dlYlZpZXctPnBhZ2Uo KS0+dXBkYXRlKCk7CiB9CiAKIHZvaWQgUXRQYWdlQ2xpZW50OjpwYWdlRGlkUmVxdWVzdFNjcm9s bChjb25zdCBJbnRQb2ludCYgcG9zKQogewotICAgIG1fcXRXZWJQYWdlUHJveHktPnBhZ2VEaWRS ZXF1ZXN0U2Nyb2xsKHBvcyk7CisgICAgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmdldChtX3dlYlZp ZXcpLT5wYWdlRGlkUmVxdWVzdFNjcm9sbChwb3MpOwogfQogCiB2b2lkIFF0UGFnZUNsaWVudDo6 cHJvY2Vzc0RpZENyYXNoKCkKIHsKLSAgICBtX3F0V2ViUGFnZVByb3h5LT5wcm9jZXNzRGlkQ3Jh c2goKTsKKyAgICBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0KG1fd2ViVmlldyktPnByb2Nlc3NE aWRDcmFzaCgpOwogfQogCiB2b2lkIFF0UGFnZUNsaWVudDo6ZGlkUmVsYXVuY2hQcm9jZXNzKCkK IHsKLSAgICBtX3F0V2ViUGFnZVByb3h5LT5kaWRSZWxhdW5jaFByb2Nlc3MoKTsKKyAgICBRUXVp Y2tXZWJWaWV3UHJpdmF0ZTo6Z2V0KG1fd2ViVmlldyktPmRpZFJlbGF1bmNoUHJvY2VzcygpOwog fQogCiB2b2lkIFF0UGFnZUNsaWVudDo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IEludFNp emUmIG5ld1NpemUpCiB7Ci0gICAgbV9xdFdlYlBhZ2VQcm94eS0+ZGlkQ2hhbmdlQ29udGVudHNT aXplKG5ld1NpemUpOworICAgIFFRdWlja1dlYlZpZXdQcml2YXRlOjpnZXQobV93ZWJWaWV3KS0+ ZGlkQ2hhbmdlQ29udGVudHNTaXplKG5ld1NpemUpOwogfQogCiB2b2lkIFF0UGFnZUNsaWVudDo6 ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJndW1l bnRzJiBhcmdzKQogewotICAgIG1fcXRXZWJQYWdlUHJveHktPmRpZENoYW5nZVZpZXdwb3J0UHJv cGVydGllcyhhcmdzKTsKKyAgICBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0KG1fd2ViVmlldykt PmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyhhcmdzKTsKIH0KIAogdm9pZCBRdFBhZ2VDbGll bnQ6OnN0YXJ0RHJhZyhjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYgZHJhZ0RhdGEsIFBhc3NSZWZQ dHI8U2hhcmVhYmxlQml0bWFwPiBkcmFnSW1hZ2UpCkBAIC0xNDgsNyArMTUzLDcgQEAgSW50UmVj dCBRdFBhZ2VDbGllbnQ6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIFBh c3NSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IFF0UGFnZUNsaWVudDo6Y3JlYXRlUG9wdXBNZW51 UHJveHkoV2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiB7Ci0gICAgcmV0dXJuIG1fcXRXZWJQ YWdlUHJveHktPmNyZWF0ZVBvcHVwTWVudVByb3h5KHdlYlBhZ2VQcm94eSk7CisgICAgcmV0dXJu IFdlYlBvcHVwTWVudVByb3h5UXQ6OmNyZWF0ZSh0b0ltcGwobV9xdFdlYlBhZ2VQcm94eS0+cGFn ZVJlZigpKSwgbV93ZWJWaWV3KTsKIH0KIAogUGFzc1JlZlB0cjxXZWJDb250ZXh0TWVudVByb3h5 PiBRdFBhZ2VDbGllbnQ6OmNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5KikKQEAg LTE3NSw3ICsxODAsNyBAQCB2b2lkIFF0UGFnZUNsaWVudDo6Zm9jdXNFZGl0YWJsZUFyZWEoY29u c3QgSW50UmVjdCYgY2FyZXQsIGNvbnN0IEludFJlY3QmIGFyZWEpCiAKIHZvaWQgUXRQYWdlQ2xp ZW50OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcm IG1lc3NhZ2UpCiB7Ci0gICAgbV9xdFdlYlBhZ2VQcm94eS0+ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9t TmF2aWdhdG9yUXRPYmplY3QobWVzc2FnZSk7CisgICAgUVF1aWNrV2ViVmlld1ByaXZhdGU6Omdl dChtX3dlYlZpZXcpLT5kaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChtZXNz YWdlKTsKIH0KIAogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCkBAIC0xOTgsNyArMjAzLDcgQEAg dm9pZCBRdFBhZ2VDbGllbnQ6OnNjcm9sbFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc2Ny b2xsUmVjdCwgY29uc3QgV2ViQ29yZToKIAogV2ViQ29yZTo6SW50U2l6ZSBRdFBhZ2VDbGllbnQ6 OnZpZXdTaXplKCkKIHsKLSAgICByZXR1cm4gbV9xdFdlYlBhZ2VQcm94eS0+dmlld1NpemUoKTsK KyAgICByZXR1cm4gUVF1aWNrV2ViVmlld1ByaXZhdGU6OmdldChtX3dlYlZpZXcpLT52aWV3U2l6 ZSgpOwogfQogCiBib29sIFF0UGFnZUNsaWVudDo6aXNWaWV3V2luZG93QWN0aXZlKCkKQEAgLTIw OSwxOCArMjE0LDE2IEBAIGJvb2wgUXRQYWdlQ2xpZW50Ojppc1ZpZXdXaW5kb3dBY3RpdmUoKQog CiBib29sIFF0UGFnZUNsaWVudDo6aXNWaWV3Rm9jdXNlZCgpCiB7Ci0gICAgaWYgKCFtX3F0V2Vi UGFnZVByb3h5KQorICAgIGlmICghbV93ZWJWaWV3KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICByZXR1cm4gbV9xdFdlYlBhZ2VQcm94eS0+aXNWaWV3Rm9jdXNlZCgpOworICAgIHJldHVy biBtX3dlYlZpZXctPmhhc0ZvY3VzKCk7CiB9CiAKIGJvb2wgUXRQYWdlQ2xpZW50Ojppc1ZpZXdW aXNpYmxlKCkKIHsKLSAgICBpZiAoIW1fcXRXZWJQYWdlUHJveHkpCisgICAgaWYgKCFtX3dlYlZp ZXcpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBtX3F0V2ViUGFnZVByb3h5 LT5pc1ZpZXdWaXNpYmxlKCk7CisgICAgcmV0dXJuIG1fd2ViVmlldy0+aXNWaXNpYmxlKCkgJiYg bV93ZWJWaWV3LT5wYWdlKCktPmlzVmlzaWJsZSgpOwogfQogCiBib29sIFF0UGFnZUNsaWVudDo6 aXNWaWV3SW5XaW5kb3coKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0UGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVu dC5oCmluZGV4IDZiYWMwYzI0ZWEzMDUwYzE5MzNkOTFiYWZlMzY3NzFkNjUwNTNmOGEuLjc2YzRj NTA1NGU5YWNhZDIzNjU0MTc0MmFiYWY4MWNiOGJlNmYyMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmgKQEAgLTI5LDYgKzI5LDcgQEAKIAogY2xhc3MgUXRX ZWJQYWdlRXZlbnRIYW5kbGVyOwogY2xhc3MgUXRXZWJVbmRvQ29udHJvbGxlcjsKK2NsYXNzIFFR dWlja1dlYlZpZXc7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTM3LDI1ICszOCwy OCBAQCBwdWJsaWM6CiAgICAgUXRQYWdlQ2xpZW50KCk7CiAgICAgflF0UGFnZUNsaWVudCgpOwog Ci0gICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdB cmVhUHJveHkoKTsKKyAgICAvLyBRUXVpY2tXZWJWaWV3LgogICAgIHZpcnR1YWwgdm9pZCBzZXRW aWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKLSAgICB2aXJ0dWFsIHZv aWQgZGlzcGxheVZpZXcoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxP ZmZzZXQpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpOwotICAgIHZp cnR1YWwgYm9vbCBpc1ZpZXdXaW5kb3dBY3RpdmUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3 Rm9jdXNlZCgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdWaXNpYmxlKCk7CisgICAgdmlydHVh bCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmlu ZyYpOworICAgIHZpcnR1YWwgdm9pZCBwYWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYpOworICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VDb250ZW50c1NpemUoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYpOworICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9y dFByb3BlcnRpZXMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKKyAgICB2aXJ0 dWFsIHZvaWQgcHJvY2Vzc0RpZENyYXNoKCk7CisgICAgdmlydHVhbCB2b2lkIGRpZFJlbGF1bmNo UHJvY2VzcygpOworCisgICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlzcGxheVZpZXcoKTsK KyAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY3Jv bGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpOworICAgIHZpcnR1 YWwgYm9vbCBpc1ZpZXdXaW5kb3dBY3RpdmUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3SW5X aW5kb3coKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCB2 b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4 dCYpOwogICAgIHZpcnR1YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsK ICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgdmlydHVhbCB2b2lk IHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7Ci0gICAgdmly dHVhbCB2b2lkIHByb2Nlc3NEaWRDcmFzaCgpOwogICAgIHZpcnR1YWwgdm9pZCBwYWdlQ2xvc2Vk KCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJlbGF1bmNoUHJvY2VzcygpOwotICAgIHZpcnR1 YWwgdm9pZCBkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwot ICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3QgV2ViQ29y ZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKICAgICB2aXJ0dWFsIHZvaWQgc3RhcnREcmFnKGNvbnN0 IFdlYkNvcmU6OkRyYWdEYXRhJiwgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGRyYWdJbWFn ZSk7CiAgICAgdmlydHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJDb3JlOjpDdXJzb3ImKTsK ICAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc29ySGlkZGVuVW50aWxNb3VzZU1vdmVzKGJvb2wpOwpA QCAtODUsMjEgKzg5LDIyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY291bnRTdHJpbmdN YXRjaGVzSW5DdXN0b21SZXByZXNlbnRhdGlvbihjb25zdCBTdHJpbmcmLCBGaW5kT3B0aW9ucywg dW5zaWduZWQgbWF4TWF0Y2hDb3VudCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmRab29t YWJsZUFyZWEoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0 Jik7CiAgICAgdmlydHVhbCB2b2lkIGZvY3VzRWRpdGFibGVBcmVhKGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJl Y2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYpOwogICAgIHZp cnR1YWwgdm9pZCBoYW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSopOwogCiAjaWYg RU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICB2aXJ0dWFsIHZvaWQgZG9uZVdpdGhUb3VjaEV2ZW50 KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCk7CiAjZW5k aWYKIAotICAgIHZvaWQgaW5pdGlhbGl6ZShRdFdlYlBhZ2VQcm94eSogcGFnZVByb3h5LCBRdFdl YlBhZ2VFdmVudEhhbmRsZXIqIGV2ZW50SGFuZGxlciwgUXRXZWJVbmRvQ29udHJvbGxlciogdW5k b0NvbnRyb2xsZXIpCisgICAgdm9pZCBpbml0aWFsaXplKFFRdWlja1dlYlZpZXcqIHdlYlZpZXcs IFF0V2ViUGFnZVByb3h5KiBwYWdlUHJveHksIFF0V2ViUGFnZUV2ZW50SGFuZGxlciogZXZlbnRI YW5kbGVyLCBRdFdlYlVuZG9Db250cm9sbGVyKiB1bmRvQ29udHJvbGxlcikKICAgICB7CisgICAg ICAgIG1fd2ViVmlldyA9IHdlYlZpZXc7CiAgICAgICAgIG1fZXZlbnRIYW5kbGVyID0gZXZlbnRI YW5kbGVyOwogICAgICAgICBtX3F0V2ViUGFnZVByb3h5ID0gcGFnZVByb3h5OwogICAgICAgICBt X3VuZG9Db250cm9sbGVyID0gdW5kb0NvbnRyb2xsZXI7CiAgICAgfQogCiBwcml2YXRlOgorICAg IFFRdWlja1dlYlZpZXcqIG1fd2ViVmlldzsKICAgICBRdFdlYlBhZ2VQcm94eSogbV9xdFdlYlBh Z2VQcm94eTsKICAgICBRdFdlYlBhZ2VFdmVudEhhbmRsZXIqIG1fZXZlbnRIYW5kbGVyOwogICAg IFF0V2ViVW5kb0NvbnRyb2xsZXIqIG1fdW5kb0NvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCBiMjJjYWNmZDY2Zjk5YTI0 MGJkYTQ2Y2YwNjg1YjYwNmZmNjRkZjBkLi44ZGY0ZDQ3NjI0ZWIwM2RkMzhlNjgyY2E0MGQ0YWJk ODVlNjEyN2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQ cm94eS5jcHAKQEAgLTI1LDcgKzI1LDYgQEAKICNpbmNsdWRlIDxRdFF1aWNrL3FxdWlja2NhbnZh cy5oPgogI2luY2x1ZGUgInFxdWlja3dlYnZpZXdfcC5oIgogI2luY2x1ZGUgInFxdWlja3dlYnZp ZXdfcF9wLmgiCi0jaW5jbHVkZSAicXF1aWNrd2VicGFnZV9wLmgiCiAjaW5jbHVkZSAicXdlYmRv d25sb2FkaXRlbV9wLmgiCiAjaW5jbHVkZSAicXdlYmRvd25sb2FkaXRlbV9wX3AuaCIKICNpbmNs dWRlICJxd2VibmF2aWdhdGlvbmhpc3RvcnlfcC5oIgpAQCAtNDEsMTAgKzQwLDcgQEAKICNpbmNs dWRlICJRdFdlYlBhZ2VFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExp c3QuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudVByb3h5UXQuaCIKLSNpbmNsdWRlICJXZWJQ b3B1cE1lbnVQcm94eVF0LmgiCiAjaW5jbHVkZSAiV0tTdHJpbmdRdC5oIgotI2luY2x1ZGUgIldL VVJMUXQuaCIKLSNpbmNsdWRlIDxRVW5kb1N0YWNrPgogI2luY2x1ZGUgPFdlYktpdDIvV0tGcmFt ZS5oPgogI2luY2x1ZGUgPFdlYktpdDIvV0tQYWdlR3JvdXAuaD4KICNpbmNsdWRlIDxXZWJLaXQy L1dLUmV0YWluUHRyLmg+CkBAIC01MiwxMSArNDgsOSBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1RdFdlYlBhZ2VQcm94eTo6UXRXZWJQYWdl UHJveHkoUVF1aWNrV2ViUGFnZSogcW1sV2ViUGFnZSwgUVF1aWNrV2ViVmlldyogcW1sV2ViVmll dywgUXRQYWdlQ2xpZW50ICpwYWdlQ2xpZW50LCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQ YWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQotICAgIDogbV9xbWxXZWJQYWdlKHFtbFdlYlBhZ2Up Ci0gICAgLCBtX3FtbFdlYlZpZXcocW1sV2ViVmlldykKK1F0V2ViUGFnZVByb3h5OjpRdFdlYlBh Z2VQcm94eShRUXVpY2tXZWJWaWV3KiBxbWxXZWJWaWV3LCBRdFBhZ2VDbGllbnQgKnBhZ2VDbGll bnQsIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYp CisgICAgOiBtX3FtbFdlYlZpZXcocW1sV2ViVmlldykKICAgICAsIG1fY29udGV4dChjb250ZXh0 UmVmID8gUXRXZWJDb250ZXh0OjpjcmVhdGUodG9JbXBsKGNvbnRleHRSZWYpKSA6IFF0V2ViQ29u dGV4dDo6ZGVmYXVsdENvbnRleHQoKSkKLSAgICAsIG1fdW5kb1N0YWNrKGFkb3B0UHRyKG5ldyBR VW5kb1N0YWNrKHRoaXMpKSkKICAgICAsIG1fbmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKGZhbHNl KQogewogICAgIG1fd2ViUGFnZVByb3h5ID0gbV9jb250ZXh0LT5jcmVhdGVXZWJQYWdlKHBhZ2VD bGllbnQsIHRvSW1wbChwYWdlR3JvdXBSZWYpKTsKQEAgLTEwNiw1OSArMTAwLDExIEBAIHZvaWQg UXRXZWJQYWdlUHJveHk6OmhpZGVDb250ZXh0TWVudSgpCiAgICAgICAgIGFjdGl2ZU1lbnUtPmhp ZGUoKTsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQcm94eTo6c2V0Vmlld05lZWRzRGlzcGxheShjb25z dCBXZWJDb3JlOjpJbnRSZWN0JikKLXsKLSAgICBtX3FtbFdlYlBhZ2UtPnVwZGF0ZSgpOwotfQot Ci1XZWJDb3JlOjpJbnRTaXplIFF0V2ViUGFnZVByb3h5Ojp2aWV3U2l6ZSgpCi17Ci0gICAgcmV0 dXJuIFdlYkNvcmU6OkludFNpemUobV9xbWxXZWJQYWdlLT53aWR0aCgpLCBtX3FtbFdlYlBhZ2Ut PmhlaWdodCgpKTsKLX0KLQotYm9vbCBRdFdlYlBhZ2VQcm94eTo6aXNWaWV3Rm9jdXNlZCgpCi17 Ci0gICAgcmV0dXJuIG1fcW1sV2ViVmlldy0+aGFzRm9jdXMoKTsKLX0KLQotYm9vbCBRdFdlYlBh Z2VQcm94eTo6aXNWaWV3VmlzaWJsZSgpCi17Ci0gICAgcmV0dXJuIG1fcW1sV2ViVmlldy0+aXNW aXNpYmxlKCkgJiYgbV9xbWxXZWJQYWdlLT5pc1Zpc2libGUoKTsKLX0KLQotdm9pZCBRdFdlYlBh Z2VQcm94eTo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgSW50UG9pbnQmIHBvcykKLXsKLSAg ICBtX3FtbFdlYlZpZXctPmRfZnVuYygpLT5zY3JvbGxQb3NpdGlvblJlcXVlc3RlZChwb3MpOwot fQotCi12b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgSW50 U2l6ZSYgbmV3U2l6ZSkKLXsKLSAgICBtX3FtbFdlYlZpZXctPmRfZnVuYygpLT5kaWRDaGFuZ2VD b250ZW50c1NpemUobmV3U2l6ZSk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlUHJveHk6OmRpZENoYW5n ZVZpZXdwb3J0UHJvcGVydGllcyhjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50cyYgYXJn cykKLXsKLSAgICBtX3FtbFdlYlZpZXctPmRfZnVuYygpLT5kaWRDaGFuZ2VWaWV3cG9ydFByb3Bl cnRpZXMoYXJncyk7Ci19Ci0KLVBhc3NSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IFF0V2ViUGFn ZVByb3h5OjpjcmVhdGVQb3B1cE1lbnVQcm94eShXZWJQYWdlUHJveHkqKQotewotICAgIHJldHVy biBXZWJQb3B1cE1lbnVQcm94eVF0OjpjcmVhdGUobV93ZWJQYWdlUHJveHkuZ2V0KCksIG1fcW1s V2ViVmlldyk7Ci19Ci0KIFdLUGFnZVJlZiBRdFdlYlBhZ2VQcm94eTo6cGFnZVJlZigpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIHRvQVBJKG1fd2ViUGFnZVByb3h5LmdldCgpKTs7CiB9CiAKLXZvaWQg UXRXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNv bnN0IFN0cmluZyYgbWVzc2FnZSkKLXsKLSAgICBRVmFyaWFudE1hcCB2YXJpYW50TWFwOwotICAg IHZhcmlhbnRNYXAuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoImRhdGEiKSwgUVN0cmluZyhtZXNzYWdl KSk7Ci0gICAgdmFyaWFudE1hcC5pbnNlcnQoUUxhdGluMVN0cmluZygib3JpZ2luIiksIG1fcW1s V2ViVmlldy0+dXJsKCkpOwotICAgIGVtaXQgcmVjZWl2ZWRNZXNzYWdlRnJvbU5hdmlnYXRvclF0 T2JqZWN0KHZhcmlhbnRNYXApOwotfQotCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojpnb0JhY2tUbyhp bnQgaW5kZXgpCiB7CiAgICAgbV9uYXZpZ2F0aW9uSGlzdG9yeS0+ZC0+Z29CYWNrVG8oaW5kZXgp OwpAQCAtMTY5LDI5ICsxMTUsNiBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojpnb0ZvcndhcmRUbyhp bnQgaW5kZXgpCiAgICAgbV9uYXZpZ2F0aW9uSGlzdG9yeS0+ZC0+Z29Gb3J3YXJkVG8oaW5kZXgp OwogfQogCi12b2lkIFF0V2ViUGFnZVByb3h5Ojp1cGRhdGVOYXZpZ2F0aW9uU3RhdGUoKQotewot ICAgIGVtaXQgbV9xbWxXZWJWaWV3LT5uYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkKCk7Ci19Ci0KLXZv aWQgUXRXZWJQYWdlUHJveHk6OmRpZFJlbGF1bmNoUHJvY2VzcygpCi17Ci0gICAgdXBkYXRlTmF2 aWdhdGlvblN0YXRlKCk7Ci0gICAgcVdhcm5pbmcoIldBUk5JTkc6IFRoZSB3ZWIgcHJvY2VzcyBo YXMgYmVlbiBzdWNjZXNzZnVsbHkgcmVzdGFydGVkLiIpOwotICAgIHNldERyYXdpbmdBcmVhU2l6 ZSh2aWV3U2l6ZSgpKTsKLX0KLQotdm9pZCBRdFdlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNo KCkKLXsKLSAgICB1cGRhdGVOYXZpZ2F0aW9uU3RhdGUoKTsKLQotICAgIEFTU0VSVChtX2V2ZW50 SGFuZGxlcik7Ci0gICAgbV9ldmVudEhhbmRsZXItPnJlc2V0R2VzdHVyZVJlY29nbml6ZXJzKCk7 Ci0KLSAgICBXZWJDb3JlOjpLVVJMIHVybChXZWJDb3JlOjpQYXJzZWRVUkxTdHJpbmcsIG1fd2Vi UGFnZVByb3h5LT51cmxBdFByb2Nlc3NFeGl0KCkpOwotICAgIHFXYXJuaW5nKCJXQVJOSU5HOiBU aGUgd2ViIHByb2Nlc3MgZXhwZXJpZW5jZWQgYSBjcmFzaCBvbiAnJXMnLiIsIHFQcmludGFibGUo UVVybCh1cmwpLnRvU3RyaW5nKFFVcmw6OlJlbW92ZVVzZXJJbmZvKSkpOwotfQotCiBRV2ViUHJl ZmVyZW5jZXMqIFF0V2ViUGFnZVByb3h5OjpwcmVmZXJlbmNlcygpIGNvbnN0CiB7CiAgICAgaWYg KCFtX3ByZWZlcmVuY2VzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdl UHJveHkuaAppbmRleCA5NTBjMzg3MDA1NzI5ZmI0YTQyMDBlMzBhN2RjNzA3YjVlMWNhOTZlLi4y ZmQ3Y2MwNzJmNWQwYmI4NDYxODQ0YWQwNGY1NjAzOTMzZWRkOTczIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaApAQCAtMjMsMTYgKzIzLDExIEBACiAK ICNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCiAjaW5jbHVkZSAiUXRXZWJDb250ZXh0Lmgi Ci0jaW5jbHVkZSAiVmlld3BvcnRBcmd1bWVudHMuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHku aCIKICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8 UVNoYXJlZFBvaW50ZXI+CiAKLVFUX0JFR0lOX05BTUVTUEFDRQotY2xhc3MgUVVuZG9TdGFjazsK LVFUX0VORF9OQU1FU1BBQ0UKLQogY2xhc3MgUXRQYWdlQ2xpZW50OwogY2xhc3MgUVF1aWNrV2Vi UGFnZTsKIGNsYXNzIFFRdWlja1dlYlZpZXc7CkBAIC01MiwzMiArNDcsMTQgQEAgY2xhc3MgUXRX ZWJQYWdlUHJveHkgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9PQkpFQ1QKIAogcHVibGljOgot ICAgIFF0V2ViUGFnZVByb3h5KFFRdWlja1dlYlBhZ2UqLCBRUXVpY2tXZWJWaWV3KiwgUXRQYWdl Q2xpZW50KiwgV0tDb250ZXh0UmVmID0gMCwgV0tQYWdlR3JvdXBSZWYgPSAwKTsKKyAgICBRdFdl YlBhZ2VQcm94eShRUXVpY2tXZWJWaWV3KiwgUXRQYWdlQ2xpZW50KiwgV0tDb250ZXh0UmVmID0g MCwgV0tQYWdlR3JvdXBSZWYgPSAwKTsKICAgICB+UXRXZWJQYWdlUHJveHkoKTsKIAogICAgIFBh c3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOwogCi0g ICAgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKLSAg ICBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCk7Ci0gICAgYm9vbCBpc1ZpZXdGb2N1c2VkKCk7 Ci0gICAgYm9vbCBpc1ZpZXdWaXNpYmxlKCk7Ci0KLSAgICB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Ny b2xsKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7Ci0gICAgdm9pZCBwcm9jZXNzRGlkQ3Jhc2go KTsKLSAgICB2b2lkIGRpZFJlbGF1bmNoUHJvY2VzcygpOwotCi0gICAgdm9pZCBkaWRDaGFuZ2VD b250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwotICAgIHZvaWQgZGlkQ2hhbmdl Vmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzJik7Ci0K LSAgICBQYXNzUmVmUHRyPFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVu dVByb3h5KFdlYktpdDo6V2ViUGFnZVByb3h5Kik7Ci0KLSAgICB2b2lkIGRpZFJlY2VpdmVNZXNz YWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYpOwotCiAgICAgdm9pZCBnb0Jh Y2tUbyhpbnQgaW5kZXgpOwogICAgIHZvaWQgZ29Gb3J3YXJkVG8oaW50IGluZGV4KTsKIAotICAg IHZvaWQgdXBkYXRlTmF2aWdhdGlvblN0YXRlKCk7Ci0KICAgICBXS1BhZ2VSZWYgcGFnZVJlZigp IGNvbnN0OwogCiAgICAgdm9pZCBzZXREcmF3aW5nQXJlYVNpemUoY29uc3QgUVNpemUmKTsKQEAg LTEyMywxMCArMTAwLDggQEAgcHVibGljIFFfU0xPVFM6CiAKIHB1YmxpYzoKICAgICBRX1NJR05B TCB2b2lkIHpvb21hYmxlQXJlYUZvdW5kKGNvbnN0IFFSZWN0Jik7Ci0gICAgUV9TSUdOQUwgdm9p ZCByZWNlaXZlZE1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgUVZhcmlhbnRNYXAm KTsKIAogcHJvdGVjdGVkOgotICAgIFFRdWlja1dlYlBhZ2UqIG1fcW1sV2ViUGFnZTsKICAgICBR UXVpY2tXZWJWaWV3KiBtX3FtbFdlYlZpZXc7CiAgICAgUmVmUHRyPFdlYktpdDo6V2ViUGFnZVBy b3h5PiBtX3dlYlBhZ2VQcm94eTsKIApAQCAtMTM2LDggKzExMSw2IEBAIHByaXZhdGU6CiAKICAg ICBtdXRhYmxlIE93blB0cjxRV2ViUHJlZmVyZW5jZXM+IG1fcHJlZmVyZW5jZXM7CiAKLSAgICBP d25QdHI8UVVuZG9TdGFjaz4gbV91bmRvU3RhY2s7Ci0KICAgICBib29sIG1fbmF2aWdhdG9yUXRP YmplY3RFbmFibGVkOwogCiAgICAgUVNoYXJlZFBvaW50ZXI8UU1lbnU+IGFjdGl2ZU1lbnU7Cg==