211259 2020-04-30 15:11:54 -0700 Clean up some EventHandler coordinate-related naming and fix ScrollableArea::lastKnownMousePosition() conversions 2020-04-30 20:49:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez esprehn+autocc ews-watchlist fred.wang glenn kangil.han kondapallykalyan mifenton pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1647580 0 simon.fraser 2020-04-30 15:11:54 -0700 Clean up some EventHandler coordinate-related naming and fix ScrollableArea::lastKnownMousePosition() conversions 1647586 1 398102 simon.fraser 2020-04-30 15:20:28 -0700 Created attachment 398102 Patch 1647751 2 ews-feeder 2020-04-30 20:48:33 -0700 Committed r260981: <https://trac.webkit.org/changeset/260981> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398102. 1647753 3 webkit-bug-importer 2020-04-30 20:49:13 -0700 <rdar://problem/62698195> 398102 2020-04-30 15:20:28 -0700 2020-04-30 20:48:34 -0700 Patch bug-211259-20200430152027.patch text/plain 25272 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhiZjdhMWZmYjNhOTIx MTQ4MGM5N2Q5NGUyMDQwNzFmMzEyZWI2MS4uZmJkM2YzMjZmMDc0MGNiNGQ4OGIyYTQ3ZjY4MjBh ZmM1YTFiYjgyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU2IEBACisyMDIwLTA0LTMwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHNv bWUgRXZlbnRIYW5kbGVyIGNvb3JkaW5hdGUtcmVsYXRlZCBuYW1pbmcgYW5kIGZpeCBTY3JvbGxh YmxlQXJlYTo6bGFzdEtub3duTW91c2VQb3NpdGlvbigpIGNvbnZlcnNpb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEyNTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiBFdmVudEhhbmRsZXIsIHJl bmFtZSBtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24sIG1fbW91c2VEb3duUG9zIGFuZCBtX21vdXNl RG93biBmb3IgY2xhcml0eS4KKworICAgICAgICBSZW5hbWUgU2Nyb2xsYWJsZUFyZWE6Omxhc3RL bm93bk1vdXNlUG9zaXRpb24oKSB0byBiZSBsYXN0S25vd25Nb3VzZVBvc2l0aW9uSW5WaWV3KCku CisgICAgICAgIFByZXZpb3VzbHksIGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSB3b3VsZCBmZXRj aCBpdCBmcm9tIEV2ZW50SGFuZGxlciwgd2hpY2ggc2ltcGx5IHN0YXNoZWQKKyAgICAgICAgZXZl bnQucG9zaXRpb24oKSAod2hpY2ggaXMgaW4gYSBjb29yZGluYXRlIHN5c3RlbSB0aGF0IGRpZmZl cnMgYmV0d2VlbiBXSzEgYW5kIFdrMikgd2hpY2gKKyAgICAgICAgd2FzIG5vdCByZWxhdGl2ZSB0 byB0aGUgRXZlbnRIYW5kbGVyJ3MgZnJhbWUuIFRoaXMgY2F1c2UgbW91c2VMb2NhdGlvbkluU2Ny b2xsZXJGb3JTY3JvbGxlckltcDoKKyAgICAgICAgdG8gZ2l2ZSB3cm9uZyBhbnN3ZXJzLgorCisg ICAgICAgIEluc3RlYWQsIGxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKSBub3cgc3BlY2lm aWNhbGx5IHJldHVybnMgY29vcmRpbmF0ZXMgcmVsYXRpdmUgdG8gdGhlIEZyYW1lLgorICAgICAg ICBUaGlzIGJlaGF2aW9yIGNoYW5nZSB3aWxsIGJlIHRlc3RlZCBpbiBmdXR1cmUgb3ZlcmxheSBz Y3JvbGxiYXIgdGVzdHMuCisKKyAgICAgICAgRG9jdW1lbnQ6OnNob3dQbGF5YmFja1RhcmdldFBp Y2tlcigpIHdhcyB1c2luZyBGcmFtZVZpZXc6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSwgc28g dG8gYXZvaWQKKyAgICAgICAgY2hhbmdpbmcgaXRzIChwcm9iYWJseSBicm9rZW4pIGJlaGF2aW9y LCBoYXZlIGl0IGNhbGwgZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCkubGFzdEtub3duTW91c2VQb3Np dGlvbigpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIpOgorICAgICAgICAqIHBhZ2UvRXZl bnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6Y2xlYXIpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZURyYWdnZWRFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnVwZGF0ZURyYWdTb3VyY2VBY3Rpb25z QWxsb3dlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRpc3BhdGNo RHJhZ1N0YXJ0RXZlbnRPblNvdXJjZUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI YW5kbGVyOjpoYW5kbGVEcmFnKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6bW91 c2VNb3ZlbWVudEV4Y2VlZHNUaHJlc2hvbGQgY29uc3QpOgorICAgICAgICAqIHBhZ2UvRXZlbnRI YW5kbGVyLmg6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uSW5WaWV3IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGFzdEtub3duTW91c2VQb3NpdGlvbiBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9Q bGF0Zm9ybU1vdXNlRXZlbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5o OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Omxhc3RLbm93bk1vdXNlUG9zaXRp b25JblZpZXcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Omxhc3RL bm93bk1vdXNlUG9zaXRpb24gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL21h Yy9TY3JvbGxBbmltYXRvck1hYy5tbToKKyAgICAgICAgKC1bV2ViU2Nyb2xsZXJJbXBQYWlyRGVs ZWdhdGUgbW91c2VMb2NhdGlvbkluQ29udGVudEFyZWFGb3JTY3JvbGxlckltcFBhaXI6XSk6Cisg ICAgICAgICgtW1dlYlNjcm9sbGVySW1wUGFpckRlbGVnYXRlIHNjcm9sbGVySW1wUGFpcjpjb252 ZXJ0Q29udGVudFBvaW50OnRvU2Nyb2xsZXJJbXA6XSk6CisgICAgICAgICgtW1dlYlNjcm9sbGVy SW1wRGVsZWdhdGUgbW91c2VMb2NhdGlvbkluU2Nyb2xsZXJGb3JTY3JvbGxlckltcDpdKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6Omxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24gY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6 Omxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGlzdEJveDo6bGFzdEtub3duTW91c2VQb3NpdGlvbiBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoKKwogMjAyMC0wNC0zMCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBib3JkZXItcmFkaXVz IGZhaWxzIHRvIGNsaXAgaWZyYW1lIGNvbnRlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQxNWUyYmExOTllZThk ZjJlYmY3MTJhOGU2YmE1NzIwNzRmZmI4OWIuLjI5YjRmYjg5MTA1NWQ4YWQxNzg4NjdjMGIzNmIz MDUzMzM0NTc2NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDQtMzAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgc29t ZSBFdmVudEhhbmRsZXIgY29vcmRpbmF0ZS1yZWxhdGVkIG5hbWluZyBhbmQgZml4IFNjcm9sbGFi bGVBcmVhOjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29udmVyc2lvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTI1OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYkV2ZW50Lmg6 CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OnBvc2l0aW9uIGNvbnN0KToKKyAgICAg ICAgKiBTaGFyZWQvV2ViTW91c2VFdmVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNl RXZlbnQ6OldlYk1vdXNlRXZlbnQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYv UERGUGx1Z2luLmg6CisKIDIwMjAtMDQtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEs0XVtYMTFdIEFkZCBzdXBwb3J0IGZvciByZW5k ZXJpbmcgd2ViIHZpZXcgY29udGVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGM2ZDk1 OGIyNWQxYmY1MzZjMjc0YjdlNTJmOWM1M2I1YWYyYjVmMGMuLjU5ZTMwZTBkZTQ2MTQzNzkwYTFm ZDEzMGJkMWFlN2M0MjExOGUzNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNzM1Miwx MSArNzM1MiwxNiBAQCB2b2lkIERvY3VtZW50OjpzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoTWVk aWFQbGF5YmFja1RhcmdldENsaWVudCYgY2xpZW50LCBib29sCiAgICAgaWYgKCFwYWdlKQogICAg ICAgICByZXR1cm47CiAKKyAgICBpZiAoIWZyYW1lKCkpCisgICAgICAgIHJldHVybjsKKwogICAg IGF1dG8gaXQgPSBtX2NsaWVudFRvSURNYXAuZmluZCgmY2xpZW50KTsKICAgICBpZiAoaXQgPT0g bV9jbGllbnRUb0lETWFwLmVuZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBwYWdlLT5zaG93 UGxheWJhY2tUYXJnZXRQaWNrZXIoaXQtPnZhbHVlLCB2aWV3KCktPmxhc3RLbm93bk1vdXNlUG9z aXRpb24oKSwgaXNWaWRlbywgcm91dGVTaGFyaW5nUG9saWN5LCByb3V0aW5nQ29udGV4dFVJRCk7 CisgICAgLy8gRklYTUU6IFRoaXMgaXMgcHJvYmFibHkgd3JvbmcgZm9yIHN1YmZyYW1lcy4KKyAg ICBhdXRvIHBvc2l0aW9uID0gZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCkubGFzdEtub3duTW91c2VQ b3NpdGlvbigpOworICAgIHBhZ2UtPnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihpdC0+dmFsdWUs IHBvc2l0aW9uLCBpc1ZpZGVvLCByb3V0ZVNoYXJpbmdQb2xpY3ksIHJvdXRpbmdDb250ZXh0VUlE KTsKIH0KIAogdm9pZCBEb2N1bWVudDo6cGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRTdGF0ZURp ZENoYW5nZShNZWRpYVBsYXliYWNrVGFyZ2V0Q2xpZW50JiBjbGllbnQsIE1lZGlhUHJvZHVjZXI6 Ok1lZGlhU3RhdGVGbGFncyBzdGF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApp bmRleCA4OWI2YjZkN2UxZjRjMWE5MWVlNmUyNTIxNTUwMDdkZmUwOWEwMDk4Li45YTg0Mzk3MTEz MmQ1MzZhYjRiNTEzNmZlOWM5N2NiY2EyMDU3OTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwCkBAIC00NDYsOCArNDQ2LDggQEAgdm9pZCBFdmVudEhhbmRsZXI6OmNsZWFyKCkK ICAgICBtX3Nob3VsZE9ubHlGaXJlRHJhZ092ZXJFdmVudCA9IGZhbHNlOwogI2VuZGlmCiAgICAg bV9tb3VzZVBvc2l0aW9uSXNVbmtub3duID0gdHJ1ZTsKLSAgICBtX2xhc3RLbm93bk1vdXNlUG9z aXRpb24gPSBJbnRQb2ludCgpOwotICAgIG1fbGFzdEtub3duTW91c2VHbG9iYWxQb3NpdGlvbiA9 IEludFBvaW50KCk7CisgICAgbV9sYXN0S25vd25Nb3VzZVBvc2l0aW9uID0geyB9OworICAgIG1f bGFzdEtub3duTW91c2VHbG9iYWxQb3NpdGlvbiA9IHsgfTsKICAgICBtX21vdXNlUHJlc3NOb2Rl ID0gbnVsbHB0cjsKICAgICBtX21vdXNlUHJlc3NlZCA9IGZhbHNlOwogICAgIG1fY2FwdHVyZXNE cmFnZ2luZyA9IGZhbHNlOwpAQCAtNzg4LDcgKzc4OCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpo YW5kbGVNb3VzZVByZXNzRXZlbnQoY29uc3QgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyYg ZXZlCiAKICAgICBtX21vdXNlRG93bldhc1NpbmdsZUNsaWNrSW5TZWxlY3Rpb24gPSBmYWxzZTsK IAotICAgIG1fbW91c2VEb3duID0gZXZlbnQuZXZlbnQoKTsKKyAgICBtX21vdXNlRG93bkV2ZW50 ID0gZXZlbnQuZXZlbnQoKTsKIAogICAgIGlmIChtX2ltbWVkaWF0ZUFjdGlvblN0YWdlICE9IElt bWVkaWF0ZUFjdGlvblN0YWdlOjpQZXJmb3JtZWRIaXRUZXN0KQogICAgICAgICBtX2ltbWVkaWF0 ZUFjdGlvblN0YWdlID0gSW1tZWRpYXRlQWN0aW9uU3RhZ2U6Ok5vbmU7CkBAIC05MDYsNyArOTA2 LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlRHJhZ2dlZEV2ZW50KGNvbnN0IE1v dXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGUKICAgICB9CiAKICAgICBpZiAobV9zZWxlY3Rp b25Jbml0aWF0aW9uU3RhdGUgIT0gRXh0ZW5kZWRTZWxlY3Rpb24pIHsKLSAgICAgICAgSGl0VGVz dFJlc3VsdCByZXN1bHQobV9tb3VzZURvd25Qb3MpOworICAgICAgICBIaXRUZXN0UmVzdWx0IHJl c3VsdChtX21vdXNlRG93bkNvbnRlbnRzUG9zaXRpb24pOwogICAgICAgICBtX2ZyYW1lLmRvY3Vt ZW50KCktPmhpdFRlc3QoSGl0VGVzdFJlcXVlc3QoKSwgcmVzdWx0KTsKIAogICAgICAgICB1cGRh dGVTZWxlY3Rpb25Gb3JNb3VzZURyYWcocmVzdWx0KTsKQEAgLTExNzUsNyArMTE3NSw3IEBAIERy YWdTb3VyY2VBY3Rpb24gRXZlbnRIYW5kbGVyOjp1cGRhdGVEcmFnU291cmNlQWN0aW9uc0FsbG93 ZWQoKSBjb25zdAogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIERyYWdTb3VyY2VBY3Rp b25Ob25lOwogCi0gICAgcmV0dXJuIHBhZ2UtPmRyYWdDb250cm9sbGVyKCkuZGVsZWdhdGVEcmFn U291cmNlQWN0aW9uKHZpZXctPmNvbnRlbnRzVG9Sb290VmlldyhtX21vdXNlRG93blBvcykpOwor ICAgIHJldHVybiBwYWdlLT5kcmFnQ29udHJvbGxlcigpLmRlbGVnYXRlRHJhZ1NvdXJjZUFjdGlv bih2aWV3LT5jb250ZW50c1RvUm9vdFZpZXcobV9tb3VzZURvd25Db250ZW50c1Bvc2l0aW9uKSk7 CiB9CiAjZW5kaWYgLy8gRU5BQkxFKERSQUdfU1VQUE9SVCkKIApAQCAtMTcyNSw3ICsxNzI1LDcg QEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVudChjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmIHBsYXRmb3JtTW91c2UKICAgICBtX21vdXNlRG93bk1heVN0YXJ0U2VsZWN0 ID0gZmFsc2U7CiAgICAgbV9tb3VzZURvd25NYXlTdGFydEF1dG9zY3JvbGwgPSBmYWxzZTsKICAg ICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFtZS52aWV3KCkpCi0gICAgICAgIG1fbW91c2VE b3duUG9zID0gdmlldy0+d2luZG93VG9Db250ZW50cyhwbGF0Zm9ybU1vdXNlRXZlbnQucG9zaXRp b24oKSk7CisgICAgICAgIG1fbW91c2VEb3duQ29udGVudHNQb3NpdGlvbiA9IHZpZXctPndpbmRv d1RvQ29udGVudHMocGxhdGZvcm1Nb3VzZUV2ZW50LnBvc2l0aW9uKCkpOwogICAgIGVsc2Ugewog ICAgICAgICBpbnZhbGlkYXRlQ2xpY2soKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzY5 NSw3ICszNjk1LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRpc3BhdGNoRXZlbnRUb0RyYWdTb3Vy Y2VFbGVtZW50KGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwKIAogYm9vbCBFdmVudEhhbmRs ZXI6OmRpc3BhdGNoRHJhZ1N0YXJ0RXZlbnRPblNvdXJjZUVsZW1lbnQoRGF0YVRyYW5zZmVyJiBk YXRhVHJhbnNmZXIpCiB7Ci0gICAgcmV0dXJuICFkaXNwYXRjaERyYWdFdmVudChldmVudE5hbWVz KCkuZHJhZ3N0YXJ0RXZlbnQsICpkcmFnU3RhdGUoKS5zb3VyY2UsIG1fbW91c2VEb3duLCBkYXRh VHJhbnNmZXIpICYmICFtX2ZyYW1lLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLmlzSW5QYXNzd29y ZEZpZWxkKCk7CisgICAgcmV0dXJuICFkaXNwYXRjaERyYWdFdmVudChldmVudE5hbWVzKCkuZHJh Z3N0YXJ0RXZlbnQsICpkcmFnU3RhdGUoKS5zb3VyY2UsIG1fbW91c2VEb3duRXZlbnQsIGRhdGFU cmFuc2ZlcikgJiYgIW1fZnJhbWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkuaXNJblBhc3N3b3Jk RmllbGQoKTsKIH0KICAgICAKIHN0YXRpYyBib29sIEV4YWN0bHlPbmVCaXRTZXQoRHJhZ1NvdXJj ZUFjdGlvbiBuKQpAQCAtMzcyOSwxMCArMzcyOSwxMCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFu ZGxlRHJhZyhjb25zdCBNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzJiBldmVudCwgQ2hlY2tE cgogICAgICAgICBkcmFnU3RhdGUoKS5zaG91bGREaXNwYXRjaEV2ZW50cyA9ICh1cGRhdGVEcmFn U291cmNlQWN0aW9uc0FsbG93ZWQoKSAmIERyYWdTb3VyY2VBY3Rpb25ESFRNTCk7CiAKICAgICAg ICAgLy8gVHJ5IHRvIGZpbmQgYW4gZWxlbWVudCB0aGF0IHdhbnRzIHRvIGJlIGRyYWdnZWQuCi0g ICAgICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0KG1fbW91c2VEb3duUG9zKTsKKyAgICAgICAgSGl0 VGVzdFJlc3VsdCByZXN1bHQobV9tb3VzZURvd25Db250ZW50c1Bvc2l0aW9uKTsKICAgICAgICAg bV9mcmFtZS5kb2N1bWVudCgpLT5oaXRUZXN0KE9wdGlvblNldDxIaXRUZXN0UmVxdWVzdDo6UmVx dWVzdFR5cGU+IHsgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5LCBIaXRUZXN0UmVxdWVzdDo6RGlz YWxsb3dVc2VyQWdlbnRTaGFkb3dDb250ZW50IH0sIHJlc3VsdCk7CiAgICAgICAgIGlmIChtX2Zy YW1lLnBhZ2UoKSkKLSAgICAgICAgICAgIGRyYWdTdGF0ZSgpLnNvdXJjZSA9IG1fZnJhbWUucGFn ZSgpLT5kcmFnQ29udHJvbGxlcigpLmRyYWdnYWJsZUVsZW1lbnQoJm1fZnJhbWUsIHJlc3VsdC50 YXJnZXRFbGVtZW50KCksIG1fbW91c2VEb3duUG9zLCBkcmFnU3RhdGUoKSk7CisgICAgICAgICAg ICBkcmFnU3RhdGUoKS5zb3VyY2UgPSBtX2ZyYW1lLnBhZ2UoKS0+ZHJhZ0NvbnRyb2xsZXIoKS5k cmFnZ2FibGVFbGVtZW50KCZtX2ZyYW1lLCByZXN1bHQudGFyZ2V0RWxlbWVudCgpLCBtX21vdXNl RG93bkNvbnRlbnRzUG9zaXRpb24sIGRyYWdTdGF0ZSgpKTsKICAgICAgICAgCiAgICAgICAgIGlm ICghZHJhZ1N0YXRlKCkuc291cmNlKQogICAgICAgICAgICAgbV9tb3VzZURvd25NYXlTdGFydERy YWcgPSBmYWxzZTsgLy8gbm8gZWxlbWVudCBpcyBkcmFnZ2FibGUKQEAgLTM4MDcsNyArMzgwNyw3 IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVEcmFnKGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0 VGVzdFJlc3VsdHMmIGV2ZW50LCBDaGVja0RyCiAgICAgICAgICAgICBkcmFnU3RhdGUoKS5zb3Vy Y2UtPmRvY3VtZW50KCkudXBkYXRlU3R5bGVJZk5lZWRlZCgpOwogICAgICAgICAgICAgaWYgKGF1 dG8qIHJlbmRlcmVyID0gZHJhZ1N0YXRlKCkuc291cmNlLT5yZW5kZXJlcigpKSB7CiAgICAgICAg ICAgICAgICAgYXV0byBhYnNvbHV0ZVBvc2l0aW9uID0gcmVuZGVyZXItPmxvY2FsVG9BYnNvbHV0 ZSgpOwotICAgICAgICAgICAgICAgIGF1dG8gZGVsdGEgPSBtX21vdXNlRG93blBvcyAtIHJvdW5k ZWRJbnRQb2ludChhYnNvbHV0ZVBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBhdXRvIGRlbHRh ID0gbV9tb3VzZURvd25Db250ZW50c1Bvc2l0aW9uIC0gcm91bmRlZEludFBvaW50KGFic29sdXRl UG9zaXRpb24pOwogICAgICAgICAgICAgICAgIGRyYWdTdGF0ZSgpLmRhdGFUcmFuc2Zlci0+c2V0 RHJhZ0ltYWdlKGRyYWdTdGF0ZSgpLnNvdXJjZS5nZXQoKSwgZGVsdGEud2lkdGgoKSwgZGVsdGEu aGVpZ2h0KCkpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBkaXNwYXRj aEV2ZW50VG9EcmFnU291cmNlRWxlbWVudChldmVudE5hbWVzKCkuZHJhZ2VuZEV2ZW50LCBldmVu dC5ldmVudCgpKTsKQEAgLTM4MzMsNyArMzgzMyw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5k bGVEcmFnKGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGV2ZW50LCBDaGVja0Ry CiAgICAgCiAgICAgaWYgKG1fbW91c2VEb3duTWF5U3RhcnREcmFnKSB7CiAgICAgICAgIFBhZ2Uq IHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKLSAgICAgICAgbV9kaWRTdGFydERyYWcgPSBwYWdlICYm IHBhZ2UtPmRyYWdDb250cm9sbGVyKCkuc3RhcnREcmFnKG1fZnJhbWUsIGRyYWdTdGF0ZSgpLCBz cmNPcCwgZXZlbnQuZXZlbnQoKSwgbV9tb3VzZURvd25Qb3MsIGhhc05vbkRlZmF1bHRQYXN0ZWJv YXJkRGF0YSk7CisgICAgICAgIG1fZGlkU3RhcnREcmFnID0gcGFnZSAmJiBwYWdlLT5kcmFnQ29u dHJvbGxlcigpLnN0YXJ0RHJhZyhtX2ZyYW1lLCBkcmFnU3RhdGUoKSwgc3JjT3AsIGV2ZW50LmV2 ZW50KCksIG1fbW91c2VEb3duQ29udGVudHNQb3NpdGlvbiwgaGFzTm9uRGVmYXVsdFBhc3RlYm9h cmREYXRhKTsKICAgICAgICAgLy8gSW4gV2ViS2l0MiB3ZSBjb3VsZCByZS1lbnRlciB0aGlzIGNv ZGUgYW5kIHN0YXJ0IGFub3RoZXIgZHJhZy4KICAgICAgICAgLy8gT24gT1MgWCB0aGlzIGNhdXNl cyBwcm9ibGVtcyB3aXRoIHRoZSBvd25lcnNoaXAgb2YgdGhlIHBhc3RlYm9hcmQgYW5kIHRoZSBw cm9taXNlZCB0eXBlcy4KICAgICAgICAgaWYgKG1fZGlkU3RhcnREcmFnKSB7CkBAIC0zODY0LDcg KzM4NjQsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6bW91c2VNb3ZlbWVudEV4Y2VlZHNUaHJlc2hv bGQoY29uc3QgRmxvYXRQb2ludCYgdmlld3BvcnRMb2NhdAogICAgIGlmICghdmlldykKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIEludFBvaW50IGxvY2F0aW9uID0gdmlldy0+d2luZG93VG9D b250ZW50cyhmbG9vcmVkSW50UG9pbnQodmlld3BvcnRMb2NhdGlvbikpOwotICAgIEludFNpemUg ZGVsdGEgPSBsb2NhdGlvbiAtIG1fbW91c2VEb3duUG9zOworICAgIEludFNpemUgZGVsdGEgPSBs b2NhdGlvbiAtIG1fbW91c2VEb3duQ29udGVudHNQb3NpdGlvbjsKICAgICAKICAgICByZXR1cm4g YWJzKGRlbHRhLndpZHRoKCkpID49IHBvaW50c1RocmVzaG9sZCB8fCBhYnMoZGVsdGEuaGVpZ2h0 KCkpID49IHBvaW50c1RocmVzaG9sZDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCmlu ZGV4IGFkYjE1ZGJiNGM1M2Y4ZDFjNDk1N2E2NDZlZmYzMGZlOGM5Y2M2NTkuLmJiMDE0YzZhODNh OGU0MDFjNGQwOWE0NmFiN2E0ZDJhMWE5ZGU3NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuaApAQCAtMTc5LDYgKzE3OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVzaXplTGF5ZXJE ZXN0cm95ZWQoKTsKIAorICAgIC8vIEZJWE1FOiBFYWNoIEZyYW1lIGhhcyBhbiBFdmVudEhhbmRs ZXIsIGFuZCBub3QgZXZlcnkgZXZlbnQgZ29lcyB0byBhbGwgZnJhbWVzLCBzbyB0aGlzIHBvc2l0 aW9uIGNhbiBiZSBzdGFsZS4gSXQgc2hvdWxkIHByb2JhYmx5IGJlIHN0b3JlZCBvbiBQYWdlLgog ICAgIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdDsKICAgICBJbnRQb2lu dCBsYXN0S25vd25Nb3VzZUdsb2JhbFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0S25v d25Nb3VzZUdsb2JhbFBvc2l0aW9uOyB9CiAgICAgQ3Vyc29yIGN1cnJlbnRNb3VzZUN1cnNvcigp IGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudE1vdXNlQ3Vyc29yOyB9CkBAIC01ODcsMTEgKzU4OCwx MSBAQCBwcml2YXRlOgogICAgIExheW91dFNpemUgbV9vZmZzZXRGcm9tUmVzaXplQ29ybmVyOyAv LyBJbiB0aGUgY29vcmRzIG9mIG1fcmVzaXplTGF5ZXIuCiAgICAgCiAgICAgYm9vbCBtX21vdXNl UG9zaXRpb25Jc1Vua25vd24geyB0cnVlIH07Ci0gICAgSW50UG9pbnQgbV9sYXN0S25vd25Nb3Vz ZVBvc2l0aW9uOworICAgIEludFBvaW50IG1fbGFzdEtub3duTW91c2VQb3NpdGlvbjsgLy8gU2Ft ZSBjb29yZGluYXRlcyBhcyBQbGF0Zm9ybU1vdXNlRXZlbnQ6OnBvc2l0aW9uKCkuCiAgICAgSW50 UG9pbnQgbV9sYXN0S25vd25Nb3VzZUdsb2JhbFBvc2l0aW9uOwotICAgIEludFBvaW50IG1fbW91 c2VEb3duUG9zOyAvLyBJbiBvdXIgdmlldydzIGNvb3Jkcy4KKyAgICBJbnRQb2ludCBtX21vdXNl RG93bkNvbnRlbnRzUG9zaXRpb247CiAgICAgV2FsbFRpbWUgbV9tb3VzZURvd25UaW1lc3RhbXA7 Ci0gICAgUGxhdGZvcm1Nb3VzZUV2ZW50IG1fbW91c2VEb3duOworICAgIFBsYXRmb3JtTW91c2VF dmVudCBtX21vdXNlRG93bkV2ZW50OwogICAgIFBsYXRmb3JtTW91c2VFdmVudCBtX2xhc3RQbGF0 Zm9ybU1vdXNlRXZlbnQ7CiAKICNpZiBQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAppbmRleCBiM2ZlMTQwZmEzN2E3NGU4ZGJjZjEyMWIyNmViOWFlZWY2OTY1NmMyLi41 MWVlNWJmNjhjYjFmZWQyMzA5NDAwMGExZjlmZGQwZDA2Y2QzNzQ3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCkBAIC0yMDEyLDkgKzIwMTIsOSBAQCBib29sIEZyYW1lVmlldzo6Zml4ZWRF bGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuIGZyYW1lKCku c2V0dGluZ3MoKS5maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCk7CiB9CiAKLUlu dFBvaW50IEZyYW1lVmlldzo6bGFzdEtub3duTW91c2VQb3NpdGlvbigpIGNvbnN0CitJbnRQb2lu dCBGcmFtZVZpZXc6Omxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKSBjb25zdAogewotICAg IHJldHVybiBmcmFtZSgpLmV2ZW50SGFuZGxlcigpLmxhc3RLbm93bk1vdXNlUG9zaXRpb24oKTsK KyAgICByZXR1cm4gY29udmVydEZyb21Db250YWluaW5nV2luZG93KGZyYW1lKCkuZXZlbnRIYW5k bGVyKCkubGFzdEtub3duTW91c2VQb3NpdGlvbigpKTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6Omlz SGFuZGxpbmdXaGVlbEV2ZW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDIx YzJlZmM2YmFmZTI0ZmE5MmY1NjFlYWYzNjQyYThhN2I3NmU2ZDIuLjI4MjdmMTIzMGE1MzkzOTEz Y2RjYWU0ZGJjN2RhNTU0OWJjN2Y4ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtNTIw LDcgKzUyMCw3IEBAIHB1YmxpYzoKICAgICBlbnVtIFNjcm9sbGJhck1vZGVzQ2FsY3VsYXRpb25T dHJhdGVneSB7IFJ1bGVzRnJvbVdlYkNvbnRlbnRPbmx5LCBBbnlSdWxlIH07CiAgICAgdm9pZCBj YWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dChTY3JvbGxiYXJNb2RlJiBoTW9kZSwgU2Ny b2xsYmFyTW9kZSYgdk1vZGUsIFNjcm9sbGJhck1vZGVzQ2FsY3VsYXRpb25TdHJhdGVneSA9IEFu eVJ1bGUpOwogCi0gICAgSW50UG9pbnQgbGFzdEtub3duTW91c2VQb3NpdGlvbigpIGNvbnN0IGZp bmFsOworICAgIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKSBjb25zdCBm aW5hbDsKICAgICBib29sIGlzSGFuZGxpbmdXaGVlbEV2ZW50KCkgY29uc3QgZmluYWw7CiAgICAg Ym9vbCBzaG91bGRTZXRDdXJzb3IoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAppbmRleCA4NWI1M2YwZmRhN2JiZDIwNTFjNzRiN2RkNDQ1 MzM3MzYxY2Y0MGFhLi5mZGYyNjhjYWM2MTRlYjgzMTY5YmFhMDY3ZGMzMjI0ZmM0YzNjMTdmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaApAQCAtNjEs NiArNjEsOCBAQCBjb25zdCBkb3VibGUgRm9yY2VBdEZvcmNlQ2xpY2sgPSAyOwogICAgICAgICB7 CiAgICAgICAgIH0KIAorICAgICAgICAvLyBUaGlzIHBvc2l0aW9uIGlzIHJlbGF0aXZlIHRvIHRo ZSBlbmNsb3NpbmcgTlNXaW5kb3cgaW4gV2ViS2l0MSwgYW5kIGlzIFdLV2ViVmlldy1yZWxhdGl2 ZSBpbiBXZWJLaXQyLgorICAgICAgICAvLyBVc2UgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50 cygpIHRvIGNvbnZlcnQgaXQgdG8gaW50byB0aGUgY29udGVudHMgb2YgYSBnaXZlbiB2aWV3Lgog ICAgICAgICBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0 aW9uOyB9CiAgICAgICAgIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbigpIGNvbnN0IHsg cmV0dXJuIG1fZ2xvYmFsUG9zaXRpb247IH0KICNpZiBFTkFCTEUoUE9JTlRFUl9MT0NLKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXggNDVmYWMwMjliZDM2YmU4 Yjg3YjkzMzM1NzkzZDM4MjY1OTA1YzE4Yy4uZjAwNGQzYmI3NWIyY2M3OGNkZGFlYWU4Y2U3NmY2 ZWM2ODQ1ZTA2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJs ZUFyZWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBA IC0yNzcsNyArMjc3LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBJbnRTaXplIGNvbnRlbnRz U2l6ZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEludFNpemUgb3ZlcmhhbmdBbW91bnQoKSBj b25zdCB7IHJldHVybiBJbnRTaXplKCk7IH0KLSAgICB2aXJ0dWFsIEludFBvaW50IGxhc3RLbm93 bk1vdXNlUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBJbnRQb2ludCgpOyB9CisgICAgdmlydHVh bCBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uSW5WaWV3KCkgY29uc3QgeyByZXR1cm4g SW50UG9pbnQoKTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0hhbmRsaW5nV2hlZWxFdmVudCgpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0dWFsIGludCBoZWFkZXJIZWlnaHQoKSBj b25zdCB7IHJldHVybiAwOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0KaW5kZXggYTI3N2VmY2UzMjY1ZDdiOTdiNDdmOGI5MGRiNTA2NzFh NjJmYmU4OC4uMjkxOTZkMjY0MmZiYWEzNWRjOTdlZTE4ZGVlZGQ0MGVlZjQxNDQ1ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAt MjI0LDcgKzIyNCw5IEBAIC0gKE5TUG9pbnQpbW91c2VMb2NhdGlvbkluQ29udGVudEFyZWFGb3JT Y3JvbGxlckltcFBhaXI6KE5TU2Nyb2xsZXJJbXBQYWlyICopc2NyCiAgICAgaWYgKCFfc2Nyb2xs YWJsZUFyZWEpCiAgICAgICAgIHJldHVybiBOU1plcm9Qb2ludDsKIAotICAgIHJldHVybiBfc2Ny b2xsYWJsZUFyZWEtPmxhc3RLbm93bk1vdXNlUG9zaXRpb24oKTsKKyAgICAvLyBJdCdzIE9LIHRo YXQgdGhpcyBwb3NpdGlvbiBpc24ndCByZWxhdGl2ZSB0byB0aGlzIHNjcm9sbGVyICh3aGljaCBt aWdodCBiZSBhbiBvdmVyZmxvdyBzY3JvbGxlcikuCisgICAgLy8gQXBwS2l0IGp1c3QgdGFrZXMg dGhlIHJlc3VsdCBhbmQgcGFzc2VzIGl0IGJhY2sgdG8gLXNjcm9sbGVySW1wUGFpcjpjb252ZXJ0 Q29udGVudFBvaW50OnRvU2Nyb2xsZXJJbXA6LgorICAgIHJldHVybiBfc2Nyb2xsYWJsZUFyZWEt Pmxhc3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKTsKIH0KIAogLSAoTlNQb2ludClzY3JvbGxl ckltcFBhaXI6KE5TU2Nyb2xsZXJJbXBQYWlyICopc2Nyb2xsZXJJbXBQYWlyIGNvbnZlcnRDb250 ZW50UG9pbnQ6KE5TUG9pbnQpcG9pbnRJbkNvbnRlbnRBcmVhIHRvU2Nyb2xsZXJJbXA6KE5TU2Ny b2xsZXJJbXAgKilzY3JvbGxlckltcApAQCAtMjUwLDcgKzI1Miw3IEBAIC0gKE5TUG9pbnQpc2Ny b2xsZXJJbXBQYWlyOihOU1Njcm9sbGVySW1wUGFpciAqKXNjcm9sbGVySW1wUGFpciBjb252ZXJ0 Q29udGVudFBvCiAKICAgICBBU1NFUlQoc2Nyb2xsZXJJbXAgPT0gc2Nyb2xsZXJJbXBGb3JTY3Jv bGxiYXIoKnNjcm9sbGJhcikpOwogCi0gICAgcmV0dXJuIHNjcm9sbGJhci0+Y29udmVydEZyb21D b250YWluaW5nVmlldyhXZWJDb3JlOjpJbnRQb2ludChwb2ludEluQ29udGVudEFyZWEpKTsKKyAg ICByZXR1cm4gc2Nyb2xsYmFyLT5jb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KFdlYkNvcmU6OnJv dW5kZWRJbnRQb2ludChwb2ludEluQ29udGVudEFyZWEpKTsKIH0KIAogLSAodm9pZClzY3JvbGxl ckltcFBhaXI6KE5TU2Nyb2xsZXJJbXBQYWlyICopc2Nyb2xsZXJJbXBQYWlyIHNldENvbnRlbnRB cmVhTmVlZHNEaXNwbGF5SW5SZWN0OihOU1JlY3QpcmVjdApAQCAtNTEzLDcgKzUxNSw4IEBAIC0g KE5TUG9pbnQpbW91c2VMb2NhdGlvbkluU2Nyb2xsZXJGb3JTY3JvbGxlckltcDooTlNTY3JvbGxl ckltcCAqKXNjcm9sbGVySW1wCiAKICAgICBBU1NFUlRfVU5VU0VEKHNjcm9sbGVySW1wLCBzY3Jv bGxlckltcCA9PSBzY3JvbGxlckltcEZvclNjcm9sbGJhcigqX3Njcm9sbGJhcikpOwogCi0gICAg cmV0dXJuIF9zY3JvbGxiYXItPmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcoX3Njcm9sbGJhci0+ c2Nyb2xsYWJsZUFyZWEoKS5sYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkpOworICAgIGF1dG8gcG9z aXRpb25JblZpZXcgPSBfc2Nyb2xsYmFyLT5zY3JvbGxhYmxlQXJlYSgpLmxhc3RLbm93bk1vdXNl UG9zaXRpb25JblZpZXcoKTsKKyAgICByZXR1cm4gX3Njcm9sbGJhci0+Y29udmVydEZyb21Db250 YWluaW5nVmlldyhwb3NpdGlvbkluVmlldyk7CiB9CiAKIC0gKE5TUmVjdCljb252ZXJ0UmVjdFRv TGF5ZXI6KE5TUmVjdClyZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cAppbmRleCAyN2FjODI0YjQwYTFiNWJjOGM2YmI3NTlmNGIzM2Q3MzViODQ3MjNlLi5jYjkyZGYz MDFjZjlhYzA4NTYzY2E4NzNiNmY0MDViYjM3OTM1MDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTMyODMsOSArMzI4Myw5IEBAIHZvaWQgUmVuZGVyTGF5 ZXI6OmRpZFVwZGF0ZVNjcm9sbCgpCiB9CiAjZW5kaWYKIAotSW50UG9pbnQgUmVuZGVyTGF5ZXI6 Omxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdAorSW50UG9pbnQgUmVuZGVyTGF5ZXI6Omxh c3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKSBjb25zdAogewotICAgIHJldHVybiByZW5kZXJl cigpLmZyYW1lKCkuZXZlbnRIYW5kbGVyKCkubGFzdEtub3duTW91c2VQb3NpdGlvbigpOworICAg IHJldHVybiByZW5kZXJlcigpLnZpZXcoKS5mcmFtZVZpZXcoKS5sYXN0S25vd25Nb3VzZVBvc2l0 aW9uSW5WaWV3KCk7CiB9CiAKIGJvb2wgUmVuZGVyTGF5ZXI6OmlzSGFuZGxpbmdXaGVlbEV2ZW50 KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggNmRlMWZl ZjQ2MzkzODljYjUzN2VkMDQyMmZlMzk1ODYxODMyZGNhMC4uYTQyODAzM2U4ZDhlYWQxYmI1OWNk Njg0ZmY2ODUxNmI4N2I0YWVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmgKQEAgLTExMjUsNyArMTEyNSw3IEBAIHByaXZhdGU6CiAKICAgICBJbnRSZWN0IHZpc2libGVD b250ZW50UmVjdEludGVybmFsKFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycywg VmlzaWJsZUNvbnRlbnRSZWN0QmVoYXZpb3IpIGNvbnN0IGZpbmFsOwogICAgIEludFNpemUgb3Zl cmhhbmdBbW91bnQoKSBjb25zdCBmaW5hbDsKLSAgICBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBv c2l0aW9uKCkgY29uc3QgZmluYWw7CisgICAgSW50UG9pbnQgbGFzdEtub3duTW91c2VQb3NpdGlv bkluVmlldygpIGNvbnN0IGZpbmFsOwogICAgIGJvb2wgaXNIYW5kbGluZ1doZWVsRXZlbnQoKSBj b25zdCBmaW5hbDsKICAgICBib29sIHNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgY29u c3QgZmluYWw7CiAgICAgSW50UmVjdCBzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KGJvb2wqIGlz SW5zaWRlRml4ZWQgPSBudWxscHRyKSBjb25zdCBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcAppbmRleCAzNDFlODgxZDJiY2NjMTQzOTc0M2M3MDkwNzhh Njk5YjY1ZjM0NTJjLi4wNDY2Y2JhOTA1OTI0NTMyOTgzNzMxNzNhZWYyM2UxOTgwMWZkYWYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCkBAIC04NTYsOSAr ODU2LDkgQEAgSW50U2l6ZSBSZW5kZXJMaXN0Qm94Ojpjb250ZW50c1NpemUoKSBjb25zdAogICAg IHJldHVybiBJbnRTaXplKHNjcm9sbFdpZHRoKCksIHNjcm9sbEhlaWdodCgpKTsKIH0KIAotSW50 UG9pbnQgUmVuZGVyTGlzdEJveDo6bGFzdEtub3duTW91c2VQb3NpdGlvbigpIGNvbnN0CitJbnRQ b2ludCBSZW5kZXJMaXN0Qm94OjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uSW5WaWV3KCkgY29uc3QK IHsKLSAgICByZXR1cm4gdmlldygpLmZyYW1lVmlldygpLmxhc3RLbm93bk1vdXNlUG9zaXRpb24o KTsKKyAgICByZXR1cm4gdmlldygpLmZyYW1lVmlldygpLmxhc3RLbm93bk1vdXNlUG9zaXRpb25J blZpZXcoKTsKIH0KIAogYm9vbCBSZW5kZXJMaXN0Qm94Ojppc0hhbmRsaW5nV2hlZWxFdmVudCgp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJv eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCA1ZjAy NjFhMzIzNTYyOTQ5MTQzOTVlMzc5ZmNhODIwNzgxMDM1NWM5Li5jYzkzNDA5MmY0ZDNjYjE0MzY0 NDVmZWE3ZWQ3N2FjMGVjZmRlMzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0Qm94LmgKQEAgLTEzMCw3ICsxMzAsNyBAQCBwcml2YXRlOgogICAgIFNjcm9sbGJhciogdmVy dGljYWxTY3JvbGxiYXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3ZCYXIuZ2V0KCk7IH0KICAg ICBJbnRTaXplIGNvbnRlbnRzU2l6ZSgpIGNvbnN0IGZpbmFsOwogICAgIEludFNpemUgdmlzaWJs ZVNpemUoKSBjb25zdCBmaW5hbCB7IHJldHVybiBJbnRTaXplKHdpZHRoKCksIGhlaWdodCgpKTsg fQotICAgIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdCBmaW5hbDsKKyAg ICBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uSW5WaWV3KCkgY29uc3QgZmluYWw7CiAg ICAgYm9vbCBpc0hhbmRsaW5nV2hlZWxFdmVudCgpIGNvbnN0IGZpbmFsOwogICAgIGJvb2wgc2hv dWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdCBmaW5hbDsKICAgICBib29sIGZvcmNl VXBkYXRlU2Nyb2xsYmFyc09uTWFpblRocmVhZEZvclBlcmZvcm1hbmNlVGVzdGluZygpIGNvbnN0 IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViRXZlbnQuaCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkV2ZW50LmgKaW5kZXggYmE1YzU5ZTE3NDhjOTc5NmY2NDU4 YzdlOWU2NTMwNTZlOTJlYzU0ZC4uNmEwOGU1Yjk1MzkxMWFjNmEyYjFlZmNkMGVkNjE0NWU1NmUz NmRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViRXZlbnQuaAorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJFdmVudC5oCkBAIC0xNDAsMTQgKzE0MCwxNCBAQCBwdWJs aWM6CiAgICAgV2ViTW91c2VFdmVudCgpOwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFdlYk1v dXNlRXZlbnQoVHlwZSwgQnV0dG9uLCB1bnNpZ25lZCBzaG9ydCBidXR0b25zLCBjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBnbG9iYWxQ b3NpdGlvbiwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNs aWNrQ291bnQsIE9wdGlvblNldDxNb2RpZmllcj4sIFdhbGxUaW1lIHRpbWVzdGFtcCwgZG91Ymxl IGZvcmNlLCBTeW50aGV0aWNDbGlja1R5cGUgPSBOb1RhcCwgaW50IGV2ZW50TnVtYmVyID0gLTEs IGludCBtZW51VHlwZSA9IDApOworICAgIFdlYk1vdXNlRXZlbnQoVHlwZSwgQnV0dG9uLCB1bnNp Z25lZCBzaG9ydCBidXR0b25zLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRpb25JblZp ZXcsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgZmxvYXQgZGVsdGFY LCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQsIE9wdGlvblNldDxN b2RpZmllcj4sIFdhbGxUaW1lIHRpbWVzdGFtcCwgZG91YmxlIGZvcmNlLCBTeW50aGV0aWNDbGlj a1R5cGUgPSBOb1RhcCwgaW50IGV2ZW50TnVtYmVyID0gLTEsIGludCBtZW51VHlwZSA9IDApOwog I2Vsc2UKLSAgICBXZWJNb3VzZUV2ZW50KFR5cGUsIEJ1dHRvbiwgdW5zaWduZWQgc2hvcnQgYnV0 dG9ucywgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9h dCBkZWx0YVosIGludCBjbGlja0NvdW50LCBPcHRpb25TZXQ8TW9kaWZpZXI+LCBXYWxsVGltZSB0 aW1lc3RhbXAsIGRvdWJsZSBmb3JjZSA9IDAsIFN5bnRoZXRpY0NsaWNrVHlwZSA9IE5vVGFwKTsK KyAgICBXZWJNb3VzZUV2ZW50KFR5cGUsIEJ1dHRvbiwgdW5zaWduZWQgc2hvcnQgYnV0dG9ucywg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uSW5WaWV3LCBjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9h dCBkZWx0YVosIGludCBjbGlja0NvdW50LCBPcHRpb25TZXQ8TW9kaWZpZXI+LCBXYWxsVGltZSB0 aW1lc3RhbXAsIGRvdWJsZSBmb3JjZSA9IDAsIFN5bnRoZXRpY0NsaWNrVHlwZSA9IE5vVGFwKTsK ICNlbmRpZgogCiAgICAgQnV0dG9uIGJ1dHRvbigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0 PEJ1dHRvbj4obV9idXR0b24pOyB9CiAgICAgdW5zaWduZWQgc2hvcnQgYnV0dG9ucygpIGNvbnN0 IHsgcmV0dXJuIG1fYnV0dG9uczsgfQotICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3Np dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fcG9zaXRpb247IH0KKyAgICBjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9uOyB9IC8vIFJlbGF0 aXZlIHRvIHRoZSB2aWV3LgogICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3Np dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fZ2xvYmFsUG9zaXRpb247IH0KICAgICBmbG9hdCBkZWx0 YVgoKSBjb25zdCB7IHJldHVybiBtX2RlbHRhWDsgfQogICAgIGZsb2F0IGRlbHRhWSgpIGNvbnN0 IHsgcmV0dXJuIG1fZGVsdGFZOyB9CkBAIC0xNjgsNyArMTY4LDcgQEAgcHJpdmF0ZToKIAogICAg IHVpbnQzMl90IG1fYnV0dG9uIHsgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KE5vQnV0dG9uKSB9Owog ICAgIHVuc2lnbmVkIHNob3J0IG1fYnV0dG9ucyB7IDAgfTsKLSAgICBXZWJDb3JlOjpJbnRQb2lu dCBtX3Bvc2l0aW9uOworICAgIFdlYkNvcmU6OkludFBvaW50IG1fcG9zaXRpb247IC8vIFJlbGF0 aXZlIHRvIHRoZSB2aWV3LgogICAgIFdlYkNvcmU6OkludFBvaW50IG1fZ2xvYmFsUG9zaXRpb247 CiAgICAgZmxvYXQgbV9kZWx0YVggeyAwIH07CiAgICAgZmxvYXQgbV9kZWx0YVkgeyAwIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcCBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3BwCmluZGV4IGI5ZjA2YmQ1MzI0ODVhODJh MTI2YzI5NGYzMjA5YzYwZThlZTk1ZDUuLjdiMjcwZGMzZGJlOThmNjI5MGI4MDE3MzNlZmYzOWY5 MWFlZTRhNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1vdXNlRXZlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3BwCkBAIC0zNCwx NCArMzQsMTQgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBXZWJNb3VzZUV2ZW50OjpXZWJN b3VzZUV2ZW50KCkgPSBkZWZhdWx0OwogCiAjaWYgUExBVEZPUk0oTUFDKQotV2ViTW91c2VFdmVu dDo6V2ViTW91c2VFdmVudChUeXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIHVuc2lnbmVkIHNob3J0 IGJ1dHRvbnMsIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIGdsb2Jh bFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQg Y2xpY2tDb3VudCwgT3B0aW9uU2V0PE1vZGlmaWVyPiBtb2RpZmllcnMsIFdhbGxUaW1lIHRpbWVz dGFtcCwgZG91YmxlIGZvcmNlLCBTeW50aGV0aWNDbGlja1R5cGUgc3ludGhldGljQ2xpY2tUeXBl LCBpbnQgZXZlbnROdW1iZXIsIGludCBtZW51VHlwZSkKK1dlYk1vdXNlRXZlbnQ6OldlYk1vdXNl RXZlbnQoVHlwZSB0eXBlLCBCdXR0b24gYnV0dG9uLCB1bnNpZ25lZCBzaG9ydCBidXR0b25zLCBj b25zdCBJbnRQb2ludCYgcG9zaXRpb25JblZpZXcsIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3Np dGlvbiwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNr Q291bnQsIE9wdGlvblNldDxNb2RpZmllcj4gbW9kaWZpZXJzLCBXYWxsVGltZSB0aW1lc3RhbXAs IGRvdWJsZSBmb3JjZSwgU3ludGhldGljQ2xpY2tUeXBlIHN5bnRoZXRpY0NsaWNrVHlwZSwgaW50 IGV2ZW50TnVtYmVyLCBpbnQgbWVudVR5cGUpCiAjZWxzZQotV2ViTW91c2VFdmVudDo6V2ViTW91 c2VFdmVudChUeXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIHVuc2lnbmVkIHNob3J0IGJ1dHRvbnMs IGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9u LCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3Vu dCwgT3B0aW9uU2V0PE1vZGlmaWVyPiBtb2RpZmllcnMsIFdhbGxUaW1lIHRpbWVzdGFtcCwgZG91 YmxlIGZvcmNlLCBTeW50aGV0aWNDbGlja1R5cGUgc3ludGhldGljQ2xpY2tUeXBlKQorV2ViTW91 c2VFdmVudDo6V2ViTW91c2VFdmVudChUeXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIHVuc2lnbmVk IHNob3J0IGJ1dHRvbnMsIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbkluVmlldywgY29uc3QgSW50 UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQg ZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgT3B0aW9uU2V0PE1vZGlmaWVyPiBtb2RpZmllcnMsIFdh bGxUaW1lIHRpbWVzdGFtcCwgZG91YmxlIGZvcmNlLCBTeW50aGV0aWNDbGlja1R5cGUgc3ludGhl dGljQ2xpY2tUeXBlKQogI2VuZGlmCiAgICAgOiBXZWJFdmVudCh0eXBlLCBtb2RpZmllcnMsIHRp bWVzdGFtcCkKICAgICAsIG1fYnV0dG9uKGJ1dHRvbikKICAgICAsIG1fYnV0dG9ucyhidXR0b25z KQotICAgICwgbV9wb3NpdGlvbihwb3NpdGlvbikKKyAgICAsIG1fcG9zaXRpb24ocG9zaXRpb25J blZpZXcpCiAgICAgLCBtX2dsb2JhbFBvc2l0aW9uKGdsb2JhbFBvc2l0aW9uKQogICAgICwgbV9k ZWx0YVgoZGVsdGFYKQogICAgICwgbV9kZWx0YVkoZGVsdGFZKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCmluZGV4IDFjMWZjODYwMjBlYjE5 MmEzZGEzYThjYzg3NTY0YTQyYWE3YzhmZjMuLjAzOTc1Y2UyYmQxYjExZDM1YzgwNjg5ZmRlZjhk NmYzMTU4M2YzOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5z L1BERi9QREZQbHVnaW4uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9Q REYvUERGUGx1Z2luLmgKQEAgLTIzMCw3ICsyMzAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0 U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYkNvcmU6OlNjcm9sbE9mZnNldCYpIGZpbmFsOwogICAgIHZv aWQgaW52YWxpZGF0ZVNjcm9sbGJhclJlY3QoV2ViQ29yZTo6U2Nyb2xsYmFyJiwgY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpIGZpbmFsOwogICAgIHZvaWQgaW52YWxpZGF0ZVNjcm9sbENvcm5lclJl Y3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIGZpbmFsOwotICAgIFdlYkNvcmU6OkludFBvaW50 IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2xhc3RNb3Vz ZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlczsgfQorICAgIFdlYkNvcmU6OkludFBvaW50IGxh c3RLbm93bk1vdXNlUG9zaXRpb25JblZpZXcoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2xhc3RN b3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlczsgfQogICAgIGJvb2wgaXNBY3RpdmUoKSBj b25zdCBmaW5hbDsKICAgICBib29sIGlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgpIGNvbnN0IGZpbmFs IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgV2ViQ29yZTo6U2Nyb2xsUG9zaXRpb24gc2Nyb2xsUG9z aXRpb24oKSBjb25zdCBmaW5hbDsK