205497 2019-12-20 05:29:21 -0800 [GTK] InputMethod API unit tests don't work under X11 2019-12-23 02:06:37 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply ews-watchlist gustavo zan oldest_to_newest 1600702 0 cgarcia 2019-12-20 05:29:21 -0800 The input method filter requires the web view to be focused to be enabled. Under X11 we only get the focus if the parent window is a toplevel and tests were using a popup. Using a toplevelo is enough for X11 with a window manager, but not for tests running under xvfb because there isn't a window manager. We need to assume the web view is always focused when running the tests under xvfb 1600704 1 386209 cgarcia 2019-12-20 05:32:54 -0800 Created attachment 386209 Patch 1600705 2 ews-watchlist 2019-12-20 05:33:45 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1600711 3 386210 cgarcia 2019-12-20 05:56:01 -0800 Created attachment 386210 Patch 1601217 4 cgarcia 2019-12-23 02:06:37 -0800 Committed r253882: <https://trac.webkit.org/changeset/253882> 386209 2019-12-20 05:32:54 -0800 2019-12-20 05:56:01 -0800 Patch wk2-ime-tests-x11.diff text/plain 8627 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZGIwMTA2YmE3MzAuLjFhMDk5NjNmYWUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDE5LTEyLTIwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBJbnB1dE1ldGhvZCBBUEkgdW5pdCB0ZXN0cyBkb24ndCB3 b3JrIHVuZGVyIFgxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA1NDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQXNzdW1lIHRoZSB3ZWIgdmlldyBpcyBhbHdheXMgZm9jdXNlZCB3aGVuIHJ1bm5pbmcg dGVzdHMgdW5kZXIgWHZmYiwgc2luY2UgdGhlcmUgaXNuJ3QgYSB3aW5kb3cgbWFuYWdlciB0byBm b2N1cworICAgICAgICB0aGUgdG9wbGV2ZWwgd2luZG93IGluIHRoYXQgY2FzZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OklucHV0TWV0aG9kRmlsdGVyOjppc1ZpZXdGb2N1c2VkIGNvbnN0KToKKwogMjAxOS0x Mi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bV1BFXSBTcGVjaWFsIGNvbWJpbmF0aW9uIGNoYXJhY3RlcnMgZG9lc24ndCByZXNw ZWN0IHRoZSBrZXlzdHJva2Ugb3JkZXIgd2hlbiBoaWdoIENQVSBsb2FkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAKaW5k ZXggMzgyMGI4YjI2YzkuLjg1YjhhM2ViM2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC0yMyw2ICsyMyw3 IEBACiAjaW5jbHVkZSAiV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0UHJpdmF0ZS5oIgogI2luY2x1 ZGUgIldlYktpdFdlYlZpZXdQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisj aW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybURpc3BsYXkuaD4KICNpbmNsdWRlIDx3dGYvU2V0Rm9y U2NvcGUuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0xMTIsNiArMTEzLDE1IEBAIGJvb2wg SW5wdXRNZXRob2RGaWx0ZXI6OmlzVmlld0ZvY3VzZWQoKSBjb25zdAogICAgIGlmICghbV9lbmFi bGVkIHx8ICFtX2NvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorI2lmIEVOQUJMRShE RVZFTE9QRVJfTU9ERSkKKyAgICAvLyBYdmZiIGRvZXNuJ3Qgc3VwcG9ydCB0b3BsZXZlbCBmb2N1 cywgc28gdGhlIFdlYlZpZXcgaXMgbmV2ZXIgZm9jdXNlZC4gV2Ugc2ltcGx5IGFzc3VtZSB0aGUg V2ViVmlldyBpcyBmb2N1c2VkCisgICAgLy8gc2luY2UgaXQncyB0aGUgb25seSBhcHBsaWNhdGlv biBydW5uaW5nLgorICAgIGlmIChQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKS50eXBl KCkgPT0gUGxhdGZvcm1EaXNwbGF5OjpUeXBlOjpYMTEpIHsKKyAgICAgICAgaWYgKCFnX3N0cmNt cDAoZ19nZXRlbnYoIlVOREVSX1hWRkIiKSwgInllcyIpKQorICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgfQorI2VuZGlmCisKICAgICBhdXRvKiB3ZWJWaWV3ID0gd2Via2l0SW5wdXRNZXRo b2RDb250ZXh0R2V0V2ViVmlldyhtX2NvbnRleHQuZ2V0KCkpOwogICAgIEFTU0VSVCh3ZWJWaWV3 KTsKICAgICByZXR1cm4gd2Via2l0V2ViVmlld0dldFBhZ2Uod2ViVmlldykuaXNWaWV3Rm9jdXNl ZCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGFjOWVmZjZlNTBmLi5mMWZkNmY4MmNkMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTEyLTIwICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBJbnB1 dE1ldGhvZCBBUEkgdW5pdCB0ZXN0cyBkb24ndCB3b3JrIHVuZGVyIFgxMQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NDk3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgdG9wbGV2ZWwgd2luZG93 IGluc3RlYWQgb2YgYSBwb3B1cCBmb3IgdGhlIGlucHV0IG1ldGhvZCB0ZXN0cywgc2luY2UgdGhh dCdzIHJlcXVpcmVkIGluIFgxMSB0byBnZXQgdGhlIHdlYgorICAgICAgICB2aWV3IGZvY3VzZWQu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdElucHV0TWV0 aG9kQ29udGV4dC5jcHA6CisgICAgICAgICh0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0U2lt cGxlKToKKyAgICAgICAgKHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRTZXF1ZW5jZSk6Cisg ICAgICAgICh0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW52YWxpZFNlcXVlbmNlKToKKyAg ICAgICAgKHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRDYW5jZWxTZXF1ZW5jZSk6CisgICAg ICAgICh0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0UmVzZXQpOgorCiAyMDE5LTEyLTIwICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XVtXUEVdIFNwZWNpYWwgY29tYmluYXRpb24gY2hhcmFjdGVycyBkb2Vzbid0IHJlc3BlY3QgdGhl IGtleXN0cm9rZSBvcmRlciB3aGVuIGhpZ2ggQ1BVIGxvYWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0SW5wdXRNZXRob2RDb250ZXh0LmNwcCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0SW5wdXRNZXRob2RDb250 ZXh0LmNwcAppbmRleCBiNjBhZTI3MWFlYi4uNTk2MWZhYzIzN2EgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0SW5wdXRNZXRob2RDb250ZXh0LmNw cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdElucHV0TWV0 aG9kQ29udGV4dC5jcHAKQEAgLTIyOSwxMCArMjI5LDEyIEBAIHB1YmxpYzoKICAgICAgICAgOiBt X2NvbnRleHQoYWRvcHRHUmVmKHN0YXRpY19jYXN0PFdlYktpdElucHV0TWV0aG9kQ29udGV4dE1v Y2sqPihnX29iamVjdF9uZXcod2Via2l0X2lucHV0X21ldGhvZF9jb250ZXh0X21vY2tfZ2V0X3R5 cGUoKSwgbnVsbHB0cikpKSkKICAgICB7CiAjaWYgUExBVEZPUk0oR1RLKQorICAgICAgICBXZWJW aWV3VGVzdDo6c2hvd0luV2luZG93QW5kV2FpdFVudGlsTWFwcGVkKEdUS19XSU5ET1dfVE9QTEVW RUwpOwogICAgICAgICBhdXRvKiBkZWZhdWx0Q29udGV4dCA9IHdlYmtpdF93ZWJfdmlld19nZXRf aW5wdXRfbWV0aG9kX2NvbnRleHQobV93ZWJWaWV3KTsKICAgICAgICAgZ19hc3NlcnRfdHJ1ZShX RUJLSVRfSVNfSU5QVVRfTUVUSE9EX0NPTlRFWFQoZGVmYXVsdENvbnRleHQpKTsKICAgICAgICAg YXNzZXJ0T2JqZWN0SXNEZWxldGVkV2hlblRlc3RGaW5pc2hlcyhHX09CSkVDVChkZWZhdWx0Q29u dGV4dCkpOwogI2VsaWYgUExBVEZPUk0oV1BFKQorICAgICAgICBXZWJWaWV3VGVzdDo6c2hvd0lu V2luZG93KCk7CiAgICAgICAgIGdfYXNzZXJ0X251bGwod2Via2l0X3dlYl92aWV3X2dldF9pbnB1 dF9tZXRob2RfY29udGV4dChtX3dlYlZpZXcpKTsKICNlbmRpZgogICAgICAgICBhc3NlcnRPYmpl Y3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JKRUNUKG1fY29udGV4dC5nZXQoKSkpOwpA QCAtMzE2LDkgKzMxOCwyNCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBnX21haW5fbG9vcF9xdWl0 KG1fbWFpbkxvb3ApOwogICAgIH0KIAotICAgIHZvaWQgZm9jdXNFZGl0YWJsZSgpCisgICAgdm9p ZCBmb2N1c0VkaXRhYmxlQW5kV2FpdFVudGlsSW5wdXRNZXRob2RFbmFibGVkKCkKICAgICB7Cisg ICAgICAgIGdfYXNzZXJ0X2ZhbHNlKG1fY29udGV4dC0+ZW5hYmxlZCk7CiAgICAgICAgIHJ1bkph dmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Vk aXRhYmxlJykuZm9jdXMoKSIsIG51bGxwdHIpOworICAgICAgICBpZiAobV9jb250ZXh0LT5lbmFi bGVkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGdfaWRsZV9hZGQoW10oZ3BvaW50 ZXIgdXNlckRhdGEpIC0+IGdib29sZWFuIHsKKyAgICAgICAgICAgIGF1dG8qIHRlc3QgPSBzdGF0 aWNfY2FzdDxJbnB1dE1ldGhvZFRlc3QqPih1c2VyRGF0YSk7CisgICAgICAgICAgICBpZiAodGVz dC0+bV9jb250ZXh0LT5lbmFibGVkKSB7CisgICAgICAgICAgICAgICAgdGVzdC0+cXVpdE1haW5M b29wKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIEZBTFNFOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICByZXR1cm4gVFJVRTsKKyAgICAgICAgfSwgdGhpcyk7CisgICAgICAgIGdfbWFp bl9sb29wX3J1bihtX21haW5Mb29wKTsKKyAgICAgICAgZ19hc3NlcnRfdHJ1ZShtX2NvbnRleHQt PmVuYWJsZWQpOwogICAgIH0KIAogICAgIHZvaWQgcmVzZXRFZGl0YWJsZSgpCkBAIC0zNjMsMTQg KzM4MCwxMCBAQCBwdWJsaWM6CiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJLaXRJbnB1dE1ldGhvZENv bnRleHRTaW1wbGUoSW5wdXRNZXRob2RUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAg IHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMod2Via2l0X3dlYl92 aWV3X2dldF9zZXR0aW5ncyh0ZXN0LT5tX3dlYlZpZXcpLCBUUlVFKTsKLSAgICB0ZXN0LT5zaG93 SW5XaW5kb3dBbmRXYWl0VW50aWxNYXBwZWQoKTsKICAgICB0ZXN0LT5sb2FkSHRtbCh0ZXN0SFRN TCwgbnVsbHB0cik7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBn X2Fzc2VydF9mYWxzZSh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpOwotICAgIHRlc3QtPmZvY3Vz RWRpdGFibGUoKTsKLSAgICBnX2Fzc2VydF90cnVlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7 CisgICAgdGVzdC0+Zm9jdXNFZGl0YWJsZUFuZFdhaXRVbnRpbElucHV0TWV0aG9kRW5hYmxlZCgp OwogCiAgICAgLy8gU2VuZCBhIG5vcm1hbCBjaGFyYWN0ZXIgbm90IGhhbmRsZWQgYnkgSU0uCiAg ICAgdGVzdC0+a2V5U3Ryb2tlQW5kV2FpdEZvckV2ZW50cyhLRVkoYSksIDMpOwpAQCAtNDEzLDE0 ICs0MjYsMTAgQEAgc3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0TWV0aG9kQ29udGV4dFNpbXBs ZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdjb25zdHBvaW4KIAogc3RhdGljIHZvaWQgdGVzdFdl YktpdElucHV0TWV0aG9kQ29udGV4dFNlcXVlbmNlKElucHV0TWV0aG9kVGVzdCogdGVzdCwgZ2Nv bnN0cG9pbnRlcikKIHsKLSAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9kZXZlbG9wZXJf ZXh0cmFzKHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3ModGVzdC0+bV93ZWJWaWV3KSwgVFJV RSk7Ci0gICAgdGVzdC0+c2hvd0luV2luZG93QW5kV2FpdFVudGlsTWFwcGVkKCk7CiAgICAgdGVz dC0+bG9hZEh0bWwodGVzdEhUTUwsIG51bGxwdHIpOwogICAgIHRlc3QtPndhaXRVbnRpbExvYWRG aW5pc2hlZCgpOwogCi0gICAgZ19hc3NlcnRfZmFsc2UodGVzdC0+bV9jb250ZXh0LT5lbmFibGVk KTsKLSAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlKCk7Ci0gICAgZ19hc3NlcnRfdHJ1ZSh0ZXN0LT5t X2NvbnRleHQtPmVuYWJsZWQpOworICAgIHRlc3QtPmZvY3VzRWRpdGFibGVBbmRXYWl0VW50aWxJ bnB1dE1ldGhvZEVuYWJsZWQoKTsKIAogICAgIC8vIENvbXBvc2UgdyArIGd0ayArIEVudGVyLgog ICAgIHRlc3QtPmtleVN0cm9rZUFuZFdhaXRGb3JFdmVudHMoS0VZKHcpLCA0LCBDT05UUk9MX01B U0sgfCBTSElGVF9NQVNLKTsKQEAgLTU2MSwxNCArNTcwLDExIEBAIHN0YXRpYyB2b2lkIHRlc3RX ZWJLaXRJbnB1dE1ldGhvZENvbnRleHRTZXF1ZW5jZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdj b25zdHBvCiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJbnZhbGlk U2VxdWVuY2UoSW5wdXRNZXRob2RUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAgIHdl YmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMod2Via2l0X3dlYl92aWV3 X2dldF9zZXR0aW5ncyh0ZXN0LT5tX3dlYlZpZXcpLCBUUlVFKTsKLSAgICB0ZXN0LT5zaG93SW5X aW5kb3dBbmRXYWl0VW50aWxNYXBwZWQoKTsKICAgICB0ZXN0LT5sb2FkSHRtbCh0ZXN0SFRNTCwg bnVsbHB0cik7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBnX2Fz c2VydF9mYWxzZSh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpOwotICAgIHRlc3QtPmZvY3VzRWRp dGFibGUoKTsKLSAgICBnX2Fzc2VydF90cnVlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7Cisg ICAgdGVzdC0+Zm9jdXNFZGl0YWJsZUFuZFdhaXRVbnRpbElucHV0TWV0aG9kRW5hYmxlZCgpOwor CiAgICAgLy8gQ29tcG9zZSB3ICsgdyArIFNwYWNlIC0+IGludmFsaWQgc2VxdWVuY2UuCiAgICAg dGVzdC0+a2V5U3Ryb2tlQW5kV2FpdEZvckV2ZW50cyhLRVkodyksIDQsIENPTlRST0xfTUFTSyB8 IFNISUZUX01BU0spOwogICAgIGdfYXNzZXJ0X3RydWUodGVzdC0+bV9ldmVudHNbMF0udHlwZSA9 PSBJbnB1dE1ldGhvZFRlc3Q6OkV2ZW50OjpUeXBlOjpLZXlEb3duKTsKQEAgLTYxNiwxNCArNjIy LDExIEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJbnZhbGlkU2Vx dWVuY2UoSW5wdXRNZXRob2RUZXN0KiB0ZXN0LCBnCiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJLaXRJ bnB1dE1ldGhvZENvbnRleHRDYW5jZWxTZXF1ZW5jZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdj b25zdHBvaW50ZXIpCiB7Ci0gICAgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZGV2ZWxvcGVy X2V4dHJhcyh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHRlc3QtPm1fd2ViVmlldyksIFRS VUUpOwotICAgIHRlc3QtPnNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1hcHBlZCgpOwogICAgIHRl c3QtPmxvYWRIdG1sKHRlc3RIVE1MLCBudWxscHRyKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2Fk RmluaXNoZWQoKTsKIAotICAgIGdfYXNzZXJ0X2ZhbHNlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxl ZCk7Ci0gICAgdGVzdC0+Zm9jdXNFZGl0YWJsZSgpOwotICAgIGdfYXNzZXJ0X3RydWUodGVzdC0+ bV9jb250ZXh0LT5lbmFibGVkKTsKKyAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlQW5kV2FpdFVudGls SW5wdXRNZXRob2RFbmFibGVkKCk7CisKICAgICAvLyBDb21wb3NlIHcgKyB3ICsgRXNjYXBlIC0+ IGNhbmNlbCBzZXF1ZW5jZS4KICAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0Rm9yRXZlbnRzKEtF WSh3KSwgNCwgQ09OVFJPTF9NQVNLIHwgU0hJRlRfTUFTSyk7CiAgICAgZ19hc3NlcnRfdHJ1ZSh0 ZXN0LT5tX2V2ZW50c1swXS50eXBlID09IElucHV0TWV0aG9kVGVzdDo6RXZlbnQ6OlR5cGU6Oktl eURvd24pOwpAQCAtNjU5LDE0ICs2NjIsMTEgQEAgc3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0 TWV0aG9kQ29udGV4dENhbmNlbFNlcXVlbmNlKElucHV0TWV0aG9kVGVzdCogdGVzdCwgZ2MKIAog c3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0TWV0aG9kQ29udGV4dFJlc2V0KElucHV0TWV0aG9k VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKLSAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2Vu YWJsZV9kZXZlbG9wZXJfZXh0cmFzKHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3ModGVzdC0+ bV93ZWJWaWV3KSwgVFJVRSk7Ci0gICAgdGVzdC0+c2hvd0luV2luZG93QW5kV2FpdFVudGlsTWFw cGVkKCk7CiAgICAgdGVzdC0+bG9hZEh0bWwodGVzdEhUTUwsIG51bGxwdHIpOwogICAgIHRlc3Qt PndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCi0gICAgZ19hc3NlcnRfZmFsc2UodGVzdC0+bV9j b250ZXh0LT5lbmFibGVkKTsKLSAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlKCk7Ci0gICAgZ19hc3Nl cnRfdHJ1ZSh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpOworICAgIHRlc3QtPmZvY3VzRWRpdGFi bGVBbmRXYWl0VW50aWxJbnB1dE1ldGhvZEVuYWJsZWQoKTsKKwogICAgIC8vIENvbXBvc2UgdyAr IHcgKyBjbGljayAtPiByZXNldCBzZXF1ZW5jZS4KICAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0 Rm9yRXZlbnRzKEtFWSh3KSwgNCwgQ09OVFJPTF9NQVNLIHwgU0hJRlRfTUFTSyk7CiAgICAgZ19h c3NlcnRfdHJ1ZSh0ZXN0LT5tX2V2ZW50c1swXS50eXBlID09IElucHV0TWV0aG9kVGVzdDo6RXZl bnQ6OlR5cGU6OktleURvd24pOwo= 386210 2019-12-20 05:56:01 -0800 2019-12-23 02:03:10 -0800 Patch wk2-ime-tests-x11.diff text/plain 8644 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZGIwMTA2YmE3MzAuLjFhMDk5NjNmYWUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDE5LTEyLTIwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBJbnB1dE1ldGhvZCBBUEkgdW5pdCB0ZXN0cyBkb24ndCB3 b3JrIHVuZGVyIFgxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA1NDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQXNzdW1lIHRoZSB3ZWIgdmlldyBpcyBhbHdheXMgZm9jdXNlZCB3aGVuIHJ1bm5pbmcg dGVzdHMgdW5kZXIgWHZmYiwgc2luY2UgdGhlcmUgaXNuJ3QgYSB3aW5kb3cgbWFuYWdlciB0byBm b2N1cworICAgICAgICB0aGUgdG9wbGV2ZWwgd2luZG93IGluIHRoYXQgY2FzZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OklucHV0TWV0aG9kRmlsdGVyOjppc1ZpZXdGb2N1c2VkIGNvbnN0KToKKwogMjAxOS0x Mi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bV1BFXSBTcGVjaWFsIGNvbWJpbmF0aW9uIGNoYXJhY3RlcnMgZG9lc24ndCByZXNw ZWN0IHRoZSBrZXlzdHJva2Ugb3JkZXIgd2hlbiBoaWdoIENQVSBsb2FkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAKaW5k ZXggMzgyMGI4YjI2YzkuLjc2OWY0MWRmYTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9JbnB1dE1ldGhvZEZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC0yMyw2ICsyMyw3 IEBACiAjaW5jbHVkZSAiV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0UHJpdmF0ZS5oIgogI2luY2x1 ZGUgIldlYktpdFdlYlZpZXdQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisj aW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybURpc3BsYXkuaD4KICNpbmNsdWRlIDx3dGYvU2V0Rm9y U2NvcGUuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0xMTIsNiArMTEzLDE1IEBAIGJvb2wg SW5wdXRNZXRob2RGaWx0ZXI6OmlzVmlld0ZvY3VzZWQoKSBjb25zdAogICAgIGlmICghbV9lbmFi bGVkIHx8ICFtX2NvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorI2lmIEVOQUJMRShE RVZFTE9QRVJfTU9ERSkgJiYgUExBVEZPUk0oWDExKQorICAgIC8vIFh2ZmIgZG9lc24ndCBzdXBw b3J0IHRvcGxldmVsIGZvY3VzLCBzbyB0aGUgV2ViVmlldyBpcyBuZXZlciBmb2N1c2VkLiBXZSBz aW1wbHkgYXNzdW1lIHRoZSBXZWJWaWV3IGlzIGZvY3VzZWQKKyAgICAvLyBzaW5jZSBpdCdzIHRo ZSBvbmx5IGFwcGxpY2F0aW9uIHJ1bm5pbmcuCisgICAgaWYgKFBsYXRmb3JtRGlzcGxheTo6c2hh cmVkRGlzcGxheSgpLnR5cGUoKSA9PSBQbGF0Zm9ybURpc3BsYXk6OlR5cGU6OlgxMSkgeworICAg ICAgICBpZiAoIWdfc3RyY21wMChnX2dldGVudigiVU5ERVJfWFZGQiIpLCAieWVzIikpCisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisjZW5kaWYKKwogICAgIGF1dG8qIHdlYlZpZXcg PSB3ZWJraXRJbnB1dE1ldGhvZENvbnRleHRHZXRXZWJWaWV3KG1fY29udGV4dC5nZXQoKSk7CiAg ICAgQVNTRVJUKHdlYlZpZXcpOwogICAgIHJldHVybiB3ZWJraXRXZWJWaWV3R2V0UGFnZSh3ZWJW aWV3KS5pc1ZpZXdGb2N1c2VkKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYWM5ZWZmNmU1MGYuLmYxZmQ2ZjgyY2QzIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIw MTktMTItMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdIElucHV0TWV0aG9kIEFQSSB1bml0IHRlc3RzIGRvbid0IHdvcmsgdW5kZXIg WDExCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU0 OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ug YSB0b3BsZXZlbCB3aW5kb3cgaW5zdGVhZCBvZiBhIHBvcHVwIGZvciB0aGUgaW5wdXQgbWV0aG9k IHRlc3RzLCBzaW5jZSB0aGF0J3MgcmVxdWlyZWQgaW4gWDExIHRvIGdldCB0aGUgd2ViCisgICAg ICAgIHZpZXcgZm9jdXNlZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 R0xpYi9UZXN0SW5wdXRNZXRob2RDb250ZXh0LmNwcDoKKyAgICAgICAgKHRlc3RXZWJLaXRJbnB1 dE1ldGhvZENvbnRleHRTaW1wbGUpOgorICAgICAgICAodGVzdFdlYktpdElucHV0TWV0aG9kQ29u dGV4dFNlcXVlbmNlKToKKyAgICAgICAgKHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJbnZh bGlkU2VxdWVuY2UpOgorICAgICAgICAodGVzdFdlYktpdElucHV0TWV0aG9kQ29udGV4dENhbmNl bFNlcXVlbmNlKToKKyAgICAgICAgKHRlc3RXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRSZXNldCk6 CisKIDIwMTktMTItMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdW1dQRV0gU3BlY2lhbCBjb21iaW5hdGlvbiBjaGFyYWN0ZXJzIGRv ZXNuJ3QgcmVzcGVjdCB0aGUga2V5c3Ryb2tlIG9yZGVyIHdoZW4gaGlnaCBDUFUgbG9hZApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RJbnB1dE1l dGhvZENvbnRleHQuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rl c3RJbnB1dE1ldGhvZENvbnRleHQuY3BwCmluZGV4IGI2MGFlMjcxYWViLi41OTYxZmFjMjM3YSAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RJbnB1 dE1ldGhvZENvbnRleHQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 R0xpYi9UZXN0SW5wdXRNZXRob2RDb250ZXh0LmNwcApAQCAtMjI5LDEwICsyMjksMTIgQEAgcHVi bGljOgogICAgICAgICA6IG1fY29udGV4dChhZG9wdEdSZWYoc3RhdGljX2Nhc3Q8V2ViS2l0SW5w dXRNZXRob2RDb250ZXh0TW9jayo+KGdfb2JqZWN0X25ldyh3ZWJraXRfaW5wdXRfbWV0aG9kX2Nv bnRleHRfbW9ja19nZXRfdHlwZSgpLCBudWxscHRyKSkpKQogICAgIHsKICNpZiBQTEFURk9STShH VEspCisgICAgICAgIFdlYlZpZXdUZXN0OjpzaG93SW5XaW5kb3dBbmRXYWl0VW50aWxNYXBwZWQo R1RLX1dJTkRPV19UT1BMRVZFTCk7CiAgICAgICAgIGF1dG8qIGRlZmF1bHRDb250ZXh0ID0gd2Vi a2l0X3dlYl92aWV3X2dldF9pbnB1dF9tZXRob2RfY29udGV4dChtX3dlYlZpZXcpOwogICAgICAg ICBnX2Fzc2VydF90cnVlKFdFQktJVF9JU19JTlBVVF9NRVRIT0RfQ09OVEVYVChkZWZhdWx0Q29u dGV4dCkpOwogICAgICAgICBhc3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdf T0JKRUNUKGRlZmF1bHRDb250ZXh0KSk7CiAjZWxpZiBQTEFURk9STShXUEUpCisgICAgICAgIFdl YlZpZXdUZXN0OjpzaG93SW5XaW5kb3coKTsKICAgICAgICAgZ19hc3NlcnRfbnVsbCh3ZWJraXRf d2ViX3ZpZXdfZ2V0X2lucHV0X21ldGhvZF9jb250ZXh0KG1fd2ViVmlldykpOwogI2VuZGlmCiAg ICAgICAgIGFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1QobV9j b250ZXh0LmdldCgpKSk7CkBAIC0zMTYsOSArMzE4LDI0IEBAIHB1YmxpYzoKICAgICAgICAgICAg IGdfbWFpbl9sb29wX3F1aXQobV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgdm9pZCBmb2N1c0Vk aXRhYmxlKCkKKyAgICB2b2lkIGZvY3VzRWRpdGFibGVBbmRXYWl0VW50aWxJbnB1dE1ldGhvZEVu YWJsZWQoKQogICAgIHsKKyAgICAgICAgZ19hc3NlcnRfZmFsc2UobV9jb250ZXh0LT5lbmFibGVk KTsKICAgICAgICAgcnVuSmF2YVNjcmlwdEFuZFdhaXRVbnRpbEZpbmlzaGVkKCJkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnZWRpdGFibGUnKS5mb2N1cygpIiwgbnVsbHB0cik7CisgICAgICAgIGlm IChtX2NvbnRleHQtPmVuYWJsZWQpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgZ19p ZGxlX2FkZChbXShncG9pbnRlciB1c2VyRGF0YSkgLT4gZ2Jvb2xlYW4geworICAgICAgICAgICAg YXV0byogdGVzdCA9IHN0YXRpY19jYXN0PElucHV0TWV0aG9kVGVzdCo+KHVzZXJEYXRhKTsKKyAg ICAgICAgICAgIGlmICh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpIHsKKyAgICAgICAgICAgICAg ICB0ZXN0LT5xdWl0TWFpbkxvb3AoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gRkFMU0U7Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHJldHVybiBUUlVFOworICAgICAgICB9LCB0aGlz KTsKKyAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgICAgICBnX2Fzc2Vy dF90cnVlKG1fY29udGV4dC0+ZW5hYmxlZCk7CiAgICAgfQogCiAgICAgdm9pZCByZXNldEVkaXRh YmxlKCkKQEAgLTM2MywxNCArMzgwLDEwIEBAIHB1YmxpYzoKIAogc3RhdGljIHZvaWQgdGVzdFdl YktpdElucHV0TWV0aG9kQ29udGV4dFNpbXBsZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCiB7Ci0gICAgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZGV2ZWxvcGVyX2V4 dHJhcyh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHRlc3QtPm1fd2ViVmlldyksIFRSVUUp OwotICAgIHRlc3QtPnNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1hcHBlZCgpOwogICAgIHRlc3Qt PmxvYWRIdG1sKHRlc3RIVE1MLCBudWxscHRyKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmlu aXNoZWQoKTsKIAotICAgIGdfYXNzZXJ0X2ZhbHNlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7 Ci0gICAgdGVzdC0+Zm9jdXNFZGl0YWJsZSgpOwotICAgIGdfYXNzZXJ0X3RydWUodGVzdC0+bV9j b250ZXh0LT5lbmFibGVkKTsKKyAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlQW5kV2FpdFVudGlsSW5w dXRNZXRob2RFbmFibGVkKCk7CiAKICAgICAvLyBTZW5kIGEgbm9ybWFsIGNoYXJhY3RlciBub3Qg aGFuZGxlZCBieSBJTS4KICAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0Rm9yRXZlbnRzKEtFWShh KSwgMyk7CkBAIC00MTMsMTQgKzQyNiwxMCBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViS2l0SW5wdXRN ZXRob2RDb250ZXh0U2ltcGxlKElucHV0TWV0aG9kVGVzdCogdGVzdCwgZ2NvbnN0cG9pbgogCiBz dGF0aWMgdm9pZCB0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0U2VxdWVuY2UoSW5wdXRNZXRo b2RUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAgIHdlYmtpdF9zZXR0aW5nc19zZXRf ZW5hYmxlX2RldmVsb3Blcl9leHRyYXMod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh0ZXN0 LT5tX3dlYlZpZXcpLCBUUlVFKTsKLSAgICB0ZXN0LT5zaG93SW5XaW5kb3dBbmRXYWl0VW50aWxN YXBwZWQoKTsKICAgICB0ZXN0LT5sb2FkSHRtbCh0ZXN0SFRNTCwgbnVsbHB0cik7CiAgICAgdGVz dC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBnX2Fzc2VydF9mYWxzZSh0ZXN0LT5t X2NvbnRleHQtPmVuYWJsZWQpOwotICAgIHRlc3QtPmZvY3VzRWRpdGFibGUoKTsKLSAgICBnX2Fz c2VydF90cnVlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7CisgICAgdGVzdC0+Zm9jdXNFZGl0 YWJsZUFuZFdhaXRVbnRpbElucHV0TWV0aG9kRW5hYmxlZCgpOwogCiAgICAgLy8gQ29tcG9zZSB3 ICsgZ3RrICsgRW50ZXIuCiAgICAgdGVzdC0+a2V5U3Ryb2tlQW5kV2FpdEZvckV2ZW50cyhLRVko dyksIDQsIENPTlRST0xfTUFTSyB8IFNISUZUX01BU0spOwpAQCAtNTYxLDE0ICs1NzAsMTEgQEAg c3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0TWV0aG9kQ29udGV4dFNlcXVlbmNlKElucHV0TWV0 aG9kVGVzdCogdGVzdCwgZ2NvbnN0cG8KIAogc3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0TWV0 aG9kQ29udGV4dEludmFsaWRTZXF1ZW5jZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdjb25zdHBv aW50ZXIpCiB7Ci0gICAgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZGV2ZWxvcGVyX2V4dHJh cyh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHRlc3QtPm1fd2ViVmlldyksIFRSVUUpOwot ICAgIHRlc3QtPnNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1hcHBlZCgpOwogICAgIHRlc3QtPmxv YWRIdG1sKHRlc3RIVE1MLCBudWxscHRyKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNo ZWQoKTsKIAotICAgIGdfYXNzZXJ0X2ZhbHNlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7Ci0g ICAgdGVzdC0+Zm9jdXNFZGl0YWJsZSgpOwotICAgIGdfYXNzZXJ0X3RydWUodGVzdC0+bV9jb250 ZXh0LT5lbmFibGVkKTsKKyAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlQW5kV2FpdFVudGlsSW5wdXRN ZXRob2RFbmFibGVkKCk7CisKICAgICAvLyBDb21wb3NlIHcgKyB3ICsgU3BhY2UgLT4gaW52YWxp ZCBzZXF1ZW5jZS4KICAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0Rm9yRXZlbnRzKEtFWSh3KSwg NCwgQ09OVFJPTF9NQVNLIHwgU0hJRlRfTUFTSyk7CiAgICAgZ19hc3NlcnRfdHJ1ZSh0ZXN0LT5t X2V2ZW50c1swXS50eXBlID09IElucHV0TWV0aG9kVGVzdDo6RXZlbnQ6OlR5cGU6OktleURvd24p OwpAQCAtNjE2LDE0ICs2MjIsMTEgQEAgc3RhdGljIHZvaWQgdGVzdFdlYktpdElucHV0TWV0aG9k Q29udGV4dEludmFsaWRTZXF1ZW5jZShJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGcKIAogc3RhdGlj IHZvaWQgdGVzdFdlYktpdElucHV0TWV0aG9kQ29udGV4dENhbmNlbFNlcXVlbmNlKElucHV0TWV0 aG9kVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKLSAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0 X2VuYWJsZV9kZXZlbG9wZXJfZXh0cmFzKHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3ModGVz dC0+bV93ZWJWaWV3KSwgVFJVRSk7Ci0gICAgdGVzdC0+c2hvd0luV2luZG93QW5kV2FpdFVudGls TWFwcGVkKCk7CiAgICAgdGVzdC0+bG9hZEh0bWwodGVzdEhUTUwsIG51bGxwdHIpOwogICAgIHRl c3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCi0gICAgZ19hc3NlcnRfZmFsc2UodGVzdC0+ bV9jb250ZXh0LT5lbmFibGVkKTsKLSAgICB0ZXN0LT5mb2N1c0VkaXRhYmxlKCk7Ci0gICAgZ19h c3NlcnRfdHJ1ZSh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpOworICAgIHRlc3QtPmZvY3VzRWRp dGFibGVBbmRXYWl0VW50aWxJbnB1dE1ldGhvZEVuYWJsZWQoKTsKKwogICAgIC8vIENvbXBvc2Ug dyArIHcgKyBFc2NhcGUgLT4gY2FuY2VsIHNlcXVlbmNlLgogICAgIHRlc3QtPmtleVN0cm9rZUFu ZFdhaXRGb3JFdmVudHMoS0VZKHcpLCA0LCBDT05UUk9MX01BU0sgfCBTSElGVF9NQVNLKTsKICAg ICBnX2Fzc2VydF90cnVlKHRlc3QtPm1fZXZlbnRzWzBdLnR5cGUgPT0gSW5wdXRNZXRob2RUZXN0 OjpFdmVudDo6VHlwZTo6S2V5RG93bik7CkBAIC02NTksMTQgKzY2MiwxMSBAQCBzdGF0aWMgdm9p ZCB0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0Q2FuY2VsU2VxdWVuY2UoSW5wdXRNZXRob2RU ZXN0KiB0ZXN0LCBnYwogCiBzdGF0aWMgdm9pZCB0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0 UmVzZXQoSW5wdXRNZXRob2RUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAgIHdlYmtp dF9zZXR0aW5nc19zZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMod2Via2l0X3dlYl92aWV3X2dl dF9zZXR0aW5ncyh0ZXN0LT5tX3dlYlZpZXcpLCBUUlVFKTsKLSAgICB0ZXN0LT5zaG93SW5XaW5k b3dBbmRXYWl0VW50aWxNYXBwZWQoKTsKICAgICB0ZXN0LT5sb2FkSHRtbCh0ZXN0SFRNTCwgbnVs bHB0cik7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBnX2Fzc2Vy dF9mYWxzZSh0ZXN0LT5tX2NvbnRleHQtPmVuYWJsZWQpOwotICAgIHRlc3QtPmZvY3VzRWRpdGFi bGUoKTsKLSAgICBnX2Fzc2VydF90cnVlKHRlc3QtPm1fY29udGV4dC0+ZW5hYmxlZCk7CisgICAg dGVzdC0+Zm9jdXNFZGl0YWJsZUFuZFdhaXRVbnRpbElucHV0TWV0aG9kRW5hYmxlZCgpOworCiAg ICAgLy8gQ29tcG9zZSB3ICsgdyArIGNsaWNrIC0+IHJlc2V0IHNlcXVlbmNlLgogICAgIHRlc3Qt PmtleVN0cm9rZUFuZFdhaXRGb3JFdmVudHMoS0VZKHcpLCA0LCBDT05UUk9MX01BU0sgfCBTSElG VF9NQVNLKTsKICAgICBnX2Fzc2VydF90cnVlKHRlc3QtPm1fZXZlbnRzWzBdLnR5cGUgPT0gSW5w dXRNZXRob2RUZXN0OjpFdmVudDo6VHlwZTo6S2V5RG93bik7Cg==