200105 2019-07-24 19:26:47 -0700 [iOS WK2] A top fixed bar can flicker when scrolling with the keyboard up 2019-07-25 14:14:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr koivisto luiz simon.fraser tonikitoo webkit-bug-importer wenson_hsieh oldest_to_newest 1555643 0 simon.fraser 2019-07-24 19:26:47 -0700 [iOS WK2] A top fixed bar can flicker when scrolling with the keyboard up 1555647 1 374849 simon.fraser 2019-07-24 19:36:06 -0700 Created attachment 374849 Patch 1555648 2 simon.fraser 2019-07-24 19:36:08 -0700 <rdar://problem/52871975> 1555660 3 374849 wenson_hsieh 2019-07-24 19:55:56 -0700 Comment on attachment 374849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374849&action=review > LayoutTests/scrollingcoordinator/ios/fixed-scrolling-with-keyboard.html:32 > + function getScrollingTreeUIScript() > + { > + return `(function() { > + return uiController.scrollingTreeAsText; > + })();`; > + } Nit - maybe we should wrap this in a UIHelper method as well? 1555893 4 simon.fraser 2019-07-25 14:14:56 -0700 https://trac.webkit.org/r247839 374849 2019-07-24 19:36:06 -0700 2019-07-24 19:55:56 -0700 Patch bug-200105-20190724193605.patch text/plain 21274 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTMyODNhZGIyZjA2YTMw ZTViOGE0NGZiMTZlNjY1YmZmZTE5Yzg4MC4uYWM1NmNjMjAxNGI1ZTEyZDAzMjQ4NTNkOThiYmNl MjRhY2U5NDBkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE5LTA3LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBB IHRvcCBmaXhlZCBiYXIgY2FuIGZsaWNrZXIgd2hlbiBzY3JvbGxpbmcgd2l0aCB0aGUga2V5Ym9h cmQgdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw MDEwNQorICAgICAgICByZGFyOi8vcHJvYmxlbS81Mjg3MTk3NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGU6OmxheW91dFZpZXdwb3J0Rm9yU2Nyb2xsUG9zaXRpb24oKSBjb21wdXRlcyBhIHZpc3Vh bCB2aWV3cG9ydAorICAgICAgICBmcm9tIHRoZSBjdXJyZW50IHNjcm9sbCBwb3NpdGlvbiBhbmQg c2Nyb2xsYWJsZUFyZWFTaXplKCkuIFRoaXMgZG9lc24ndCBrbm93IGFueXRoaW5nIGFib3V0Cisg ICAgICAgIHRoZSBpbXBhY3Qgb2Yga2V5Ym9hcmRzIG9uIHRoZSB2aXN1YWwgdmlld3BvcnQsIHNv IGl0IGNvbXB1dGVzIGEgdG9vLWxhcmdlIHZpc3VhbCB2aWV3cG9ydAorICAgICAgICB3aGVuIHRo ZSBrZXlib2FyZCBpcyB1cCwgdHJpZ2dlcmluZyBpbmNvcnJlY3QgbWFuaXB1bGF0aW9ucyBvZiB0 aGUgbGF5b3V0IHZpZXdwb3J0LiBUaGlzCisgICAgICAgIGxlYWRzIHRvIHRoZSB0b3AgYmFyIGZs YXNoaW5nIHRvIHBvc2l0aW9uIDAgd2hlbiBpdCBzaG91bGQgYmUgaGlkZGVuIG9mZiB0aGUgdG9w LgorCisgICAgICAgIEZpeCBieSBmZWVkaW5nIGludG8gdGhlIHNjcm9sbGluZyB0cmVlIHRoZSBo ZWlnaHQgb2YgdGhlIHZpc3VhbCB2aWV3cG9ydCB3aGljaCB0YWtlcworICAgICAgICBGcmFtZVZp ZXc6OnZpc3VhbFZpZXdwb3J0T3ZlcnJpZGVSZWN0KCkgaW50byBhY2NvdW50LiBUaGlzIGlzIHN0 b3JlZCBvbiBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS8KKyAgICAgICAgU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS4KKworICAgICAgICBUZXN0OiBzY3JvbGxpbmdjb29y ZGluYXRvci9pb3MvZml4ZWQtc2Nyb2xsaW5nLXdpdGgta2V5Ym9hcmQuaHRtbAorCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnNldEZyYW1lU2Nyb2xsaW5nTm9kZVN0YXRlKToKKyAgICAgICAgKiBwYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5nU3RhdGVG cmFtZVNjcm9sbGluZ05vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVGcmFt ZVNjcm9sbGluZ05vZGU6OnNldFByb3BlcnR5Q2hhbmdlZEJpdHNBZnRlclJlYXR0YWNoKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRPdmVy cmlkZVZpc3VhbFZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6ZHVtcFByb3BlcnRpZXMgY29uc3QpOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmg6CisgICAgICAg ICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxpbmdUcmVlOjpjb21taXRUcmVlU3RhdGUpOiBMT0dfV0lUSF9TVFJFQU0oKSBkb2Vzbid0 IGV2YWx1YXRlIHNjcm9sbGluZ1RyZWVBc1RleHQoKQorICAgICAgICBldmVyeSB0aW1lLgorICAg ICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Y29t bWl0U3RhdGVCZWZvcmVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlOjpsYXlvdXRWaWV3cG9ydEZvclNjcm9sbFBvc2l0aW9uIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OmR1 bXBQcm9wZXJ0aWVzIGNvbnN0KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlLmg6CisKIDIwMTktMDctMjMgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTG9uZyBwcmVzcyBoaW50IG9mIEFpclBv ZHMgYnV5IGJ1dHRvbnMgYXJlIHRhbGwgYW5kIG5hcnJvdyBkdXJpbmcgYW5pbWF0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDE4ODdkODY1OGY2MjVhZDg2ODJjYTNjNGVkMmQ3NTM4YmYzZmQxMWIuLjJmYWJmYjgz ZTgzODdmMDlkMjUwYzRmYzQyOGJjYzQ5N2Q5MzdmNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTktMDctMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPUyBXSzJdIEEgdG9wIGZpeGVkIGJhciBjYW4gZmxpY2tlciB3aGVuIHNjcm9s bGluZyB3aXRoIHRoZSBrZXlib2FyZCB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMTA1CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzUyODcxOTc1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6bGF5b3V0Vmlld3BvcnRGb3JTY3JvbGxQb3NpdGlv bigpIGNvbXB1dGVzIGEgdmlzdWFsIHZpZXdwb3J0CisgICAgICAgIGZyb20gdGhlIGN1cnJlbnQg c2Nyb2xsIHBvc2l0aW9uIGFuZCBzY3JvbGxhYmxlQXJlYVNpemUoKS4gVGhpcyBkb2Vzbid0IGtu b3cgYW55dGhpbmcgYWJvdXQKKyAgICAgICAgdGhlIGltcGFjdCBvZiBrZXlib2FyZHMgb24gdGhl IHZpc3VhbCB2aWV3cG9ydCwgc28gaXQgY29tcHV0ZXMgYSB0b28tbGFyZ2UgdmlzdWFsIHZpZXdw b3J0CisgICAgICAgIHdoZW4gdGhlIGtleWJvYXJkIGlzIHVwLCB0cmlnZ2VyaW5nIGluY29ycmVj dCBtYW5pcHVsYXRpb25zIG9mIHRoZSBsYXlvdXQgdmlld3BvcnQuIFRoaXMKKyAgICAgICAgbGVh ZHMgdG8gdGhlIHRvcCBiYXIgZmxhc2hpbmcgdG8gcG9zaXRpb24gMCB3aGVuIGl0IHNob3VsZCBi ZSBoaWRkZW4gb2ZmIHRoZSB0b3AuCisKKyAgICAgICAgRml4IGJ5IGZlZWRpbmcgaW50byB0aGUg c2Nyb2xsaW5nIHRyZWUgdGhlIGhlaWdodCBvZiB0aGUgdmlzdWFsIHZpZXdwb3J0IHdoaWNoIHRh a2VzCisgICAgICAgIEZyYW1lVmlldzo6dmlzdWFsVmlld3BvcnRPdmVycmlkZVJlY3QoKSBpbnRv IGFjY291bnQuIFRoaXMgaXMgc3RvcmVkIG9uIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlLworICAgICAgICBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLgorCisgICAgICAg ICogU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5z YWN0aW9uLmNwcDoKKyAgICAgICAgKEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5nU3RhdGVGcmFtZVNj cm9sbGluZ05vZGU+OjplbmNvZGUpOgorICAgICAgICAoQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT46OmRlY29kZSk6CisKIDIwMTktMDctMjMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgU1BJIGZv ciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IGNiZDE4OGNlNmM1 ZGE1YWRkOGQ1ZTk1NDYyZTgzZTg0OGZmZTdiNTUuLjdjZDk1ZGZjODIzZDU5NjQwMjA1MmMyYThm YjkwNTkzMTUyZmU5MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMjU4LDYgKzI1OCw3 IEBAIHB1YmxpYzoKICAgICBPcHRpb25hbDxMYXlvdXRSZWN0PiBsYXlvdXRWaWV3cG9ydE92ZXJy aWRlUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0Vmlld3BvcnRPdmVycmlkZVJlY3Q7IH0K IAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0VmlzdWFsVmlld3BvcnRPdmVycmlkZVJlY3Qo T3B0aW9uYWw8TGF5b3V0UmVjdD4pOworICAgIE9wdGlvbmFsPExheW91dFJlY3Q+IHZpc3VhbFZp ZXdwb3J0T3ZlcnJpZGVSZWN0KCkgY29uc3QgeyByZXR1cm4gbV92aXN1YWxWaWV3cG9ydE92ZXJy aWRlUmVjdDsgfQogCiAgICAgLy8gVGhlc2UgYXJlIGluIGRvY3VtZW50IGNvb3JkaW5hdGVzLCB1 bmFmZmVjdGVkIGJ5IHBhZ2Ugc2NhbGUgKGJ1dCBhZmZlY3RlZCBieSB6b29taW5nKS4KICAgICBX RUJDT1JFX0VYUE9SVCBMYXlvdXRSZWN0IGxheW91dFZpZXdwb3J0UmVjdCgpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmNwcAppbmRleCA2ZThhMWViOGQwOGUzODU1NjU0ZWFlNDJmMWIwYTI3MWQw N2E4MDNiLi5hZThhOWZiYjQ5YjhlNTcxNzNhNzUxMzVkMDcwMDM5Y2UwZGI1ZjI3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmNwcApAQCAtNjUyLDYgKzY1MiwxMSBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnNldEZyYW1lU2Nyb2xsaW5nTm9kZVN0YXRlKFNjcm9sbGluZ05vZGVJRCBu b2RlSQogICAgIGZyYW1lU2Nyb2xsaW5nTm9kZS5zZXRNaW5MYXlvdXRWaWV3cG9ydE9yaWdpbihm cmFtZVZpZXcubWluU3RhYmxlTGF5b3V0Vmlld3BvcnRPcmlnaW4oKSk7CiAgICAgZnJhbWVTY3Jv bGxpbmdOb2RlLnNldE1heExheW91dFZpZXdwb3J0T3JpZ2luKGZyYW1lVmlldy5tYXhTdGFibGVM YXlvdXRWaWV3cG9ydE9yaWdpbigpKTsKIAorICAgIGlmIChhdXRvIHZpc3VhbE92ZXJyaWRlUmVj dCA9IGZyYW1lVmlldy52aXN1YWxWaWV3cG9ydE92ZXJyaWRlUmVjdCgpKQorICAgICAgICBmcmFt ZVNjcm9sbGluZ05vZGUuc2V0T3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUoRmxvYXRTaXplKHZp c3VhbE92ZXJyaWRlUmVjdC52YWx1ZSgpLnNpemUoKSkpOworICAgIGVsc2UKKyAgICAgICAgZnJh bWVTY3JvbGxpbmdOb2RlLnNldE92ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKFdURjo6bnVsbG9w dCk7CisKICAgICBmcmFtZVNjcm9sbGluZ05vZGUuc2V0Rml4ZWRFbGVtZW50c0xheW91dFJlbGF0 aXZlVG9GcmFtZShmcmFtZVZpZXcuZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgp KTsKIAogICAgIGF1dG8gdmlzdWFsVmlld3BvcnRJc1NtYWxsZXJUaGFuTGF5b3V0Vmlld3BvcnQg PSBbXShjb25zdCBGcmFtZVZpZXcmIGZyYW1lVmlldykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9s bGluZ05vZGUuY3BwCmluZGV4IDYxNjllMjFkNmI0YWIxNjQ5ZGVkNDY3OGEzYzI5ZTUzZmM0YWVm M2IuLmM4OTViMzQwNzA1ZTIwODkxMjE2ZWM4YjA3Mjk2MmJjZjU4MzJlMmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTUwLDYgKzUwLDcgQEAgU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlKGNv bnN0IFNjcm9sbGkKICAgICAsIG1fbGF5b3V0Vmlld3BvcnQoc3RhdGVOb2RlLmxheW91dFZpZXdw b3J0KCkpCiAgICAgLCBtX21pbkxheW91dFZpZXdwb3J0T3JpZ2luKHN0YXRlTm9kZS5taW5MYXlv dXRWaWV3cG9ydE9yaWdpbigpKQogICAgICwgbV9tYXhMYXlvdXRWaWV3cG9ydE9yaWdpbihzdGF0 ZU5vZGUubWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4oKSkKKyAgICAsIG1fb3ZlcnJpZGVWaXN1YWxW aWV3cG9ydFNpemUoc3RhdGVOb2RlLm92ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKCkpCiAgICAg LCBtX2ZyYW1lU2NhbGVGYWN0b3Ioc3RhdGVOb2RlLmZyYW1lU2NhbGVGYWN0b3IoKSkKICAgICAs IG1fdG9wQ29udGVudEluc2V0KHN0YXRlTm9kZS50b3BDb250ZW50SW5zZXQoKSkKICAgICAsIG1f aGVhZGVySGVpZ2h0KHN0YXRlTm9kZS5oZWFkZXJIZWlnaHQoKSkKQEAgLTEwOCw2ICsxMDksNyBA QCB2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRQcm9wZXJ0eUNoYW5n ZWRCaXRzQWZ0ZXJSZWF0dGFjaCgpCiAgICAgc2V0UHJvcGVydHlDaGFuZ2VkQml0KExheW91dFZp ZXdwb3J0KTsKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWRCaXQoTWluTGF5b3V0Vmlld3BvcnRPcmln aW4pOwogICAgIHNldFByb3BlcnR5Q2hhbmdlZEJpdChNYXhMYXlvdXRWaWV3cG9ydE9yaWdpbik7 CisgICAgc2V0UHJvcGVydHlDaGFuZ2VkQml0KE92ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKTsK IAogICAgIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0UHJvcGVydHlDaGFuZ2VkQml0 c0FmdGVyUmVhdHRhY2goKTsKIH0KQEAgLTE3Niw2ICsxNzgsMTUgQEAgdm9pZCBTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0TWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4oY29uc3Qg RmxvYXRQb2kKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoTWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4p OwogfQogCit2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRPdmVycmlk ZVZpc3VhbFZpZXdwb3J0U2l6ZShPcHRpb25hbDxGbG9hdFNpemU+IHZpZXdwb3J0U2l6ZSkKK3sK KyAgICBpZiAodmlld3BvcnRTaXplID09IG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUgPSB2aWV3 cG9ydFNpemU7CisgICAgc2V0UHJvcGVydHlDaGFuZ2VkKE92ZXJyaWRlVmlzdWFsVmlld3BvcnRT aXplKTsKK30KKwogdm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0SGVh ZGVySGVpZ2h0KGludCBoZWFkZXJIZWlnaHQpCiB7CiAgICAgaWYgKG1faGVhZGVySGVpZ2h0ID09 IGhlYWRlckhlaWdodCkKQEAgLTMxMiw2ICszMjMsOSBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgU2Nyb2xsaW5n UwogICAgIHRzLmR1bXBQcm9wZXJ0eSgibWluIGxheW91dCB2aWV3cG9ydCBvcmlnaW4iLCBtX21p bkxheW91dFZpZXdwb3J0T3JpZ2luKTsKICAgICB0cy5kdW1wUHJvcGVydHkoIm1heCBsYXlvdXQg dmlld3BvcnQgb3JpZ2luIiwgbV9tYXhMYXlvdXRWaWV3cG9ydE9yaWdpbik7CiAgICAgCisgICAg aWYgKG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUpCisgICAgICAgIHRzLmR1bXBQcm9wZXJ0 eSgib3ZlcnJpZGUgdmlzdWFsIHZpZXdwb3J0IHNpemUiLCBtX292ZXJyaWRlVmlzdWFsVmlld3Bv cnRTaXplLnZhbHVlKCkpOworCiAgICAgaWYgKG1fYmVoYXZpb3JGb3JGaXhlZCA9PSBTdGlja1Rv Vmlld3BvcnRCb3VuZHMpCiAgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgiYmVoYXZpb3IgZm9yIGZp eGVkIiwgbV9iZWhhdmlvckZvckZpeGVkKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2Rl LmgKaW5kZXggNDczYzQ0MjlmY2FkZjZkZDc3NjczNzJlMDdlNjA5ODE3MDMxNjVkNy4uNWU4ZTNi MTM5ZTFiZmMyOWFkZDk1OTM5NmExNzE1MWU1YTUzNTg4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZS5oCkBAIC02Niw2ICs2Niw3IEBAIHB1YmxpYzoKICAgICAgICAgTGF5b3V0Vmll d3BvcnQsCiAgICAgICAgIE1pbkxheW91dFZpZXdwb3J0T3JpZ2luLAogICAgICAgICBNYXhMYXlv dXRWaWV3cG9ydE9yaWdpbiwKKyAgICAgICAgT3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUsCiAg ICAgfTsKIAogICAgIGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2Zy YW1lU2NhbGVGYWN0b3I7IH0KQEAgLTg5LDYgKzkwLDkgQEAgcHVibGljOgogICAgIEZsb2F0UG9p bnQgbWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4oKSBjb25zdCB7IHJldHVybiBtX21heExheW91dFZp ZXdwb3J0T3JpZ2luOyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRNYXhMYXlvdXRWaWV3 cG9ydE9yaWdpbihjb25zdCBGbG9hdFBvaW50Jik7CiAKKyAgICBPcHRpb25hbDxGbG9hdFNpemU+ IG92ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9vdmVycmlkZVZp c3VhbFZpZXdwb3J0U2l6ZTsgfTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldE92ZXJyaWRl VmlzdWFsVmlld3BvcnRTaXplKE9wdGlvbmFsPEZsb2F0U2l6ZT4pOworCiAgICAgaW50IGhlYWRl ckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1faGVhZGVySGVpZ2h0OyB9CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzZXRIZWFkZXJIZWlnaHQoaW50KTsKIApAQCAtMTU0LDYgKzE1OCw3IEBAIHBy aXZhdGU6CiAgICAgRmxvYXRSZWN0IG1fbGF5b3V0Vmlld3BvcnQ7CiAgICAgRmxvYXRQb2ludCBt X21pbkxheW91dFZpZXdwb3J0T3JpZ2luOwogICAgIEZsb2F0UG9pbnQgbV9tYXhMYXlvdXRWaWV3 cG9ydE9yaWdpbjsKKyAgICBPcHRpb25hbDxGbG9hdFNpemU+IG1fb3ZlcnJpZGVWaXN1YWxWaWV3 cG9ydFNpemU7CiAKICAgICBmbG9hdCBtX2ZyYW1lU2NhbGVGYWN0b3IgeyAxIH07CiAgICAgZmxv YXQgbV90b3BDb250ZW50SW5zZXQgeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCmluZGV4IDUwOTZlMWU5MjAzMGFjYTg1MTkwZDg1MDY4 MTc5M2NkNDNiYmE3NzYuLjM3Y2M3MmE2NWJlZDY5MjZiZjI3OGJjM2YzYjBkMmFjYzFhMjVjNWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3Bw CkBAIC0xODYsNyArMTg2LDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlOjpjb21taXRUcmVlU3RhdGUo c3RkOjp1bmlxdWVfcHRyPFNjcm9sbGluZ1N0YXRlVHJlZT4gc2Nyb2xsaW4KICAgICAgICAgbV9u b2RlTWFwLnJlbW92ZShub2RlSUQpOwogICAgIH0KIAotICAgIExPRyhTY3JvbGxpbmcsICJjb21t aXR0ZWQgU2Nyb2xsaW5nVHJlZVxuJXMiLCBzY3JvbGxpbmdUcmVlQXNUZXh0KFNjcm9sbGluZ1N0 YXRlVHJlZUFzVGV4dEJlaGF2aW9yRGVidWcpLnV0ZjgoKS5kYXRhKCkpOworICAgIExPR19XSVRI X1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiY29tbWl0dGVkIFNjcm9sbGluZ1RyZWUiIDw8 IHNjcm9sbGluZ1RyZWVBc1RleHQoU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JEZWJ1 ZykpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWU6OnVwZGF0ZVRyZWVGcm9tU3RhdGVOb2RlKGNv bnN0IFNjcm9sbGluZ1N0YXRlTm9kZSogc3RhdGVOb2RlLCBPcnBoYW5TY3JvbGxpbmdOb2RlTWFw JiBvcnBoYW5Ob2RlcywgSGFzaFNldDxTY3JvbGxpbmdOb2RlSUQ+JiB1bnZpc2l0ZWROb2RlcykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKaW5kZXggNGM2OTVmOWQ4Mjk5MTUyMTBm OWRjMWJhMjgwZTM1MGE1ZDIyYWI0MC4uMTFjNzI2OWQxNGE5NGU3N2IyMjkzY2M5NDQ1NDNmZGQz YjExNDExOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTg1LDYgKzg1 LDkgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJl Zm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1MKIAogICAgIGlmIChzdGF0ZS5oYXNDaGFuZ2Vk UHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6Ok1heExheW91dFZpZXdw b3J0T3JpZ2luKSkKICAgICAgICAgbV9tYXhMYXlvdXRWaWV3cG9ydE9yaWdpbiA9IHN0YXRlLm1h eExheW91dFZpZXdwb3J0T3JpZ2luKCk7CisKKyAgICBpZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3Bl cnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpPdmVycmlkZVZpc3VhbFZpZXdw b3J0U2l6ZSkpCisgICAgICAgIG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUgPSBzdGF0ZS5v dmVycmlkZVZpc3VhbFZpZXdwb3J0U2l6ZSgpOwogfQogCiBib29sIFNjcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGU6OnNjcm9sbFBvc2l0aW9uQW5kTGF5b3V0Vmlld3BvcnRNYXRjaChjb25z dCBGbG9hdFBvaW50JiBwb3NpdGlvbiwgT3B0aW9uYWw8RmxvYXRSZWN0PiBvdmVycmlkZUxheW91 dFZpZXdwb3J0KQpAQCAtOTQsMTEgKzk3LDEyIEBAIGJvb2wgU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZTo6c2Nyb2xsUG9zaXRpb25BbmRMYXlvdXRWaWV3cG9ydE1hdGNoKGNvbnN0CiAK IEZsb2F0UmVjdCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlOjpsYXlvdXRWaWV3cG9y dEZvclNjcm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHZpc2libGVDb250ZW50T3JpZ2lu LCBmbG9hdCBzY2FsZSkgY29uc3QKIHsKLSAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0 KHZpc2libGVDb250ZW50T3JpZ2luLCBzY3JvbGxhYmxlQXJlYVNpemUoKSk7CisgICAgRmxvYXRT aXplIHZpc3VhbFZpZXdwb3J0U2l6ZSA9IG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUudmFs dWVPcihzY3JvbGxhYmxlQXJlYVNpemUoKSk7CisgICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50 UmVjdCh2aXNpYmxlQ29udGVudE9yaWdpbiwgdmlzdWFsVmlld3BvcnRTaXplKTsKICAgICBMYXlv dXRSZWN0IHZpc3VhbFZpZXdwb3J0KEZyYW1lVmlldzo6dmlzaWJsZURvY3VtZW50UmVjdCh2aXNp YmxlQ29udGVudFJlY3QsIGhlYWRlckhlaWdodCgpLCBmb290ZXJIZWlnaHQoKSwgdG90YWxDb250 ZW50c1NpemUoKSwgc2NhbGUpKTsKICAgICBMYXlvdXRSZWN0IGxheW91dFZpZXdwb3J0KG1fbGF5 b3V0Vmlld3BvcnQpOwogCi0gICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8 ICJcblNjcm9sbGluZyB0aHJlYWQ6ICIgPDwgIih2aXNpYmxlQ29udGVudE9yaWdpbiAiIDw8IHZp c2libGVDb250ZW50T3JpZ2luIDw8ICIpIGZpeGVkIGJlaGF2aW9yICIgPDwgbV9iZWhhdmlvckZv ckZpeGVkKTsKKyAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwgIlxuU2Ny b2xsaW5nIHRocmVhZDogIiA8PCAiKHZpc2libGVDb250ZW50T3JpZ2luICIgPDwgdmlzaWJsZUNv bnRlbnRPcmlnaW4gPDwgIiwgdmlzdWFsVmlld3BvcnRTaXplICIgPDwgdmlzdWFsVmlld3BvcnRT aXplIDw8ICIpIGZpeGVkIGJlaGF2aW9yICIgPDwgbV9iZWhhdmlvckZvckZpeGVkKTsKICAgICBM T0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwgIiAgbGF5b3V0Vmlld3BvcnQ6ICIg PDwgbGF5b3V0Vmlld3BvcnQpOwogICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVh bSA8PCAiICB2aXN1YWxWaWV3cG9ydDogIiA8PCB2aXN1YWxWaWV3cG9ydCk7CiAgICAgTE9HX1dJ VEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICIgIHNjcm9sbCBwb3NpdGlvbnM6IG1pbjog IiA8PCBtaW5MYXlvdXRWaWV3cG9ydE9yaWdpbigpIDw8ICIgbWF4OiAiPDwgbWF4TGF5b3V0Vmll d3BvcnRPcmlnaW4oKSk7CkBAIC0xNDYsNiArMTUwLDkgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJh bWVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgU2Nyb2xsaW5n U3QKICAgICB0cy5kdW1wUHJvcGVydHkoIm1pbiBsYXlvdXRWaWV3cG9ydCBvcmlnaW4iLCBtX21p bkxheW91dFZpZXdwb3J0T3JpZ2luKTsKICAgICB0cy5kdW1wUHJvcGVydHkoIm1heCBsYXlvdXRW aWV3cG9ydCBvcmlnaW4iLCBtX21heExheW91dFZpZXdwb3J0T3JpZ2luKTsKIAorICAgIGlmICht X292ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKQorICAgICAgICB0cy5kdW1wUHJvcGVydHkoIm92 ZXJyaWRlIHZpc3VhbCB2aWV3cG9ydCBzaXplIiwgbV9vdmVycmlkZVZpc3VhbFZpZXdwb3J0U2l6 ZS52YWx1ZSgpKTsKKwogICAgIGlmIChtX2ZyYW1lU2NhbGVGYWN0b3IgIT0gMSkKICAgICAgICAg dHMuZHVtcFByb3BlcnR5KCJmcmFtZSBzY2FsZSBmYWN0b3IiLCBtX2ZyYW1lU2NhbGVGYWN0b3Ip OwogICAgIGlmIChtX3RvcENvbnRlbnRJbnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUu aAppbmRleCAxYWFkZWQ1MDg3ZjkzNDY1YmM0NTdlYjU5ZjNiYTZhNDJmMzYwYTE2Li4zYzYzOWMw Y2NjYTc5NjI1YmY5NmY0OTNmZGRjODE4NTgwNDUyNTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xs aW5nTm9kZS5oCkBAIC03OCw2ICs3OCw3IEBAIHByaXZhdGU6CiAgICAgRmxvYXRSZWN0IG1fbGF5 b3V0Vmlld3BvcnQ7CiAgICAgRmxvYXRQb2ludCBtX21pbkxheW91dFZpZXdwb3J0T3JpZ2luOwog ICAgIEZsb2F0UG9pbnQgbV9tYXhMYXlvdXRWaWV3cG9ydE9yaWdpbjsKKyAgICBPcHRpb25hbDxG bG9hdFNpemU+IG1fb3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemU7CiAgICAgCiAgICAgZmxvYXQg bV9mcmFtZVNjYWxlRmFjdG9yIHsgMSB9OwogICAgIGZsb2F0IG1fdG9wQ29udGVudEluc2V0IHsg MCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9T aGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rp b24uY3BwCmluZGV4IDVmOWI2OGZkYmRjYjMwODJkNTQ5M2E0NWE1ODUzMzBkZDQ0ZDhiNzkuLjk3 OGM0YmJlZDdiNWNkOTFjYWFlYzE1NGJjOGJhMTRiYWI3NTM0NjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRv clRyYW5zYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRy ZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAKQEAgLTE4Myw2ICsx ODMsNyBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU+OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgYwogICAgIFNDUk9MTElOR19OT0RFX0VOQ09E RShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6TGF5b3V0Vmlld3BvcnQsIGxheW91 dFZpZXdwb3J0KQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1l U2Nyb2xsaW5nTm9kZTo6TWluTGF5b3V0Vmlld3BvcnRPcmlnaW4sIG1pbkxheW91dFZpZXdwb3J0 T3JpZ2luKQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZTo6TWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4sIG1heExheW91dFZpZXdwb3J0T3Jp Z2luKQorICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZTo6T3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNpemUsIG92ZXJyaWRlVmlzdWFsVmlld3Bv cnRTaXplKQogCiAgICAgaWYgKG5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRl RnJhbWVTY3JvbGxpbmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIpKQogICAgICAgICBlbmNv ZGVyIDw8IHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRD4obm9kZS5j b3VudGVyU2Nyb2xsaW5nTGF5ZXIoKSk7CkBAIC0zMTEsNiArMzEyLDcgQEAgYm9vbCBBcmd1bWVu dENvZGVyPFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPjo6ZGVjb2RlKERlY29kZXIm IGRlY29kZXIsIFMKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3RhdGVGcmFt ZVNjcm9sbGluZ05vZGU6OkxheW91dFZpZXdwb3J0LCBGbG9hdFJlY3QsIHNldExheW91dFZpZXdw b3J0KQogICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZTo6TWluTGF5b3V0Vmlld3BvcnRPcmlnaW4sIEZsb2F0UG9pbnQsIHNldE1pbkxheW91 dFZpZXdwb3J0T3JpZ2luKQogICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6TWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4sIEZsb2F0UG9pbnQs IHNldE1heExheW91dFZpZXdwb3J0T3JpZ2luKQorICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6T3ZlcnJpZGVWaXN1YWxWaWV3cG9ydFNp emUsIE9wdGlvbmFsPEZsb2F0U2l6ZT4sIHNldE92ZXJyaWRlVmlzdWFsVmlld3BvcnRTaXplKQog CiAgICAgaWYgKG5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIpKSB7CiAgICAgICAgIEdyYXBoaWNzTGF5 ZXI6OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJiMzdlYWIwNjQ5ZjQ4OGI0Njk5 MTRhOWE0ODY0ZDBjOTgxMDA0OWYuLjE1NzVmMzEyODBiN2RjYzhlY2UwZDA5YjhhYTlmMTQwMTA5 NWNhNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wNy0yNCAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIFdLMl0gQSB0b3AgZml4ZWQg YmFyIGNhbiBmbGlja2VyIHdoZW4gc2Nyb2xsaW5nIHdpdGggdGhlIGtleWJvYXJkIHVwCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAxMDUKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vNTI4NzE5NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAgICAgICh3 aW5kb3cuVUlIZWxwZXIuZW5zdXJlU3RhYmxlUHJlc2VudGF0aW9uVXBkYXRlLnJldHVybi5uZXcu UHJvbWlzZSk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZW5zdXJlU3RhYmxlUHJlc2VudGF0 aW9uVXBkYXRlKToKKyAgICAgICAgKiBzY3JvbGxpbmdjb29yZGluYXRvci9pb3MvZml4ZWQtc2Ny b2xsaW5nLXdpdGgta2V5Ym9hcmQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBzY3Jv bGxpbmdjb29yZGluYXRvci9pb3MvZml4ZWQtc2Nyb2xsaW5nLXdpdGgta2V5Ym9hcmQuaHRtbDog QWRkZWQuCisKIDIwMTktMDctMjMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgTG9uZyBwcmVzcyBoaW50IG9mIEFpclBvZHMgYnV5IGJ1dHRvbnMgYXJl IHRhbGwgYW5kIG5hcnJvdyBkdXJpbmcgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBl ci5qcwppbmRleCA5ODE3NGMzYTg3ZmE2YjgzZGM4MmE0ZTc4OTAzY2M4MGU4NzI0MTgxLi4xOTQ0 NGIxN2UwYTBmOWE2YjIyYTNkZmI4NGVkMzA1MjhkMDk4MjA2IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91 aS1oZWxwZXIuanMKQEAgLTI1NCw2ICsyNTQsMjEgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3Mg VUlIZWxwZXIgewogICAgICAgICB9KTsKICAgICB9CiAKKyAgICBzdGF0aWMgZW5zdXJlU3RhYmxl UHJlc2VudGF0aW9uVXBkYXRlKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIo KSkgeworICAgICAgICAgICAgdGVzdFJ1bm5lci5kaXNwbGF5KCk7CisgICAgICAgICAgICByZXR1 cm4gUHJvbWlzZS5yZXNvbHZlKCk7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gbmV3IFBy b21pc2UocmVzb2x2ZSA9PiB7CisgICAgICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KGAK KyAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIuZG9BZnRlck5leHRTdGFibGVQcmVzZW50YXRp b25VcGRhdGUoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51 aVNjcmlwdENvbXBsZXRlKCk7CisgICAgICAgICAgICAgICAgfSk7YCwgcmVzb2x2ZSk7CisgICAg ICAgIH0pOworICAgIH0KKwogICAgIHN0YXRpYyBlbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uVXBk YXRlRm9yRWxlbWVudChlbGVtZW50KQogICAgIHsKICAgICAgICAgY29uc3QgYm91bmRpbmdSZWN0 ID0gZWxlbWVudC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3Njcm9sbGluZ2Nvb3JkaW5hdG9yL2lvcy9maXhlZC1zY3JvbGxpbmctd2l0aC1rZXlib2Fy ZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9zY3JvbGxpbmdjb29yZGluYXRvci9pb3MvZml4 ZWQtc2Nyb2xsaW5nLXdpdGgta2V5Ym9hcmQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY5ZTdk Yjc4ZTJkZjMxYjY3Mzc2NTFiNTc0ZDMxZDI2ZmRmMDFkZjUKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9zY3JvbGxpbmdjb29yZGluYXRvci9pb3MvZml4ZWQtc2Nyb2xsaW5nLXdpdGgt a2V5Ym9hcmQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjMgQEAKKworCisoc2Nyb2xsaW5nIHRy ZWUKKyAgKGZyYW1lIHNjcm9sbGluZyBub2RlCisgICAgKHNjcm9sbGFibGUgYXJlYSBzaXplIHdp ZHRoPTIyMCBoZWlnaHQ9Mzc3KQorICAgICh0b3RhbCBjb250ZW50IHNpemUgd2lkdGg9MzIwIGhl aWdodD00MDIxKQorICAgIChsYXN0IGNvbW1pdHRlZCBzY3JvbGwgcG9zaXRpb24gKDAsMCkpCisg ICAgKHNjcm9sbGFibGUgYXJlYSBwYXJhbWV0ZXJzIAorICAgICAgKGhvcml6b250YWwgc2Nyb2xs IGVsYXN0aWNpdHkgMSkKKyAgICAgICh2ZXJ0aWNhbCBzY3JvbGwgZWxhc3RpY2l0eSAxKQorICAg ICAgKGhvcml6b250YWwgc2Nyb2xsYmFyIG1vZGUgMCkKKyAgICAgICh2ZXJ0aWNhbCBzY3JvbGxi YXIgbW9kZSAwKSkKKyAgICAobGF5b3V0IHZpZXdwb3J0ICgwLDApIHdpZHRoPTMyMCBoZWlnaHQ9 NTQ4KQorICAgIChtaW4gbGF5b3V0Vmlld3BvcnQgb3JpZ2luICgwLDApKQorICAgIChtYXggbGF5 b3V0Vmlld3BvcnQgb3JpZ2luICgxMDAsMzY0NCkpCisgICAgKG92ZXJyaWRlIHZpc3VhbCB2aWV3 cG9ydCBzaXplIHdpZHRoPTIyMC4yMCBoZWlnaHQ9MzQ2LjgzKQorICAgIChiZWhhdmlvciBmb3Ig Zml4ZWQgMCkKKyAgICAodmlzdWFsIHZpZXdwb3J0IGlzIHNtYWxsZXIgdGhhbiBsYXlvdXQgdmll d3BvcnQgMSkKKyAgICAoZml4ZWQgbm9kZQorICAgICAgKGZpeGVkIGNvbnN0cmFpbnRzIAorICAg ICAgICAodmlld3BvcnQtcmVjdC1hdC1sYXN0LWxheW91dCAoMCwwKSB3aWR0aD0zMjAgaGVpZ2h0 PTU0OCkKKyAgICAgICAgKGxheWVyLXBvc2l0aW9uLWF0LWxhc3QtbGF5b3V0ICgwLDApKSkKKyAg ICAgIChsYXllciB0b3AgbGVmdCAoMCwwKSkpKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Nj cm9sbGluZ2Nvb3JkaW5hdG9yL2lvcy9maXhlZC1zY3JvbGxpbmctd2l0aC1rZXlib2FyZC5odG1s IGIvTGF5b3V0VGVzdHMvc2Nyb2xsaW5nY29vcmRpbmF0b3IvaW9zL2ZpeGVkLXNjcm9sbGluZy13 aXRoLWtleWJvYXJkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmY5ZDM2ZGZlN2EyODMxNWU3M2M0NWJkMzI4 NzlmNWQ3ZmQ3YTYxZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3Njcm9sbGluZ2Nv b3JkaW5hdG9yL2lvcy9maXhlZC1zY3JvbGxpbmctd2l0aC1rZXlib2FyZC5odG1sCkBAIC0wLDAg KzEsNTMgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZs ZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8bWV0YSBuYW1l PSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEs IHNocmluay10by1maXQ9bm8iPgorCisgICAgPHN0eWxlPgorICAgICAgICBib2R5IHsKKyAgICAg ICAgICAgIGhlaWdodDogNDAwMHB4OworICAgICAgICB9CisgICAgICAgIC5oZWFkZXIgeworICAg ICAgICAgICAgcG9zaXRpb246IGZpeGVkOworICAgICAgICAgICAgdG9wOiAwOworICAgICAgICAg ICAgbGVmdDogMDsKKyAgICAgICAgICAgIGhlaWdodDogMzBweDsKKyAgICAgICAgICAgIHdpZHRo OiAxMDAlOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjUp OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKworICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAo d2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9u ZSgpOworICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgIH0KKwor ICAgICAgICBmdW5jdGlvbiBnZXRTY3JvbGxpbmdUcmVlVUlTY3JpcHQoKQorICAgICAgICB7Cisg ICAgICAgICAgICByZXR1cm4gYChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4g dWlDb250cm9sbGVyLnNjcm9sbGluZ1RyZWVBc1RleHQ7CisgICAgICAgICAgICB9KSgpO2A7Cisg ICAgICAgIH0KKworICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5j ICgpID0+IHsKKworICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBbmRXYWl0Rm9y SW5wdXRTZXNzaW9uQXQoNSwgNSk7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnaW5wdXQnKS52YWx1ZSA9ICdoaSc7IC8vIFRyaWdnZXIgYSBsYXlvdXQgYW5kIGZsdXNoLgor ICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuZW5zdXJlU3RhYmxlUHJlc2VudGF0aW9uVXBkYXRl KCk7CisKKyAgICAgICAgICAgIHRlc3RSdW5uZXIucnVuVUlTY3JpcHQoZ2V0U2Nyb2xsaW5nVHJl ZVVJU2NyaXB0KCksIGZ1bmN0aW9uKHNjcm9sbGluZ1RyZWUpIHsKKyAgICAgICAgICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgnc2Nyb2xsaW5nLXRyZWUnKS50ZXh0Q29udGVudCA9IHNj cm9sbGluZ1RyZWU7CisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Cisg ICAgICAgICAgICB9KTsKKyAgICAgICAgfSwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0iaGVhZGVyIj4KKyAgICAgICAgPGlucHV0IGlkPSJp bnB1dCI+CisgICAgPC9kaXY+Cis8cHJlIGlkPSJzY3JvbGxpbmctdHJlZSI+PC9wcmU+Cis8L2Jv ZHk+Cis8L2h0bWw+Cg==