86925 2012-05-18 16:52:16 -0700 [GTK] REGRESSION(r116135): Keys that confirm composition trigger a default action 2012-05-22 11:36:44 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson gustavo oldest_to_newest 628261 0 mrobinson 2012-05-18 16:52:16 -0700 When completing a composition with a key press it triggers the default action. An example of this is finish a compose sequence with space bar causing the page to scroll. 628442 1 142873 mrobinson 2012-05-19 10:20:16 -0700 Created attachment 142873 Patch 629367 2 142873 gustavo 2012-05-21 12:17:33 -0700 Comment on attachment 142873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142873&action=review Thanks =) > Source/WebCore/ChangeLog:13 > + * platform/gtk/CompositionResults.h: Instead of holding composition results, just hold > + hold a flag describing whether or not this event had results. too much hold > Source/WebKit/gtk/WebCoreSupport/WebViewInputMethodFilter.cpp:63 > + PlatformKeyboardEvent platformEvent(event, CompositionResults(CompositionResults::WillSendCompositionResultsSoon)); Nice trick to make the code more readable =) 630594 3 mrobinson 2012-05-22 11:36:44 -0700 Committed r118010: <http://trac.webkit.org/changeset/118010> 142873 2012-05-19 10:20:16 -0700 2012-05-21 12:17:33 -0700 Patch bug-86925-20120519102015.patch text/plain 10602 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFhMDIwODk3NTAxOWJm NDcwNzI4MDc3YTY2ZmVkYjgzZTY0MWE3Ni4uZTIxZWVjNjM1Y2QxZGY3NGY2MjYwMmEzMDExMzQx ZDJhZGMzYWIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1LTE4ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBSRUdS RVNTSU9OKHIxMTYxMzUpOiBLZXlzIHRoYXQgY29uZmlybSBjb21wb3NpdGlvbiB0cmlnZ2VyIGEg ZGVmYXVsdCBhY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg2OTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLiBDcmVhdGluZyB0ZXN0cyBmb3IgR1RLKyBpbnB1dCBtZXRob2Rz IGlzIHF1aXRlIGRpZmZpY3VsdCwgYXMgdGhleQorICAgICAgICBjYW4gZGlmZmVyIGZyb20gbWFj aGluZSB0byBtYWNoaW5lLiBJdCdzIGFsc28gaGFyZCB0byBzaW11bGF0ZSBjb21wb3NpdGlvbgor ICAgICAgICBzZXF1ZW5jZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvQ29tcG9zaXRpb25S ZXN1bHRzLmg6IEluc3RlYWQgb2YgaG9sZGluZyBjb21wb3NpdGlvbiByZXN1bHRzLCBqdXN0IGhv bGQKKyAgICAgICAgaG9sZCBhIGZsYWcgZGVzY3JpYmluZyB3aGV0aGVyIG9yIG5vdCB0aGlzIGV2 ZW50IGhhZCByZXN1bHRzLgorICAgICAgICAoQ29tcG9zaXRpb25SZXN1bHRzKToKKwogMjAxMi0w NS0xNiAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAg Rml4IHRoZSBpbmRleGVkIGRhdGFiYXNlIGJ1aWxkIGZvciBHVEsrLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmlu ZGV4IDZjMmMwNjIzZWM4ZWM0M2FiMTNiYzVkN2FlYTlkNzE0Y2JlOTY0ZGQuLjVlYjA5NGYyYzNl MDc5NGNlODEyYWJlMmE1YzMxN2RmZjEyM2IwN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyOCBAQAorMjAxMi0wNS0xOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gUkVHUkVTU0lPTihyMTE2MTM1KTogS2V5cyB0aGF0IGNvbmZp cm0gY29tcG9zaXRpb24gdHJpZ2dlciBhIGRlZmF1bHQgYWN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjkyNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2Ygc2VuZGluZyBjb21wb3Np dGlvbiByZXN1bHRzIHdpdGggYSBrZXlkb3duIGV2ZW50LCBzaW1wbHkgc2VuZCB3aGV0aGVyCisg ICAgICAgIG9yIG5vdCB0aGUgZXZlbnQgaGFkIHJlc3VsdHMuIEFjdGl2YXRlIHRoZSByZXN1bHRz IGFmdGVyIHByb2Nlc3NpbmcgdGhlIGV2ZW50LiBUaGlzCisgICAgICAgIGFsbG93cyBmb3IgaW5w dXQgbWV0aG9kcyB0byBtb2RpZnkgdGhlIERPTSBhZnRlciB0aGUga2V5ZG93biBldmVudCBhbmQg dG8gc3RpbGwKKyAgICAgICAgcHJldmVudCB0aGUgZGVmYXVsdCBhY3Rpb24gZHVyaW5nIGhhbmRs ZUlucHV0TWV0aG9kS2V5ZG93bi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNs aWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6cmVzcG9uZFRvQ2hh bmdlZFNlbGVjdGlvbik6IFRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgbV91cGRhdGluZ0NvbXBvc2l0 aW9uCisgICAgICAgIHNvIHdlIG5vIGxvbmdlciBoYXZlIHRvIGNoZWNrIGl0IGhlcmUuCisgICAg ICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6a2V5Ym9hcmRFdmVudEhhZENvbXBvc2l0aW9uUmVz dWx0cyk6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OmhhbmRsZUlucHV0 TWV0aG9kS2V5ZG93bik6IE5vdyBwcmV2ZW50IHRoZSBkZWZhdWx0IGFjdGlvbiB3aGVuCisgICAg ICAgIHRoZSBrZXlib2FyZCBldmVudCBoYWQgY29tcG9zaXRpb24gcmVzdWx0cy4KKyAgICAgICAg KFdlYktpdDo6RWRpdG9yQ2xpZW50OjpFZGl0b3JDbGllbnQpOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0VkaXRvckNsaWVudEd0ay5oOiBSZW1vdmUgdGhlIG1fdXBkYXRpbmdDb21wb3NpdGlv biBtZW1iZXIsIGFzIGl0J3Mgbm8KKyAgICAgICAgbG9uZ2VyIHVzZWQuCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvV2ViVmlld0lucHV0TWV0aG9kRmlsdGVyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0lucHV0TWV0aG9kRmlsdGVyOjpzZW5kS2V5RXZlbnRXaXRoQ29tcG9zaXRpb25S ZXN1bHRzKTogTm93IHNlbmQgdGhlCisgICAgICAgIGNvbXBvc2l0aW9uIHJlc3VsdHMgYWZ0ZXIg dGhlIGtleSBldmVudC4KKwogMjAxMi0wNS0xNCAgVGhpYWdvIE1hcmNvcyBQLiBTYW50b3MgIDx0 aGlhZ28uc2FudG9zQGludGVsLmNvbT4KIAogICAgICAgICBbR1RLXSBXcm9uZyBkb2N1bWVudGF0 aW9uIGZvciBXZWIgRGF0YWJhc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9Db21wb3NpdGlvblJlc3VsdHMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9D b21wb3NpdGlvblJlc3VsdHMuaAppbmRleCA4N2Y1YmY3YzlmOTUzNmZhNzc1NmM2ODAzZmVlMTgx ZjBiYjFlZDU4Li5jNDVmMjNiYjU5NmU4YzJlYWViMzI5NzEwZGY0OGU0NzRjN2VjNDUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29tcG9zaXRpb25SZXN1bHRzLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0NvbXBvc2l0aW9uUmVzdWx0cy5oCkBA IC0zMiwzOCArMzIsMzIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdHJ1Y3QgQ29tcG9zaXRp b25SZXN1bHRzIHsKICAgICBDb21wb3NpdGlvblJlc3VsdHMoKQotICAgICAgICA6IHByZWVkaXRD dXJzb3JPZmZzZXQoMCkKKyAgICAgICAgOiBhc3NvY2lhdGVkV2l0aFBlbmRpbmdDb21wb3NpdGlv blVwZGF0ZShmYWxzZSkKICAgICB7CiAgICAgfQogCiAgICAgQ29tcG9zaXRpb25SZXN1bHRzKFN0 cmluZyBzaW1wbGVTdHJpbmcpCiAgICAgICAgIDogc2ltcGxlU3RyaW5nKHNpbXBsZVN0cmluZykK LSAgICAgICAgLCBwcmVlZGl0Q3Vyc29yT2Zmc2V0KDApCisgICAgICAgICwgYXNzb2NpYXRlZFdp dGhQZW5kaW5nQ29tcG9zaXRpb25VcGRhdGUoZmFsc2UpCiAgICAgewogICAgIH0KIAotICAgIENv bXBvc2l0aW9uUmVzdWx0cyhTdHJpbmcgY29uZmlybWVkQ29tcG9zaXRpb24sIFN0cmluZyBwcmVl ZGl0LCBpbnQgcHJlZWRpdEN1cnNvck9mZnNldCkKLSAgICAgICAgOiBjb25maXJtZWRDb21wb3Np dGlvbihjb25maXJtZWRDb21wb3NpdGlvbikKLSAgICAgICAgLCBwcmVlZGl0KHByZWVkaXQpCi0g ICAgICAgICwgcHJlZWRpdEN1cnNvck9mZnNldChwcmVlZGl0Q3Vyc29yT2Zmc2V0KQorICAgIGVu dW0gUmVzdWx0c0luZGljYXRvciB7IFdpbGxTZW5kQ29tcG9zaXRpb25SZXN1bHRzU29vbiB9Owor ICAgIENvbXBvc2l0aW9uUmVzdWx0cyhSZXN1bHRzSW5kaWNhdG9yKQorICAgICAgICA6IGFzc29j aWF0ZWRXaXRoUGVuZGluZ0NvbXBvc2l0aW9uVXBkYXRlKHRydWUpCiAgICAgewogICAgIH0KIAog ICAgIGJvb2wgY29tcG9zaXRpb25VcGRhdGVkKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVy biAhY29uZmlybWVkQ29tcG9zaXRpb24uaXNOdWxsKCkgfHwgIXByZWVkaXQuaXNOdWxsKCk7Cisg ICAgICAgIHJldHVybiBhc3NvY2lhdGVkV2l0aFBlbmRpbmdDb21wb3NpdGlvblVwZGF0ZTsKICAg ICB9CiAKICAgICAvLyBTb21lIHNpbXBsZSBpbnB1dCBtZXRob2RzIHJldHVybiBhIHN0cmluZyBm b3IgYWxsIGtleWJvYXJkIGV2ZW50cy4gVGhpcwogICAgIC8vIHZhbHVlIHNob3VsZCBiZSB0cmVh dGVkIGFzIHRoZSBzdHJpbmcgcmVwcmVzZW50YXRpb24gb2YgdGhlIGtleWNvZGUuCiAgICAgU3Ry aW5nIHNpbXBsZVN0cmluZzsKIAotICAgIC8vIElmIHRoZSBpbnB1dCBtZXRob2QgaGFkIGEgInJl YWwiIGNvbXBvc2l0aW9uIGl0IHdpbGwgYmUgc3RvcmVkIGhlcmUuCi0gICAgU3RyaW5nIGNvbmZp cm1lZENvbXBvc2l0aW9uOwotCi0gICAgLy8gVGhlIGV2ZW50IG1heSBoYXZlIGNhdXNlZCB0aGUg cHJlZWRpdCB0byB1cGRhdGUuCi0gICAgU3RyaW5nIHByZWVkaXQ7Ci0gICAgaW50IHByZWVkaXRD dXJzb3JPZmZzZXQ7CisgICAgYm9vbCBhc3NvY2lhdGVkV2l0aFBlbmRpbmdDb21wb3NpdGlvblVw ZGF0ZTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0VkaXRvckNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9FZGl0b3JDbGllbnRHdGsuY3BwCmluZGV4IDBlNTI1NjQzNjAxZDk2N2RkOTQxZTFkOGY0NDUx NjhiMjRkMTRkMzUuLmVkOTgwZDIwNjhlY2ZmYjIxYjgwN2Q4YWJjZDAwOTQ4NDMxMWJlZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0 ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50 R3RrLmNwcApAQCAtMjYyLDcgKzI2Miw3IEBAIHZvaWQgRWRpdG9yQ2xpZW50OjpyZXNwb25kVG9D aGFuZ2VkU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSkKICAgICBzZXRTZWxlY3Rpb25QcmltYXJ5Q2xp cGJvYXJkSWZOZWVkZWQobV93ZWJWaWV3KTsKICNlbmRpZgogCi0gICAgaWYgKG1fdXBkYXRpbmdD b21wb3NpdGlvbiB8fCAhZnJhbWUtPmVkaXRvcigpLT5oYXNDb21wb3NpdGlvbigpIHx8IGZyYW1l LT5lZGl0b3IoKS0+aWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoKSkKKyAgICBpZiAo IWZyYW1lLT5lZGl0b3IoKS0+aGFzQ29tcG9zaXRpb24oKSB8fCBmcmFtZS0+ZWRpdG9yKCktPmln bm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlKCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IHVuc2lnbmVkIHN0YXJ0OwpAQCAtNDE4LDcgKzQxOCw3IEBAIGJvb2wgRWRpdG9yQ2xpZW50Ojpl eGVjdXRlUGVuZGluZ0VkaXRvckNvbW1hbmRzKEZyYW1lKiBmcmFtZSwgYm9vbCBhbGxvd1RleHRJ bnNlCiAgICAgcmV0dXJuIHN1Y2Nlc3M7CiB9CiAKLWJvb2wgRWRpdG9yQ2xpZW50OjpoYW5kbGVJ bnB1dE1ldGhvZEtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpCitzdGF0aWMgYm9v bCBrZXlib2FyZEV2ZW50SGFkQ29tcG9zaXRpb25SZXN1bHRzKEtleWJvYXJkRXZlbnQqIGV2ZW50 KQogewogICAgIGlmIChldmVudC0+dHlwZSgpICE9IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQp CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTQyNywzMyArNDI3LDcgQEAgYm9vbCBFZGl0b3JD bGllbnQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBldmVu dCkKICAgICBpZiAoIXBsYXRmb3JtRXZlbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IEZyYW1lKiBmcmFtZSA9IGNvcmUobV93ZWJWaWV3KS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3Vz ZWRPck1haW5GcmFtZSgpOwotICAgIGlmICghZnJhbWUgfHwgIWZyYW1lLT5lZGl0b3IoKS0+Y2Fu RWRpdCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBjb25zdCBDb21wb3NpdGlvblJl c3VsdHMmIGNvbXBvc2l0aW9uUmVzdWx0cyA9IHBsYXRmb3JtRXZlbnQtPmNvbXBvc2l0aW9uUmVz dWx0cygpOwotICAgIGlmICghY29tcG9zaXRpb25SZXN1bHRzLmNvbXBvc2l0aW9uVXBkYXRlZCgp KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBtX3VwZGF0aW5nQ29tcG9zaXRpb24gPSB0 cnVlOwotCi0gICAgLy8gUGxhdGZvcm1LZXlib2FyZEV2ZW50IHJldHVybnMgYW4gZW1wdHkgc3Ry aW5nIHdoZW4gdGhlcmUgYXJlIGNvbXBvc2l0aW9uIHJlc3VsdHMuCi0gICAgLy8gVGhhdCBwcmV2 ZW50cyB0aGUgZGVsaXZlcnkgb2Yga2V5cHJlc3MsIHdoaWNoIGlzIHRoZSBiZWhhdmlvciB3ZSB3 YW50IGZvciBjb21wb3NpdGlvbgotICAgIC8vIGV2ZW50cy4gU2VlIEV2ZW50SGFuZGxlcjo6a2V5 RXZlbnQuIAotICAgIEFTU0VSVChwbGF0Zm9ybUV2ZW50LT50ZXh0KCkuaXNOdWxsKCkpOwotCi0g ICAgaWYgKCFjb21wb3NpdGlvblJlc3VsdHMuY29uZmlybWVkQ29tcG9zaXRpb24uaXNOdWxsKCkp Ci0gICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29uZmlybUNvbXBvc2l0aW9uKGNvbXBvc2l0aW9u UmVzdWx0cy5jb25maXJtZWRDb21wb3NpdGlvbik7Ci0KLSAgICBTdHJpbmcgcHJlZWRpdCA9IGNv bXBvc2l0aW9uUmVzdWx0cy5wcmVlZGl0OwotICAgIGlmICghcHJlZWRpdC5pc051bGwoKSkgewot ICAgICAgICBWZWN0b3I8Q29tcG9zaXRpb25VbmRlcmxpbmU+IHVuZGVybGluZXM7Ci0gICAgICAg IHVuZGVybGluZXMuYXBwZW5kKENvbXBvc2l0aW9uVW5kZXJsaW5lKDAsIHByZWVkaXQubGVuZ3Ro KCksIENvbG9yKDEsIDEsIDEpLCBmYWxzZSkpOwotICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnNl dENvbXBvc2l0aW9uKHByZWVkaXQsIHVuZGVybGluZXMsIGNvbXBvc2l0aW9uUmVzdWx0cy5wcmVl ZGl0Q3Vyc29yT2Zmc2V0LCBjb21wb3NpdGlvblJlc3VsdHMucHJlZWRpdEN1cnNvck9mZnNldCk7 Ci0gICAgfQotCi0gICAgbV91cGRhdGluZ0NvbXBvc2l0aW9uID0gZmFsc2U7Ci0gICAgcmV0dXJu IHRydWU7CisgICAgcmV0dXJuIHBsYXRmb3JtRXZlbnQtPmNvbXBvc2l0aW9uUmVzdWx0cygpLmNv bXBvc2l0aW9uVXBkYXRlZCgpOwogfQogCiB2b2lkIEVkaXRvckNsaWVudDo6aGFuZGxlS2V5Ym9h cmRFdmVudChLZXlib2FyZEV2ZW50KiBldmVudCkKQEAgLTQ2Nyw3ICs0NDEsNyBAQCB2b2lkIEVk aXRvckNsaWVudDo6aGFuZGxlS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBldmVudCkKICAg ICBpZiAoIXBsYXRmb3JtRXZlbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChoYW5kbGVJ bnB1dE1ldGhvZEtleWJvYXJkRXZlbnQoZXZlbnQpKQorICAgIGlmIChrZXlib2FyZEV2ZW50SGFk Q29tcG9zaXRpb25SZXN1bHRzKGV2ZW50KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgS2V5Qmlu ZGluZ1RyYW5zbGF0b3I6OkV2ZW50VHlwZSB0eXBlID0gZXZlbnQtPnR5cGUoKSA9PSBldmVudE5h bWVzKCkua2V5ZG93bkV2ZW50ID8KQEAgLTUxOSw2ICs0OTMsOSBAQCB2b2lkIEVkaXRvckNsaWVu dDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIC8v IElucHV0IG1ldGhvZCByZXN1bHRzIGFyZSBoYW5kbGVkIGluIGhhbmRsZUtleWJvYXJkRXZlbnQs IHNvIHRoYXQgd2UgY2FuIHdhaXQKICAgICAvLyB0byB0cmlnZ2VyIGNvbXBvc2l0aW9uIHVwZGF0 ZXMgdW50aWwgYWZ0ZXIgdGhlIGtleWRvd24gZXZlbnQgaGFuZGxlci4gVGhpcyBiZXR0ZXIKICAg ICAvLyBtYXRjaGVzIG90aGVyIGJyb3dzZXJzLgorICAgIGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRF dmVudCogcGxhdGZvcm1FdmVudCA9IGV2ZW50LT5rZXlFdmVudCgpOworICAgIGlmIChwbGF0Zm9y bUV2ZW50ICYmIHBsYXRmb3JtRXZlbnQtPmNvbXBvc2l0aW9uUmVzdWx0cygpLmNvbXBvc2l0aW9u VXBkYXRlZCgpKQorICAgICAgICBldmVudC0+cHJldmVudERlZmF1bHQoKTsKIH0KIAogRWRpdG9y Q2xpZW50OjpFZGl0b3JDbGllbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKQEAgLTUyOCw3ICs1 MDUsNiBAQCBFZGl0b3JDbGllbnQ6OkVkaXRvckNsaWVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQogI2VuZGlmCiAgICAgLCBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fc21hcnRJbnNlcnRE ZWxldGVFbmFibGVkKGZhbHNlKQotICAgICwgbV91cGRhdGluZ0NvbXBvc2l0aW9uKGZhbHNlKQog ewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0 b3JDbGllbnRHdGsuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNs aWVudEd0ay5oCmluZGV4IDM2MTJkOTAwMzFiMGUyODNjMDU2ZDc4ZWUxNDhhYzg5MGI1YzgzZDQu Ljc2YWI2ZTNiNDMzZjA4NTdkNTJlMDExNjc4MGNkMjdlNDQxOGVkYTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5oCkBAIC0xMzQs OCArMTM0LDYgQEAgY2xhc3MgRWRpdG9yQ2xpZW50IDogcHVibGljIFdlYkNvcmU6OkVkaXRvckNs aWVudCB7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRTaG93VW5pY29kZU1lbnUoKTsKIAog ICAgIHByaXZhdGU6Ci0gICAgICAgIGJvb2wgaGFuZGxlSW5wdXRNZXRob2RLZXlib2FyZEV2ZW50 KFdlYkNvcmU6OktleWJvYXJkRXZlbnQqKTsKLQogI2lmIEVOQUJMRShTUEVMTENIRUNLKQogICAg ICAgICBUZXh0Q2hlY2tlckNsaWVudEd0ayBtX3RleHRDaGVja2VyQ2xpZW50OwogI2Vsc2UKQEAg LTE0NSw3ICsxNDMsNiBAQCBjbGFzcyBFZGl0b3JDbGllbnQgOiBwdWJsaWMgV2ViQ29yZTo6RWRp dG9yQ2xpZW50IHsKICAgICAgICAgV2ViQ29yZTo6S2V5QmluZGluZ1RyYW5zbGF0b3IgbV9rZXlC aW5kaW5nVHJhbnNsYXRvcjsKICAgICAgICAgVmVjdG9yPFdURjo6U3RyaW5nPiBtX3BlbmRpbmdF ZGl0b3JDb21tYW5kczsKICAgICAgICAgYm9vbCBtX3NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZDsK LSAgICAgICAgYm9vbCBtX3VwZGF0aW5nQ29tcG9zaXRpb247CiAgICAgfTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvV2ViVmlld0lucHV0TWV0aG9k RmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1dlYlZpZXdJbnB1 dE1ldGhvZEZpbHRlci5jcHAKaW5kZXggMzVjYTIzYjAxNGQ0NWY5YzRhNWQ5MTEwZDUwZjg0NzA4 OTkyYzA3Zi4uMjcwMGQ0YTU5YmVjMmZhZTZkMGNiM2U2Nzc0ZjczMDJmMTJhZWNkYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvV2ViVmlld0lucHV0TWV0aG9k RmlsdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9XZWJWaWV3 SW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC02MCwxMCArNjAsMTUgQEAgYm9vbCBXZWJWaWV3SW5w dXRNZXRob2RGaWx0ZXI6OnNlbmRTaW1wbGVLZXlFdmVudChHZGtFdmVudEtleSogZXZlbnQsIFdU Rjo6U3RyaW4KIAogYm9vbCBXZWJWaWV3SW5wdXRNZXRob2RGaWx0ZXI6OnNlbmRLZXlFdmVudFdp dGhDb21wb3NpdGlvblJlc3VsdHMoR2RrRXZlbnRLZXkqIGV2ZW50LCBSZXN1bHRzVG9TZW5kIHJl c3VsdHNUb1NlbmQpCiB7Ci0gICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50IHBsYXRmb3JtRXZlbnQo ZXZlbnQsIENvbXBvc2l0aW9uUmVzdWx0cyhyZXN1bHRzVG9TZW5kICYgQ29tcG9zaXRpb24gPyBt X2NvbmZpcm1lZENvbXBvc2l0aW9uIDogU3RyaW5nKCksCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRzVG9TZW5k ICYgUHJlZWRpdCA/IG1fcHJlZWRpdCA6IFN0cmluZygpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jdXJzb3JPZmZz ZXQpKTsKLSAgICByZXR1cm4gZm9jdXNlZE9yTWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5r ZXlFdmVudChwbGF0Zm9ybUV2ZW50KTsKKyAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQgcGxhdGZv cm1FdmVudChldmVudCwgQ29tcG9zaXRpb25SZXN1bHRzKENvbXBvc2l0aW9uUmVzdWx0czo6V2ls bFNlbmRDb21wb3NpdGlvblJlc3VsdHNTb29uKSk7CisgICAgaWYgKCFmb2N1c2VkT3JNYWluRnJh bWUoKS0+ZXZlbnRIYW5kbGVyKCktPmtleUV2ZW50KHBsYXRmb3JtRXZlbnQpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocmVzdWx0c1RvU2VuZCAmIENvbXBvc2l0aW9uICYmICFt X2NvbmZpcm1lZENvbXBvc2l0aW9uLmlzTnVsbCgpKQorICAgICAgICBjb25maXJtQ29tcG9zaXRp b25UZXh0KG1fY29uZmlybWVkQ29tcG9zaXRpb24pOworICAgIGlmIChyZXN1bHRzVG9TZW5kICYg UHJlZWRpdCAmJiAhbV9wcmVlZGl0LmlzTnVsbCgpKQorICAgICAgICBzZXRQcmVlZGl0KG1fcHJl ZWRpdCwgbV9jdXJzb3JPZmZzZXQpOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFdlYlZp ZXdJbnB1dE1ldGhvZEZpbHRlcjo6Y29uZmlybUNvbXBvc2l0aW9uVGV4dChTdHJpbmcgdGV4dCkK