58175 2011-04-08 16:38:51 -0700 WebKit2: Safari doesn't respect cmd-arrows (and variations) as custom keyboard shortcuts 2011-04-08 19:06:44 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar, Regression P2 Normal --- 1 ap ap commit-queue darin enrica oldest_to_newest 382643 0 ap 2011-04-08 16:38:51 -0700 When Cmd+Option+Arrows are configured as tab switching shortcuts, WebKit sometimes incorrectly performs a Back instead. <rdar://problem/9060555> 382651 1 88898 ap 2011-04-08 16:49:08 -0700 Created attachment 88898 proposed fix 382673 2 88898 darin 2011-04-08 17:24:16 -0700 Comment on attachment 88898 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=88898&action=review > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:545 > + if (selector == "moveUp:") I’d prefer if this was handled with some sort of hash table. I really wish there was a way to leverage the editor command machinery for this. 382676 3 ap 2011-04-08 17:29:04 -0700 Maybe we can decide to just make Editor implement these behaviors when the focus is in non-editable content. This seemed weird to me, but I can't really explain why. 382708 4 88898 commit-queue 2011-04-08 18:59:41 -0700 Comment on attachment 88898 proposed fix Clearing flags on attachment: 88898 Committed r83372: <http://trac.webkit.org/changeset/83372> 382709 5 commit-queue 2011-04-08 18:59:44 -0700 All reviewed patches have been landed. Closing bug. 382711 6 ap 2011-04-08 19:06:44 -0700 A long-standing issue that this accidentally fixes is that other standard key bindings for the same commands didn't work. For example, Ctrl+P scrolls a non-editable TextEdit document up, but that didn't work in Safari before. 88898 2011-04-08 16:49:08 -0700 2011-04-08 18:59:41 -0700 proposed fix KeyEquivalents.txt text/plain 11364 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzU1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDQtMDggIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogU2FmYXJpIGRvZXNuJ3QgcmVzcGVjdCBjbWQt YXJyb3dzIChhbmQgdmFyaWF0aW9ucykgYXMgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxNzUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzkwNjA1NTU+CisKKyAgICAgICAgVGhlIHByb2JsZW0gaXMgdGhh dCBjb21tYW5kIGhhbmRsaW5nIHNob3VsZCBiZSBkaWZmZXJlbnQgZm9yIGV2ZW50cyB0aGF0IGNv bWUgYXMga2V5RG93bjoKKyAgICAgICAgYW5kIHRob3NlIHRoYXQgY29tZSBhcyBwZXJmb3JtS2V5 RXF1aXZhbGVudDouIFdlYktpdDEgb25seSB0cmllcyBjdXN0b20gImtleSBiaW5kaW5ncyIKKyAg ICAgICAgd2hlbiBoYW5kbGluZyBhIGtleURvd246LCBsZXR0aW5nIGEgcGVyZm9ybUtleUVxdWl2 YWxlbnQ6IHJ1biB0aHJvdWdoIHRoZSB3aG9sZSByZXNwb25kZXIKKyAgICAgICAgY2hhaW4gZmly c3QuCisKKyAgICAgICAgVGhpcyB3b3VsZCBiZSB2ZXJ5IGRpZmZpY3VsdCB0byBpbXBsZW1lbnQg aW4gV2ViS2l0MiBiZWNhdXNlIG9mIGhvdyBpdCByZS1zZW5kcyB0aGUgc2FtZQorICAgICAgICBl dmVudCBhZnRlciB3ZWIgcHJvY2VzcyBoYW5kbGluZy4gTHVja2lseSwgd2UgY2FuIGJvdGggZml4 IHRoZSBidWcgYW5kIG1ha2UgdGhlIGJlaGF2aW9yCisgICAgICAgIG1vcmUgcm9idXN0IGJ5IG5v dCBoYXJkY29kaW5nIGtleSBjb21iaW5hdGlvbnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOiBFZGl0IHBlcmZvcm1Ob25FZGl0aW5nQmVoYXZpb3JGb3JTZWxlY3Rv ci4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmV4ZWN1dGVLZXlwcmVzc0NvbW1hbmRzSW50ZXJuYWwpOiBX aGVuIGV4ZWN1dGluZyBjb21tYW5kcywgYWxzbyB0cnkKKyAgICAgICAgZXhlY3V0aW5nIGVkaXRv ciBjb21tYW5kcyBpbiB0aGVpciBub24tZWRpdGluZyBtZWFuaW5nLCB3aGljaCBpcyB1c3VhbGx5 IHNjcm9sbGluZy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybU5vbkVkaXRpbmdC ZWhhdmlvckZvclNlbGVjdG9yKTogTmFpdmUgaW1wbGVtZW50YXRpb24gd2l0aCBhIGNoYWluCisg ICAgICAgIG9mIGlmcywgd2hpY2ggaXMgaG9wZWZ1bGx5IG9rIHBlcmZvcm1hbmNlLXdpc2UgZm9y IGEgZG96ZW4gY2hlY2suCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1EZWZhdWx0 QmVoYXZpb3JGb3JLZXlFdmVudCk6IE9ubHkga2VwdCB0d28gY29tbWFuZHMgaGVyZSB0aGF0IEkK KyAgICAgICAgY291bGRuJ3QgZWFzaWx5IG1vdmUuCisKIDIwMTEtMDQtMDggIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJv YmVuLgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o CShyZXZpc2lvbiA4MzMyMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxOSw2ICszMTksNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBleGVjdXRlS2V5cHJlc3NDb21tYW5kcyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6S2V5cHJl c3NDb21tYW5kPiYsIGJvb2wmIGhhbmRsZWQsIFRleHRJbnB1dFN0YXRlJiBuZXdTdGF0ZSk7CiAg ICAgdm9pZCB3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChjb25zdCBXVEY6OlN0cmluZyYgcGFz dGVib2FyZE5hbWUsIGNvbnN0IFdURjo6VmVjdG9yPFdURjo6U3RyaW5nPiYgcGFzdGVib2FyZFR5 cGVzLCBib29sJiByZXN1bHQpOwogICAgIHZvaWQgcmVhZFNlbGVjdGlvbkZyb21QYXN0ZWJvYXJk KGNvbnN0IFdURjo6U3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCYgcmVzdWx0KTsKKyAgICBi b29sIHBlcmZvcm1Ob25FZGl0aW5nQmVoYXZpb3JGb3JTZWxlY3Rvcihjb25zdCBTdHJpbmcmKTsK ICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICB2b2lkIGNvbmZpcm1Db21wb3NpdGlvbihjb25zdCBT dHJpbmcmIGNvbXBvc2l0aW9uU3RyaW5nKTsKICAgICB2b2lkIHNldENvbXBvc2l0aW9uKGNvbnN0 IFdURjo6U3RyaW5nJiBjb21wb3NpdGlvblN0cmluZywgY29uc3QgV1RGOjpWZWN0b3I8V2ViQ29y ZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVzLCB1aW50NjRfdCBjdXJzb3JQb3Np dGlvbik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh Z2VNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9XZWJQYWdlTWFjLm1tCShyZXZpc2lvbiA4MzMyMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTUy LDEzICsxNTIsMTggQEAgYm9vbCBXZWJQYWdlOjpleGVjdXRlS2V5cHJlc3NDb21tYW5kc0ludAog ICAgICAgICAgICAgZXZlbnRXYXNIYW5kbGVkIHw9IGZyYW1lLT5lZGl0b3IoKS0+aW5zZXJ0VGV4 dChjb21tYW5kc1tpXS50ZXh0LCBldmVudCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBFZGl0b3I6OkNvbW1hbmQgY29tbWFuZCA9IGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZChjb21t YW5kTmFtZUZvclNlbGVjdG9yTmFtZShjb21tYW5kc1tpXS5jb21tYW5kTmFtZSkpOwotICAgICAg ICAgICAgaWYgKGNvbW1hbmQuaXNTdXBwb3J0ZWQoKSkKLSAgICAgICAgICAgICAgICBldmVudFdh c0hhbmRsZWQgfD0gY29tbWFuZC5leGVjdXRlKGV2ZW50KTsKLSAgICAgICAgICAgIGVsc2Ugewot ICAgICAgICAgICAgICAgIGJvb2wgZXZlbnRXYXNIYW5kbGVkQnlVSVByb2Nlc3MgPSBmYWxzZTsK KyAgICAgICAgICAgIGlmIChjb21tYW5kLmlzU3VwcG9ydGVkKCkpIHsKKyAgICAgICAgICAgICAg ICBib29sIGNvbW1hbmRFeGVjdXRlZEJ5RWRpdG9yID0gY29tbWFuZC5leGVjdXRlKGV2ZW50KTsK KyAgICAgICAgICAgICAgICBldmVudFdhc0hhbmRsZWQgfD0gY29tbWFuZEV4ZWN1dGVkQnlFZGl0 b3I7CisgICAgICAgICAgICAgICAgaWYgKCFjb21tYW5kRXhlY3V0ZWRCeUVkaXRvcikgeworICAg ICAgICAgICAgICAgICAgICBib29sIHBlcmZvcm1lZE5vbkVkaXRpbmdCZWhhdmlvciA9IGV2ZW50 LT5rZXlFdmVudCgpLT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3du ICYmIHBlcmZvcm1Ob25FZGl0aW5nQmVoYXZpb3JGb3JTZWxlY3Rvcihjb21tYW5kc1tpXS5jb21t YW5kTmFtZSk7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50V2FzSGFuZGxlZCB8PSBwZXJmb3Jt ZWROb25FZGl0aW5nQmVoYXZpb3I7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICBib29sIGNvbW1hbmRXYXNIYW5kbGVkQnlVSVByb2Nlc3Mg PSBmYWxzZTsKICAgICAgICAgICAgICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9u KCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4ZWN1dGVTYXZlZENvbW1hbmRC eVNlbGVjdG9yKGNvbW1hbmRzW2ldLmNvbW1hbmROYW1lKSwgCi0gICAgICAgICAgICAgICAgICAg IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4ZWN1dGVTYXZlZENvbW1hbmRCeVNlbGVjdG9yOjpS ZXBseShldmVudFdhc0hhbmRsZWRCeVVJUHJvY2VzcyksIG1fcGFnZUlEKTsKLSAgICAgICAgICAg ICAgICBldmVudFdhc0hhbmRsZWQgfD0gZXZlbnRXYXNIYW5kbGVkQnlVSVByb2Nlc3M7CisgICAg ICAgICAgICAgICAgICAgIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkV4ZWN1dGVTYXZlZENvbW1h bmRCeVNlbGVjdG9yOjpSZXBseShjb21tYW5kV2FzSGFuZGxlZEJ5VUlQcm9jZXNzKSwgbV9wYWdl SUQpOworICAgICAgICAgICAgICAgIGV2ZW50V2FzSGFuZGxlZCB8PSBjb21tYW5kV2FzSGFuZGxl ZEJ5VUlQcm9jZXNzOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtNTM1LDg1 ICs1NDAsNjIgQEAgdm9pZCBXZWJQYWdlOjpwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEZvcgogICAg IHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybURpY3Rpb25hcnlMb29rdXAo cmFuZ2VUZXh0LCBkaWN0aW9uYXJ5UG9wdXBJbmZvKSk7CiB9CiAKK2Jvb2wgV2ViUGFnZTo6cGVy Zm9ybU5vbkVkaXRpbmdCZWhhdmlvckZvclNlbGVjdG9yKGNvbnN0IFN0cmluZyYgc2VsZWN0b3Ip Cit7CisgICAgaWYgKHNlbGVjdG9yID09ICJtb3ZlVXA6IikKKyAgICAgICAgc2Nyb2xsKG1fcGFn ZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEJ5TGluZSk7CisgICAgZWxzZSBpZiAoc2VsZWN0b3Ig PT0gIm1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoOiIpCisgICAgICAgIHNjcm9sbChtX3BhZ2Uu Z2V0KCksIFNjcm9sbFVwLCBTY3JvbGxCeVBhZ2UpOworICAgIGVsc2UgaWYgKHNlbGVjdG9yID09 ICJtb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50OiIpIHsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5n ZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEJ5RG9jdW1lbnQpOworICAgICAgICBzY3JvbGwobV9wYWdl LmdldCgpLCBTY3JvbGxMZWZ0LCBTY3JvbGxCeURvY3VtZW50KTsKKyAgICB9IGVsc2UgaWYgKHNl bGVjdG9yID09ICJtb3ZlRG93bjoiKQorICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3Jv bGxEb3duLCBTY3JvbGxCeUxpbmUpOworICAgIGVsc2UgaWYgKHNlbGVjdG9yID09ICJtb3ZlVG9F bmRPZlBhcmFncmFwaDoiKQorICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxEb3du LCBTY3JvbGxCeVBhZ2UpOworICAgIGVsc2UgaWYgKHNlbGVjdG9yID09ICJtb3ZlVG9FbmRPZkRv Y3VtZW50OiIpIHsKKyAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Ny b2xsQnlEb2N1bWVudCk7CisgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExlZnQs IFNjcm9sbEJ5RG9jdW1lbnQpOworICAgIH0gZWxzZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVMZWZ0 OiIpCisgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExlZnQsIFNjcm9sbEJ5TGlu ZSk7CisgICAgZWxzZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVXb3JkTGVmdDoiKQorICAgICAgICBz Y3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxMZWZ0LCBTY3JvbGxCeVBhZ2UpOworICAgIGVsc2Ug aWYgKHNlbGVjdG9yID09ICJtb3ZlVG9MZWZ0RW5kT2ZMaW5lOiIpCisgICAgICAgIG1fcGFnZS0+ Z29CYWNrKCk7CisgICAgZWxzZSBpZiAoc2VsZWN0b3IgPT0gIm1vdmVSaWdodDoiKQorICAgICAg ICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxSaWdodCwgU2Nyb2xsQnlMaW5lKTsKKyAgICBl bHNlIGlmIChzZWxlY3RvciA9PSAibW92ZVdvcmRSaWdodDoiKQorICAgICAgICBzY3JvbGwobV9w YWdlLmdldCgpLCBTY3JvbGxSaWdodCwgU2Nyb2xsQnlQYWdlKTsKKyAgICBlbHNlIGlmIChzZWxl Y3RvciA9PSAibW92ZVRvUmlnaHRFbmRPZkxpbmU6IikKKyAgICAgICAgbV9wYWdlLT5nb0Zvcndh cmQoKTsKKyAgICBlbHNlCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVl OworfQorCiBib29sIFdlYlBhZ2U6OnBlcmZvcm1EZWZhdWx0QmVoYXZpb3JGb3JLZXlFdmVudChj b25zdCBXZWJLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2ZW50KQogewogICAgIGlmIChrZXlib2Fy ZEV2ZW50LnR5cGUoKSAhPSBXZWJFdmVudDo6S2V5RG93bikKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgLy8gRklYTUU6IE1vc3Qgb2YgdGhlc2UgYXJlIGFscmVhZHkgaGFuZGxlZCBieSBz eXN0ZW0ga2V5IGJpbmRpbmdzLCB3aHkgYXJlIHdlIGhhcmRjb2RpbmcgdGhlbSBoZXJlPwotICAg IC8vIEZJWE1FOiBDb21tb24gYmVoYXZpb3JzIGxpa2Ugc2Nyb2xsaW5nIGRvd24gb24gU3BhY2Ug c2hvdWxkIHByb2JhYmx5IGJlIGltcGxlbWVudGVkIGluIFdlYkNvcmUuCi0KICAgICBzd2l0Y2gg KGtleWJvYXJkRXZlbnQud2luZG93c1ZpcnR1YWxLZXlDb2RlKCkpIHsKICAgICBjYXNlIFZLX0JB Q0s6CisgICAgICAgIC8vIEZJWE1FOiBIYW5kbGluZyBCYWNrc3BhY2UgaGVyZSBtZWFucyB0aGF0 IGEga2V5cHJlc3MgRE9NIGV2ZW50IHdpbGwgYmUgZGlzcGF0Y2hlZCB3aGVuIGZvY3VzCisgICAg ICAgIC8vIGlzIG91dHNpZGUgZWRpdGFibGUgY29udGVudCwgd2hpY2ggaXMgbGlrZWx5IHdyb25n LiBJdCBzaG91bGQgYmUgbW92ZWQgdG8gcGVyZm9ybU5vbkVkaXRpbmdCZWhhdmlvckZvclNlbGVj dG9yKCksCisgICAgICAgIC8vIHdoaWNoIGlzIGNvbXBsaWNhdGVkIGJ5IHRoZSBmYWN0IHRoYXQg Ym90aCBCYWNrc3BhY2UgYW5kIFNoaWZ0K0JhY2tzcGFjZSBnZXQgdGhlIHNhbWUgY29tbWFuZC4K ICAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQuc2hpZnRLZXkoKSkKICAgICAgICAgICAgIG1fcGFn ZS0+Z29Gb3J3YXJkKCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fcGFnZS0+Z29CYWNr KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVktfU1BBQ0U6CisgICAgICAgIC8vIFNwYWNl IGlzIG5vdCB0cmFuc2xhdGVkIHRvIGEgY29tbWFuZCBieSBrZXkgYmluZGluZ3MsIHNvIHdlIG5l ZWQgdG8gaGFuZGxlIGl0IGhlcmUuCiAgICAgICAgIGlmIChrZXlib2FyZEV2ZW50LnNoaWZ0S2V5 KCkpCiAgICAgICAgICAgICBsb2dpY2FsU2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsQmxvY2tE aXJlY3Rpb25CYWNrd2FyZCwgU2Nyb2xsQnlQYWdlKTsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgbG9naWNhbFNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbEJsb2NrRGlyZWN0aW9uRm9yd2Fy ZCwgU2Nyb2xsQnlQYWdlKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBWS19QUklPUjoKLSAg ICAgICAgbG9naWNhbFNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbEJsb2NrRGlyZWN0aW9uQmFj a3dhcmQsIFNjcm9sbEJ5UGFnZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVktfTkVYVDoK LSAgICAgICAgbG9naWNhbFNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbEJsb2NrRGlyZWN0aW9u Rm9yd2FyZCwgU2Nyb2xsQnlQYWdlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBWS19IT01F OgotICAgICAgICBsb2dpY2FsU2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsQmxvY2tEaXJlY3Rp b25CYWNrd2FyZCwgU2Nyb2xsQnlEb2N1bWVudCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2Ug VktfRU5EOgotICAgICAgICBsb2dpY2FsU2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsQmxvY2tE aXJlY3Rpb25Gb3J3YXJkLCBTY3JvbGxCeURvY3VtZW50KTsKLSAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBWS19VUDoKLSAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQuc2hpZnRLZXkoKSkKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQubWV0YUtleSgp KSB7Ci0gICAgICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxVcCwgU2Nyb2xsQnlE b2N1bWVudCk7Ci0gICAgICAgICAgICBzY3JvbGwobV9wYWdlLmdldCgpLCBTY3JvbGxMZWZ0LCBT Y3JvbGxCeURvY3VtZW50KTsKLSAgICAgICAgfSBlbHNlIGlmIChrZXlib2FyZEV2ZW50LmFsdEtl eSgpIHx8IGtleWJvYXJkRXZlbnQuY29udHJvbEtleSgpKQotICAgICAgICAgICAgc2Nyb2xsKG1f cGFnZS5nZXQoKSwgU2Nyb2xsVXAsIFNjcm9sbEJ5UGFnZSk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbFVwLCBTY3JvbGxCeUxpbmUpOwotICAg ICAgICBicmVhazsKLSAgICBjYXNlIFZLX0RPV046Ci0gICAgICAgIGlmIChrZXlib2FyZEV2ZW50 LnNoaWZ0S2V5KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmIChrZXli b2FyZEV2ZW50Lm1ldGFLZXkoKSkgewotICAgICAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwg U2Nyb2xsRG93biwgU2Nyb2xsQnlEb2N1bWVudCk7Ci0gICAgICAgICAgICBzY3JvbGwobV9wYWdl LmdldCgpLCBTY3JvbGxMZWZ0LCBTY3JvbGxCeURvY3VtZW50KTsKLSAgICAgICAgfSBlbHNlIGlm IChrZXlib2FyZEV2ZW50LmFsdEtleSgpIHx8IGtleWJvYXJkRXZlbnQuY29udHJvbEtleSgpKQot ICAgICAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xsRG93biwgU2Nyb2xsQnlQYWdl KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwgU2Nyb2xs RG93biwgU2Nyb2xsQnlMaW5lKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBWS19MRUZUOgot ICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC5zaGlmdEtleSgpKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC5tZXRhS2V5KCkpCi0gICAgICAgICAg ICBtX3BhZ2UtPmdvQmFjaygpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChrZXli b2FyZEV2ZW50LmFsdEtleSgpIHx8IGtleWJvYXJkRXZlbnQuY29udHJvbEtleSgpKQotICAgICAg ICAgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbExlZnQsIFNjcm9sbEJ5UGFnZSk7 Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgc2Nyb2xsKG1fcGFnZS5nZXQoKSwg U2Nyb2xsTGVmdCwgU2Nyb2xsQnlMaW5lKTsKLSAgICAgICAgfQotICAgICAgICBicmVhazsKLSAg ICBjYXNlIFZLX1JJR0hUOgotICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC5zaGlmdEtleSgpKQot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC5tZXRh S2V5KCkpCi0gICAgICAgICAgICBtX3BhZ2UtPmdvRm9yd2FyZCgpOwotICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgIGlmIChrZXlib2FyZEV2ZW50LmFsdEtleSgpIHx8IGtleWJvYXJkRXZlbnQu Y29udHJvbEtleSgpKQotICAgICAgICAgICAgICAgIHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9s bFJpZ2h0LCBTY3JvbGxCeVBhZ2UpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IHNjcm9sbChtX3BhZ2UuZ2V0KCksIFNjcm9sbFJpZ2h0LCBTY3JvbGxCeUxpbmUpOwotICAgICAg ICB9Ci0gICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzM1NSkKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEx LTA0LTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IFNhZmFyaSBkb2Vz bid0IHJlc3BlY3QgY21kLWFycm93cyAoYW5kIHZhcmlhdGlvbnMpIGFzIGN1c3RvbSBrZXlib2Fy ZCBzaG9ydGN1dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU4MTc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDYwNTU1PgorCisgICAgICAgICog V2ViVmlldy9XZWJGcmFtZVZpZXcubW06ICgtW1dlYkZyYW1lVmlldyBrZXlEb3duOl0pOiBBZGRl ZCBhIGNvbW1lbnQgZXhwbGFpbmluZyBob3cgdGhpcworICAgICAgICBzaG91bGQgYmUgY2hhbmdl ZCB0byBtYXRjaCBXZWJLaXQyLgorCiAyMDExLTA0LTA4ICBBbHBoYSBMYW0gIDxoY2xhbUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjgzMzM1LgpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHJldmlzaW9uIDgz MzIxKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHdvcmtp bmcgY29weSkKQEAgLTc3MSw2ICs3NzEsMTMgQEAgLSAoQk9PTClfZmlyc3RSZXNwb25kZXJJc0Zv cm1Db250cm9sCiAKIC0gKHZvaWQpa2V5RG93bjooTlNFdmVudCAqKWV2ZW50CiB7CisgICAgLy8g SW1wbGVtZW50IGNvbW1vbiBicm93c2VyIGJlaGF2aW9ycyBmb3IgYWxsIGtpbmRzIG9mIGNvbnRl bnQuCisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBub3QgYSBnb29kIHRpbWUgdG8gZXhlY3V0ZSBj b21tYW5kcyBmb3IgV2ViSFRNTFZpZXcuIFdlIHNob3VsZCBydW4gdGhlc2UgYXQgdGhlIHRpbWUg Y29tbWFuZHMgc2VudCBieSBrZXkgYmluZGluZ3MKKyAgICAvLyBhcmUgZXhlY3V0ZWQgZm9yIGNv bnNpc3RlbmN5LgorICAgIC8vIFRoaXMgZG9lc24ndCB3b3JrIGF1dG9tYXRpY2FsbHkgYmVjYXVz ZSBtb3N0IG9mIHRoZSBrZXlzIGhhbmRsZWQgaGVyZSBhcmUgdHJhbnNsYXRlZCBpbnRvIG1vdmVY WFggY29tbWFuZHMsIHdoaWNoIGFyZSBub3QgaGFuZGxlZAorICAgIC8vIGJ5IEVkaXRvciB3aGVu IGZvY3VzIGlzIG5vdCBpbiBlZGl0YWJsZSBjb250ZW50LgorCiAgICAgTlNTdHJpbmcgKmNoYXJh Y3RlcnMgPSBbZXZlbnQgY2hhcmFjdGVyc107CiAgICAgaW50IGluZGV4LCBjb3VudDsKICAgICBC T09MIGNhbGxTdXBlciA9IFlFUzsK