212317 2020-05-24 05:44:18 -0700 [GTK4] Fix input methods 2020-06-03 06:46:44 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1655696 0 cgarcia 2020-05-24 05:44:18 -0700 We should stop using GdkEvent for the synthesized composition events. 1658663 1 400911 cgarcia 2020-06-03 05:11:07 -0700 Created attachment 400911 Patch 1658664 2 ews-watchlist 2020-06-03 05:12:03 -0700 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 1658675 3 cgarcia 2020-06-03 06:46:44 -0700 Committed r262484: <https://trac.webkit.org/changeset/262484> 400911 2020-06-03 05:11:07 -0700 2020-06-03 05:34:33 -0700 Patch wkgtk4-im.diff text/plain 13648 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYjRkYjZmYTY2OWI0Li5kYzYxZmI5NDBmMzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzEgQEAKKzIwMjAtMDYtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBGaXggaW5wdXQgbWV0aG9kcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzE3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBHZGtFdmVudCB0 byBzeW50aGVzaXplIGNvbXBvc2l0aW5nIGV2ZW50cywgYWRkIGEgc3BlY2lmaWMgTmF0aXZlV2Vi S2V5Ym9hcmRFdmVudCBjb25zdHJ1Y3RvciBmb3IgdGhlbS4KKworICAgICAgICAqIFNoYXJlZC9O YXRpdmVXZWJLZXlib2FyZEV2ZW50Lmg6CisgICAgICAgICogU2hhcmVkL2d0ay9OYXRpdmVXZWJL ZXlib2FyZEV2ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmF0aXZlV2ViS2V5Ym9hcmRF dmVudDo6TmF0aXZlV2ViS2V5Ym9hcmRFdmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW1wbEd0ay5jcHA6CisgICAgICAgICh3ZWJraXRJ bnB1dE1ldGhvZENvbnRleHRJbXBsR3RrU2V0Q2xpZW50V2lkZ2V0KToKKyAgICAgICAgKHdlYmtp dElucHV0TWV0aG9kQ29udGV4dEltcGxHdGtTZXRDbGllbnRXaW5kb3cpOiBEZWxldGVkLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdElucHV0TWV0aG9kQ29udGV4dEltcGxHdGsu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6Cisg ICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVJlYWxpemUpOgorICAgICAgICAod2Via2l0V2ViVmll d0Jhc2VVbnJlYWxpemUpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VLZXlQcmVzc0V2ZW50 KToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlS2V5UmVsZWFzZUV2ZW50KToKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdCYXNlRm9jdXNFbnRlcik6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZUZvY3VzTGVhdmUpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VLZXlQcmVzc2VkKToKKyAg ICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlS2V5UmVsZWFzZWQpOgorICAgICAgICAodG9wbGV2ZWxX aW5kb3dJc0FjdGl2ZUNoYW5nZWQpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VTeW50aGVz aXplQ29tcG9zaXRpb25LZXlQcmVzcyk6CisKIDIwMjAtMDYtMDIgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEs0XSBJbXBsZW1lbnQgZW1v amkgY2hvb3NlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvTmF0aXZlV2ViS2V5 Ym9hcmRFdmVudC5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvTmF0aXZlV2ViS2V5Ym9hcmRFdmVu dC5oCmluZGV4IGUxYjJhYjQzZTE0Mi4uYmY2NDI5OTAyNWFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9OYXRpdmVXZWJLZXlib2FyZEV2ZW50LmgKKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oCkBAIC03Myw4ICs3Myw4IEBAIHB1Ymxp YzoKICAgICBOYXRpdmVXZWJLZXlib2FyZEV2ZW50KE5TRXZlbnQgKiwgYm9vbCBoYW5kbGVkQnlJ bnB1dE1ldGhvZCwgYm9vbCByZXBsYWNlc1NvZnRTcGFjZSwgY29uc3QgVmVjdG9yPFdlYkNvcmU6 OktleXByZXNzQ29tbWFuZD4mKTsKICNlbGlmIFBMQVRGT1JNKEdUSykKICAgICBOYXRpdmVXZWJL ZXlib2FyZEV2ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmKTsKLSAgICBlbnVtIGNs YXNzIEhhbmRsZWRCeUlucHV0TWV0aG9kIDogYm9vbCB7IE5vLCBZZXMgfTsKLSAgICBOYXRpdmVX ZWJLZXlib2FyZEV2ZW50KEdka0V2ZW50KiwgY29uc3QgU3RyaW5nJiwgSGFuZGxlZEJ5SW5wdXRN ZXRob2QsIE9wdGlvbmFsPFZlY3RvcjxXZWJDb3JlOjpDb21wb3NpdGlvblVuZGVybGluZT4+JiYs IE9wdGlvbmFsPEVkaXRpbmdSYW5nZT4mJiwgVmVjdG9yPFN0cmluZz4mJiBjb21tYW5kcyk7Cisg ICAgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChHZGtFdmVudCosIGNvbnN0IFN0cmluZyYsIFZlY3Rv cjxTdHJpbmc+JiYgY29tbWFuZHMpOworICAgIE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoY29uc3Qg U3RyaW5nJiwgT3B0aW9uYWw8VmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPj4m JiwgT3B0aW9uYWw8RWRpdGluZ1JhbmdlPiYmKTsKICAgICBOYXRpdmVXZWJLZXlib2FyZEV2ZW50 KFR5cGUsIGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmlu ZyYgY29kZSwgY29uc3QgU3RyaW5nJiBrZXlJZGVudGlmaWVyLCBpbnQgd2luZG93c1ZpcnR1YWxL ZXlDb2RlLCBpbnQgbmF0aXZlVmlydHVhbEtleUNvZGUsIFZlY3RvcjxTdHJpbmc+JiYgY29tbWFu ZHMsIGJvb2wgaXNLZXlwYWQsIE9wdGlvblNldDxNb2RpZmllcj4pOwogI2VsaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKICAgICBlbnVtIGNsYXNzIEhhbmRsZWRCeUlucHV0TWV0aG9kIDogYm9vbCB7 IE5vLCBZZXMgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9OYXRpdmVX ZWJLZXlib2FyZEV2ZW50R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9OYXRpdmVX ZWJLZXlib2FyZEV2ZW50R3RrLmNwcAppbmRleCBjNmRlYTk5OTg3ZGIuLmM3NmE5ZTFmN2RhZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL05hdGl2ZVdlYktleWJvYXJkRXZl bnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9OYXRpdmVXZWJLZXlib2Fy ZEV2ZW50R3RrLmNwcApAQCAtMzMsMTIgKzMzLDE3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewog Ci1OYXRpdmVXZWJLZXlib2FyZEV2ZW50OjpOYXRpdmVXZWJLZXlib2FyZEV2ZW50KEdka0V2ZW50 KiBldmVudCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBIYW5kbGVkQnlJbnB1dE1ldGhvZCBoYW5kbGVk QnlJbnB1dE1ldGhvZCwgT3B0aW9uYWw8VmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJs aW5lPj4mJiBwcmVlZGl0VW5kZXJsaW5lcywgT3B0aW9uYWw8RWRpdGluZ1JhbmdlPiYmIHByZWVk aXRTZWxlY3Rpb25SYW5nZSwgVmVjdG9yPFN0cmluZz4mJiBjb21tYW5kcykKLSAgICA6IFdlYktl eWJvYXJkRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2FyZEV2ZW50KGV2ZW50 LCB0ZXh0LCBoYW5kbGVkQnlJbnB1dE1ldGhvZCA9PSBIYW5kbGVkQnlJbnB1dE1ldGhvZDo6WWVz LCBXVEZNb3ZlKHByZWVkaXRVbmRlcmxpbmVzKSwgV1RGTW92ZShwcmVlZGl0U2VsZWN0aW9uUmFu Z2UpLCBXVEZNb3ZlKGNvbW1hbmRzKSkpCitOYXRpdmVXZWJLZXlib2FyZEV2ZW50OjpOYXRpdmVX ZWJLZXlib2FyZEV2ZW50KEdka0V2ZW50KiBldmVudCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBWZWN0 b3I8U3RyaW5nPiYmIGNvbW1hbmRzKQorICAgIDogV2ViS2V5Ym9hcmRFdmVudChXZWJFdmVudEZh Y3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQoZXZlbnQsIHRleHQsIGZhbHNlLCBXVEY6Om51 bGxvcHQsIFdURjo6bnVsbG9wdCwgV1RGTW92ZShjb21tYW5kcykpKQogICAgICwgbV9uYXRpdmVF dmVudChnZGtfZXZlbnRfY29weShldmVudCkpCiB7CiB9CiAKK05hdGl2ZVdlYktleWJvYXJkRXZl bnQ6Ok5hdGl2ZVdlYktleWJvYXJkRXZlbnQoY29uc3QgU3RyaW5nJiB0ZXh0LCBPcHRpb25hbDxW ZWN0b3I8V2ViQ29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+PiYmIHByZWVkaXRVbmRlcmxpbmVz LCBPcHRpb25hbDxFZGl0aW5nUmFuZ2U+JiYgcHJlZWRpdFNlbGVjdGlvblJhbmdlKQorICAgIDog V2ViS2V5Ym9hcmRFdmVudChXZWJFdmVudDo6S2V5RG93biwgdGV4dCwgIlVuaWRlbnRpZmllZCJf cywgIlVuaWRlbnRpZmllZCJfcywgIlUrMDAwMCJfcywgMjI5LCBHREtfS0VZX1ZvaWRTeW1ib2ws IHRydWUsIFdURk1vdmUocHJlZWRpdFVuZGVybGluZXMpLCBXVEZNb3ZlKHByZWVkaXRTZWxlY3Rp b25SYW5nZSksIHsgfSwgZmFsc2UsIHsgfSwgV2FsbFRpbWU6Om5vdygpKQoreworfQorCiBOYXRp dmVXZWJLZXlib2FyZEV2ZW50OjpOYXRpdmVXZWJLZXlib2FyZEV2ZW50KFR5cGUgdHlwZSwgY29u c3QgU3RyaW5nJiB0ZXh0LCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBjb2RlLCBj b25zdCBTdHJpbmcmIGtleUlkZW50aWZpZXIsIGludCB3aW5kb3dzVmlydHVhbEtleUNvZGUsIGlu dCBuYXRpdmVWaXJ0dWFsS2V5Q29kZSwgVmVjdG9yPFN0cmluZz4mJiBjb21tYW5kcywgYm9vbCBp c0tleXBhZCwgT3B0aW9uU2V0PE1vZGlmaWVyPiBtb2RpZmllcnMpCiAgICAgOiBXZWJLZXlib2Fy ZEV2ZW50KHR5cGUsIHRleHQsIGtleSwgY29kZSwga2V5SWRlbnRpZmllciwgd2luZG93c1ZpcnR1 YWxLZXlDb2RlLCBuYXRpdmVWaXJ0dWFsS2V5Q29kZSwgZmFsc2UsIFdURjo6bnVsbG9wdCwgV1RG OjpudWxsb3B0LCBXVEZNb3ZlKGNvbW1hbmRzKSwgaXNLZXlwYWQsIG1vZGlmaWVycywgV2FsbFRp bWU6Om5vdygpKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJbXBsR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW1wbEd0ay5jcHAKaW5kZXgg MTNkZGFjZGU2NzI2Li45ZDRiNDZkNTI5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW1wbEd0ay5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJ bXBsR3RrLmNwcApAQCAtMjMxLDkgKzIzMSwxMSBAQCBXZWJLaXRJbnB1dE1ldGhvZENvbnRleHQq IHdlYmtpdElucHV0TWV0aG9kQ29udGV4dEltcGxHdGtOZXcoKQogICAgIHJldHVybiBXRUJLSVRf SU5QVVRfTUVUSE9EX0NPTlRFWFQoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX0lOUFVUX01FVEhP RF9DT05URVhUX0lNUExfR1RLLCBudWxscHRyKSk7CiB9CiAKLXZvaWQgd2Via2l0SW5wdXRNZXRo b2RDb250ZXh0SW1wbEd0a1NldENsaWVudFdpbmRvdyhXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJ bXBsR3RrKiBjb250ZXh0LCBHZGtXaW5kb3cqIHdpbmRvdykKK3ZvaWQgd2Via2l0SW5wdXRNZXRo b2RDb250ZXh0SW1wbEd0a1NldENsaWVudFdpZGdldChXZWJLaXRJbnB1dE1ldGhvZENvbnRleHRJ bXBsR3RrKiBjb250ZXh0LCBHdGtXaWRnZXQqIHdpZGdldCkKIHsKLSNpZiAhVVNFKEdUSzQpCi0g ICAgZ3RrX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3coY29udGV4dC0+cHJpdi0+Y29udGV4 dC5nZXQoKSwgd2luZG93KTsKKyNpZiBVU0UoR1RLNCkKKyAgICBndGtfaW1fY29udGV4dF9zZXRf Y2xpZW50X3dpZGdldChjb250ZXh0LT5wcml2LT5jb250ZXh0LmdldCgpLCB3aWRnZXQpOworI2Vs c2UKKyAgICBndGtfaW1fY29udGV4dF9zZXRfY2xpZW50X3dpbmRvdyhjb250ZXh0LT5wcml2LT5j b250ZXh0LmdldCgpLCB3aWRnZXQgPyBndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KSA6IG51 bGxwdHIpOwogI2VuZGlmCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdElucHV0TWV0aG9kQ29udGV4dEltcGxHdGsuaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW1wbEd0ay5oCmluZGV4 IDQwMWE0ZTI2YTE5Yy4uY2NlNzM1YmQ1MTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdElucHV0TWV0aG9kQ29udGV4dEltcGxHdGsuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdElucHV0TWV0aG9kQ29udGV4dElt cGxHdGsuaApAQCAtNDcsNyArNDcsNyBAQCBzdHJ1Y3QgX1dlYktpdElucHV0TWV0aG9kQ29udGV4 dEltcGxHdGtDbGFzcyB7CiAKIEdUeXBlIHdlYmtpdF9pbnB1dF9tZXRob2RfY29udGV4dF9pbXBs X2d0a19nZXRfdHlwZSgpOwogV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0KiB3ZWJraXRJbnB1dE1l dGhvZENvbnRleHRJbXBsR3RrTmV3KCk7Ci12b2lkIHdlYmtpdElucHV0TWV0aG9kQ29udGV4dElt cGxHdGtTZXRDbGllbnRXaW5kb3coV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0SW1wbEd0ayosIEdk a1dpbmRvdyopOwordm9pZCB3ZWJraXRJbnB1dE1ldGhvZENvbnRleHRJbXBsR3RrU2V0Q2xpZW50 V2lkZ2V0KFdlYktpdElucHV0TWV0aG9kQ29udGV4dEltcGxHdGsqLCBHdGtXaWRnZXQqKTsKIAog R19FTkRfREVDTFMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBlMTY0NzY2ZDVmNjEuLmMwNzg5NzA2MDkzYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZS5jcHAKQEAgLTUzMCwxMSArNTMwLDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZp ZXdCYXNlUmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBHZGtXaW5kb3cqIHdpbmRvdyA9 IGdka193aW5kb3dfbmV3KGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3cod2lkZ2V0KSwgJmF0 dHJpYnV0ZXMsIGF0dHJpYnV0ZXNNYXNrKTsKICAgICBndGtfd2lkZ2V0X3NldF93aW5kb3cod2lk Z2V0LCB3aW5kb3cpOwogICAgIGdka193aW5kb3dfc2V0X3VzZXJfZGF0YSh3aW5kb3csIHdpZGdl dCk7CisjZW5kaWYKIAogICAgIGF1dG8qIGltQ29udGV4dCA9IHByaXYtPmlucHV0TWV0aG9kRmls dGVyLmNvbnRleHQoKTsKICAgICBpZiAoV0VCS0lUX0lTX0lOUFVUX01FVEhPRF9DT05URVhUX0lN UExfR1RLKGltQ29udGV4dCkpCi0gICAgICAgIHdlYmtpdElucHV0TWV0aG9kQ29udGV4dEltcGxH dGtTZXRDbGllbnRXaW5kb3coV0VCS0lUX0lOUFVUX01FVEhPRF9DT05URVhUX0lNUExfR1RLKGlt Q29udGV4dCksIHdpbmRvdyk7Ci0jZW5kaWYKKyAgICAgICAgd2Via2l0SW5wdXRNZXRob2RDb250 ZXh0SW1wbEd0a1NldENsaWVudFdpZGdldChXRUJLSVRfSU5QVVRfTUVUSE9EX0NPTlRFWFRfSU1Q TF9HVEsoaW1Db250ZXh0KSwgd2lkZ2V0KTsKIAogICAgIGlmIChwcml2LT5hY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZSkKICAgICAgICAgcHJpdi0+YWNjZWxlcmF0ZWRCYWNraW5nU3RvcmUtPnJlYWxp emUoKTsKQEAgLTU0Niw3ICs1NDYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVVu cmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKIAogICAgIGF1dG8qIGltQ29udGV4dCA9IHdlYlZp ZXctPnByaXYtPmlucHV0TWV0aG9kRmlsdGVyLmNvbnRleHQoKTsKICAgICBpZiAoV0VCS0lUX0lT X0lOUFVUX01FVEhPRF9DT05URVhUX0lNUExfR1RLKGltQ29udGV4dCkpCi0gICAgICAgIHdlYmtp dElucHV0TWV0aG9kQ29udGV4dEltcGxHdGtTZXRDbGllbnRXaW5kb3coV0VCS0lUX0lOUFVUX01F VEhPRF9DT05URVhUX0lNUExfR1RLKGltQ29udGV4dCksIG51bGxwdHIpOworICAgICAgICB3ZWJr aXRJbnB1dE1ldGhvZENvbnRleHRJbXBsR3RrU2V0Q2xpZW50V2lkZ2V0KFdFQktJVF9JTlBVVF9N RVRIT0RfQ09OVEVYVF9JTVBMX0dUSyhpbUNvbnRleHQpLCBudWxscHRyKTsKIAogICAgIGlmICh3 ZWJWaWV3LT5wcml2LT5hY2NlbGVyYXRlZEJhY2tpbmdTdG9yZSkKICAgICAgICAgd2ViVmlldy0+ cHJpdi0+YWNjZWxlcmF0ZWRCYWNraW5nU3RvcmUtPnVucmVhbGl6ZSgpOwpAQCAtMTAwMCw3ICsx MDAwLDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlS2V5UHJlc3NFdmVudChH dGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRLZXkqIGsKICAgICBhdXRvIGZpbHRlclJlc3VsdCA9 IHByaXYtPmlucHV0TWV0aG9kRmlsdGVyLmZpbHRlcktleUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8 R2RrRXZlbnQqPihrZXlFdmVudCkpOwogICAgIGlmICghZmlsdGVyUmVzdWx0LmhhbmRsZWQpIHsK ICAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktl eWJvYXJkRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGtleUV2ZW50KSwgZmlsdGVy UmVzdWx0LmtleVRleHQsCi0gICAgICAgICAgICBOYXRpdmVXZWJLZXlib2FyZEV2ZW50OjpIYW5k bGVkQnlJbnB1dE1ldGhvZDo6Tm8sIFdURjo6bnVsbG9wdCwgV1RGOjpudWxsb3B0LCBwcml2LT5r ZXlCaW5kaW5nVHJhbnNsYXRvci5jb21tYW5kc0ZvcktleUV2ZW50KGtleUV2ZW50KSkpOworICAg ICAgICAgICAgcHJpdi0+a2V5QmluZGluZ1RyYW5zbGF0b3IuY29tbWFuZHNGb3JLZXlFdmVudChr ZXlFdmVudCkpKTsKICAgICB9CiAKICAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7CkBAIC0xMDEx LDEwICsxMDExLDggQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlS2V5UmVsZWFz ZUV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEtleSoKICAgICBXZWJLaXRXZWJWaWV3 QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwogICAgIFdl YktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwogCi0gICAg aWYgKCFwcml2LT5pbnB1dE1ldGhvZEZpbHRlci5maWx0ZXJLZXlFdmVudChyZWludGVycHJldF9j YXN0PEdka0V2ZW50Kj4oa2V5RXZlbnQpKS5oYW5kbGVkKSB7Ci0gICAgICAgIHByaXYtPnBhZ2VQ cm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRpdmVXZWJLZXlib2FyZEV2ZW50KHJlaW50ZXJw cmV0X2Nhc3Q8R2RrRXZlbnQqPihrZXlFdmVudCksIHsgfSwKLSAgICAgICAgICAgIE5hdGl2ZVdl YktleWJvYXJkRXZlbnQ6OkhhbmRsZWRCeUlucHV0TWV0aG9kOjpObywgV1RGOjpudWxsb3B0LCBX VEY6Om51bGxvcHQsIHsgfSkpOwotICAgIH0KKyAgICBpZiAoIXByaXYtPmlucHV0TWV0aG9kRmls dGVyLmZpbHRlcktleUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihrZXlFdmVudCkp LmhhbmRsZWQpCisgICAgICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChO YXRpdmVXZWJLZXlib2FyZEV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihrZXlFdmVu dCksIHsgfSwgeyB9KSk7CiAKICAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7CiB9CkBAIC0xMDI0 LDExICsxMDIyLDEzIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZUtleVJlbGVh c2VFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRLZXkqCiBzdGF0aWMgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUZvY3VzRW50ZXIoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlLCBH dGtFdmVudENvbnRyb2xsZXIqKQogewogICAgIHdlYmtpdFdlYlZpZXdCYXNlU2V0Rm9jdXMod2Vi Vmlld0Jhc2UsIHRydWUpOworICAgIHdlYlZpZXdCYXNlLT5wcml2LT5pbnB1dE1ldGhvZEZpbHRl ci5ub3RpZnlGb2N1c2VkSW4oKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VG b2N1c0xlYXZlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgR3RrRXZlbnRDb250cm9s bGVyKikKIHsKICAgICB3ZWJraXRXZWJWaWV3QmFzZVNldEZvY3VzKHdlYlZpZXdCYXNlLCBmYWxz ZSk7CisgICAgd2ViVmlld0Jhc2UtPnByaXYtPmlucHV0TWV0aG9kRmlsdGVyLm5vdGlmeUZvY3Vz ZWRPdXQoKTsKIH0KIAogc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlS2V5UHJlc3Nl ZChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIHVuc2lnbmVkIGtleXZhbCwgdW5zaWdu ZWQsIEdka01vZGlmaWVyVHlwZSBzdGF0ZSwgR3RrRXZlbnRDb250cm9sbGVyKiBjb250cm9sbGVy KQpAQCAtMTA3Myw3ICsxMDczLDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNl S2V5UHJlc3NlZChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIHVuc2kKICAgICBhdXRv IGZpbHRlclJlc3VsdCA9IHByaXYtPmlucHV0TWV0aG9kRmlsdGVyLmZpbHRlcktleUV2ZW50KGV2 ZW50KTsKICAgICBpZiAoIWZpbHRlclJlc3VsdC5oYW5kbGVkKSB7CiAgICAgICAgIHByaXYtPnBh Z2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRpdmVXZWJLZXlib2FyZEV2ZW50KGV2ZW50 LCBmaWx0ZXJSZXN1bHQua2V5VGV4dCwKLSAgICAgICAgICAgIE5hdGl2ZVdlYktleWJvYXJkRXZl bnQ6OkhhbmRsZWRCeUlucHV0TWV0aG9kOjpObywgV1RGOjpudWxsb3B0LCBXVEY6Om51bGxvcHQs IHByaXYtPmtleUJpbmRpbmdUcmFuc2xhdG9yLmNvbW1hbmRzRm9yS2V5RXZlbnQoR1RLX0VWRU5U X0NPTlRST0xMRVJfS0VZKGNvbnRyb2xsZXIpKSkpOworICAgICAgICAgICAgcHJpdi0+a2V5Qmlu ZGluZ1RyYW5zbGF0b3IuY29tbWFuZHNGb3JLZXlFdmVudChHVEtfRVZFTlRfQ09OVFJPTExFUl9L RVkoY29udHJvbGxlcikpKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIEdES19FVkVOVF9TVE9QOwpA QCAtMTA4NCwxMCArMTA4NCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlS2V5UmVs ZWFzZWQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlLCB1bnNpZ25lCiAgICAgV2ViS2l0 V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmlld0Jhc2UtPnByaXY7CiAKICAgICBhdXRv KiBldmVudCA9IGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50KGNvbnRyb2xs ZXIpOwotICAgIGlmICghcHJpdi0+aW5wdXRNZXRob2RGaWx0ZXIuZmlsdGVyS2V5RXZlbnQoZXZl bnQpLmhhbmRsZWQpIHsKLSAgICAgICAgcHJpdi0+cGFnZVByb3h5LT5oYW5kbGVLZXlib2FyZEV2 ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoZXZlbnQsIHsgfSwKLSAgICAgICAgICAgIE5hdGl2 ZVdlYktleWJvYXJkRXZlbnQ6OkhhbmRsZWRCeUlucHV0TWV0aG9kOjpObywgV1RGOjpudWxsb3B0 LCBXVEY6Om51bGxvcHQsIHsgfSkpOwotICAgIH0KKyAgICBpZiAoIXByaXYtPmlucHV0TWV0aG9k RmlsdGVyLmZpbHRlcktleUV2ZW50KGV2ZW50KS5oYW5kbGVkKQorICAgICAgICBwcml2LT5wYWdl UHJveHktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChldmVudCwg eyB9LCB7IH0pKTsKIH0KICNlbmRpZgogCkBAIC0xNzQ5LDEwICsxNzQ3LDE0IEBAIHN0YXRpYyB2 b2lkIHRvcGxldmVsV2luZG93SXNBY3RpdmVDaGFuZ2VkKEd0a1dpbmRvdyogd2luZG93LCBHUGFy YW1TcGVjKiwgV2ViS2l0CiAgICAgICAgIGlmIChwcml2LT5hY3Rpdml0eVN0YXRlICYgQWN0aXZp dHlTdGF0ZTo6V2luZG93SXNBY3RpdmUpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHBy aXYtPmFjdGl2aXR5U3RhdGUuYWRkKEFjdGl2aXR5U3RhdGU6OldpbmRvd0lzQWN0aXZlKTsKKyAg ICAgICAgaWYgKHByaXYtPmFjdGl2aXR5U3RhdGUgJiBBY3Rpdml0eVN0YXRlOjpJc0ZvY3VzZWQp CisgICAgICAgICAgICBwcml2LT5pbnB1dE1ldGhvZEZpbHRlci5ub3RpZnlGb2N1c2VkSW4oKTsK ICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIShwcml2LT5hY3Rpdml0eVN0YXRlICYgQWN0aXZp dHlTdGF0ZTo6V2luZG93SXNBY3RpdmUpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBw cml2LT5hY3Rpdml0eVN0YXRlLnJlbW92ZShBY3Rpdml0eVN0YXRlOjpXaW5kb3dJc0FjdGl2ZSk7 CisgICAgICAgIGlmIChwcml2LT5hY3Rpdml0eVN0YXRlICYgQWN0aXZpdHlTdGF0ZTo6SXNGb2N1 c2VkKQorICAgICAgICAgICAgcHJpdi0+aW5wdXRNZXRob2RGaWx0ZXIubm90aWZ5Rm9jdXNlZE91 dCgpOwogICAgIH0KIAogICAgIHdlYmtpdFdlYlZpZXdCYXNlU2NoZWR1bGVVcGRhdGVBY3Rpdml0 eVN0YXRlKHdlYlZpZXdCYXNlLCBBY3Rpdml0eVN0YXRlOjpXaW5kb3dJc0FjdGl2ZSk7CkBAIC0y NDgxLDIyICsyNDgzLDcgQEAgV2ViS2l0SW5wdXRNZXRob2RDb250ZXh0KiB3ZWJraXRXZWJWaWV3 QmFzZUdldElucHV0TWV0aG9kQ29udGV4dChXZWJLaXRXZWJWaWV3QmEKIAogdm9pZCB3ZWJraXRX ZWJWaWV3QmFzZVN5bnRoZXNpemVDb21wb3NpdGlvbktleVByZXNzKFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJWaWV3QmFzZSwgY29uc3QgU3RyaW5nJiB0ZXh0LCBPcHRpb25hbDxWZWN0b3I8Q29tcG9z aXRpb25VbmRlcmxpbmU+PiYmIHVuZGVybGluZXMsIE9wdGlvbmFsPEVkaXRpbmdSYW5nZT4mJiBz ZWxlY3Rpb25SYW5nZSkKIHsKLSNpZiAhVVNFKEdUSzQpCi0gICAgc3RhdGljIEdka0V2ZW50KiBl dmVudCA9IG51bGxwdHI7Ci0gICAgaWYgKCFldmVudCkgewotICAgICAgICBldmVudCA9IGdka19l dmVudF9uZXcoR0RLX0tFWV9QUkVTUyk7Ci0gICAgICAgIGV2ZW50LT5rZXkudGltZSA9IEdES19D VVJSRU5UX1RJTUU7Ci0KLSAgICAgICAgLy8gVGhlIFdpbmRvd3MgY29tcG9zaXRpb24ga2V5IGV2 ZW50IGNvZGUgaXMgMjk5IG9yIFZLX1BST0NFU1NLRVkuIFdlIG5lZWQgdG8KLSAgICAgICAgLy8g ZW1pdCB0aGlzIGNvZGUgZm9yIHdlYiBjb21wYXRpYmlsaXR5IHJlYXNvbnMgd2hlbiBrZXkgZXZl bnRzIHRyaWdnZXIKLSAgICAgICAgLy8gY29tcG9zaXRpb24gcmVzdWx0cy4gR0RLIGRvZXNuJ3Qg aGF2ZSBhbiBlcXVpdmFsZW50LCBzbyB3ZSBzZW5kIFZvaWRTeW1ib2wKLSAgICAgICAgLy8gaGVy ZSB0byBXZWJDb3JlLiBQbGF0Zm9ybUtleUV2ZW50IGNvbnZlcnRzIHRoaXMgY29kZSBpbnRvIFZL X1BST0NFU1NLRVkuCi0gICAgICAgIGV2ZW50LT5rZXkua2V5dmFsID0gR0RLX0tFWV9Wb2lkU3lt Ym9sOwotICAgIH0KLQotICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZp ZXdCYXNlLT5wcml2OwotICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChO YXRpdmVXZWJLZXlib2FyZEV2ZW50KGV2ZW50LCB0ZXh0LCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50 OjpIYW5kbGVkQnlJbnB1dE1ldGhvZDo6WWVzLCBXVEZNb3ZlKHVuZGVybGluZXMpLCBXVEZNb3Zl KHNlbGVjdGlvblJhbmdlKSwgeyB9KSk7Ci0jZW5kaWYKKyAgICB3ZWJWaWV3QmFzZS0+cHJpdi0+ cGFnZVByb3h5LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQodGV4 dCwgV1RGTW92ZSh1bmRlcmxpbmVzKSwgV1RGTW92ZShzZWxlY3Rpb25SYW5nZSkpKTsKIH0KIAog c3RhdGljIGlubGluZSBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiB0b1dlYktpdE1vZGlm aWVycyh1bnNpZ25lZCBtb2RpZmllcnMpCg==