31780 2009-11-21 23:50:52 -0800 Web Inspector: Keyboard Shortcut to Clear Console Messages 2009-11-24 09:56:06 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck bweinstein joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 165693 0 joepeck 2009-11-21 23:50:52 -0800 Suggestion is ⌘K like it is in Terminal.app: http://twitter.com/gnb/status/5941003857 > A request: a keyboard shortcut to clear the console. Perhaps ⌘K as in Terminal.app? Any idea what this should be for Windows? 165694 1 43673 joepeck 2009-11-21 23:53:21 -0800 Created attachment 43673 [PATCH] Cmd+K to Clear Console Assigns ⌘K to Clear Console Messages for Mac Users. 165709 2 pfeldman 2009-11-22 05:59:16 -0800 > Any idea what this should be for Windows? I don't think such a thing exists on Windows. Maybe Ctrl + K ? 165711 3 pfeldman 2009-11-22 06:17:52 -0800 While we are thinking about the shortcut... Should we make typing "clear" do the job? Currently you need to do "clear()" and it leaves "undefined" result as a trace. Not nice. 165719 4 timothy 2009-11-22 08:33:35 -0800 I think a shortcut is fine. I don't think it can be Control-K on Windows, that might trigger the kill-to-end-of-line editing command (like it does on Mac). 165721 5 43678 joepeck 2009-11-22 09:03:29 -0800 Created attachment 43678 [PATCH] Cmd+K (Mac), Ctrl+L (Mac+Linux) to Clear Console It appears as though Ctrl+L means the same thing. This is likely to be a good thing for Linux users. Mac Users have this too (works in Terminal.app). Source: http://www.tuxfiles.org/linuxhelp/shortcuts.html 165724 6 43681 joepeck 2009-11-22 09:14:04 -0800 Created attachment 43681 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console Chat on IRC sounded like Ctrl+L should be for all platforms. Don't single out Windows. 165730 7 43681 pfeldman 2009-11-22 09:36:39 -0800 Comment on attachment 43681 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console I think we should somehow reuse what is in KeyboardShortcuts.js (or improve it or stop using it if it is not useful in all places). Overall, shortcuts framework is often useful. 166121 8 43776 joepeck 2009-11-24 09:34:14 -0800 Created attachment 43776 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console Using KeyboardShortcut Using the KeyboardShortcut lib 166123 9 43776 pfeldman 2009-11-24 09:41:33 -0800 Comment on attachment 43776 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console Using KeyboardShortcut > + var shortcut; Move this lower? > + if (!this._shortcuts[shortcut].isMacOnly || WebInspector.isMac()) { We could make this logic a part of the makeKeyFromEvent, no? 166127 10 joepeck 2009-11-24 09:56:06 -0800 (In reply to comment #9) > (From update of attachment 43776 [details]) > > + var shortcut; > > Move this lower? Done. > > + if (!this._shortcuts[shortcut].isMacOnly || WebInspector.isMac()) { > > We could make this logic a part of the makeKeyFromEvent, no? Like you mentioned in IRC, this could move to a Modifier, or something like that. But we decided to leave it for now. Landed in http://trac.webkit.org/changeset/51341 r51341 = 8b54f6e271ac7bb77580c41b7b6ffd1d65c29cd8 43673 2009-11-21 23:53:21 -0800 2009-11-22 09:03:29 -0800 [PATCH] Cmd+K to Clear Console clearconsole.patch text/plain 1620 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDU0YmZiMy4uMjNjMjZiMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMS0yMSAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEtleWJvYXJkIFNob3J0Y3V0IHRvIENs ZWFyIENvbnNvbGUgTWVzc2FnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxNzgwCisKKyAgICAgICAgTWFjIE9ubHksIENtZCtLIGluIHRoZSBDb25z b2xlIENsZWFycyBNZXNzYWdlcworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUu X3Byb21wdEtleURvd24pOgorCiAyMDA5LTExLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNr QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDc2NGVhMmQuLjM5 YjRmZDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmll dy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAg LTM5Miw2ICszOTIsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5fZW50ZXJLZXlQcmVzc2VkKGV2ZW50KTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQorCiAgICAgICAgIGlmIChpc0ZuS2V5KGV2ZW50KSkgewogICAgICAg ICAgICAgaWYgKFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgJiYgV2ViSW5zcGVjdG9yLmN1cnJl bnRQYW5lbC5oYW5kbGVLZXlFdmVudCkgewogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5j dXJyZW50UGFuZWwuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwpAQCAtMzk5LDYgKzQwMCwxMyBAQCBX ZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAg ICAgICB9CiAKKyAgICAgICAgLy8gQ29tbWFuZCtLID0gQ2xlYXIgQ29uc29sZSAoTWFjIE9ubHkp CisgICAgICAgIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiVSswMDRCIiAmJiBXZWJJbnNw ZWN0b3IuaXNNYWMoKSAmJiAhZXZlbnQuY3RybEtleSAmJiBldmVudC5tZXRhS2V5ICYmICFldmVu dC5hbHRLZXkgJiYgIWV2ZW50LnNoaWZ0S2V5KSB7CisgICAgICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOworICAgICAgICAgICAgdGhpcy5jbGVhck1lc3NhZ2VzKHRydWUpOworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5wcm9tcHQuaGFuZGxlS2V5 RXZlbnQoZXZlbnQpOwogICAgIH0sCiAK 43678 2009-11-22 09:03:29 -0800 2009-11-22 09:14:04 -0800 [PATCH] Cmd+K (Mac), Ctrl+L (Mac+Linux) to Clear Console patch text/plain 2554 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDU0YmZiMy4uODkxYmUxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0xMS0yMSAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEtleWJvYXJkIFNob3J0Y3V0IHRvIENs ZWFyIENvbnNvbGUgTWVzc2FnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxNzgwCisKKyAgICAgICAgTWFjIE9ubHk6ICAgIENtZCtLICAgPSBDbGVh ciBDb25zb2xlIE1lc3NhZ2VzCisgICAgICAgIE5vbi1XaW5kb3dzOiBDdHJsK0wgID0gQ2xlYXIg Q29uc29sZSBNZXNzYWdlcworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3By b21wdEtleURvd24pOgorCiAyMDA5LTExLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDc2NGVhMmQuLmVhOWJj YTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTM5 Miw2ICszOTIsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5fZW50ZXJLZXlQcmVzc2VkKGV2ZW50KTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQorCiAgICAgICAgIGlmIChpc0ZuS2V5KGV2ZW50KSkgewogICAgICAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgJiYgV2ViSW5zcGVjdG9yLmN1cnJlbnRQ YW5lbC5oYW5kbGVLZXlFdmVudCkgewogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJy ZW50UGFuZWwuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwpAQCAtMzk5LDYgKzQwMCwyMCBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAg ICB9CiAKKyAgICAgICAgLy8gQ29tbWFuZCtLID0gQ2xlYXIgQ29uc29sZSAoTWFjIE9ubHkpCisg ICAgICAgIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiVSswMDRCIiAmJiBXZWJJbnNwZWN0 b3IuaXNNYWMoKSAmJiAhZXZlbnQuY3RybEtleSAmJiBldmVudC5tZXRhS2V5ICYmICFldmVudC5h bHRLZXkgJiYgIWV2ZW50LnNoaWZ0S2V5KSB7CisgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVm YXVsdCgpOworICAgICAgICAgICAgdGhpcy5jbGVhck1lc3NhZ2VzKHRydWUpOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgLy8gQ3RybCtMID0gQ2xlYXIgQ29uc29s ZSAoTm9uLVdpbmRvd3MgUGxhdGZvcm1zKQorICAgICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmll ciA9PT0gIlUrMDA0QyIgJiYgIVdlYkluc3BlY3Rvci5pc1dpbmRvd3MoKSAmJiBldmVudC5jdHJs S2V5ICYmICFldmVudC5tZXRhS2V5ICYmICFldmVudC5hbHRLZXkgJiYgIWV2ZW50LnNoaWZ0S2V5 KSB7CisgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgICAgdGhp cy5jbGVhck1lc3NhZ2VzKHRydWUpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisK ICAgICAgICAgdGhpcy5wcm9tcHQuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwogICAgIH0sCiAKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDBmOGVjMTIuLjBmM2Vl MTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTY2MCw2 ICsxNjYwLDE0IEBAIFdlYkluc3BlY3Rvci5pc01hYyA9IGZ1bmN0aW9uKCkKICAgICByZXR1cm4g dGhpcy5faXNNYWM7CiB9CiAKK1dlYkluc3BlY3Rvci5pc1dpbmRvd3MgPSBmdW5jdGlvbigpCit7 CisgICAgaWYgKCEoIl9pc1dpbmRvd3MiIGluIHRoaXMpKQorICAgICAgICB0aGlzLl9pc1dpbmRv d3MgPSBXZWJJbnNwZWN0b3IucGxhdGZvcm0gPT09ICJ3aW5kb3dzIjsKKworICAgIHJldHVybiB0 aGlzLl9pc1dpbmRvd3M7Cit9CisKIFdlYkluc3BlY3Rvci5pc0JlaW5nRWRpdGVkID0gZnVuY3Rp b24oZWxlbWVudCkKIHsKICAgICByZXR1cm4gZWxlbWVudC5fX2VkaXRpbmc7Cg== 43681 2009-11-22 09:14:04 -0800 2009-11-24 09:34:14 -0800 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console patch text/plain 1945 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDU0YmZiMy4uYjFiYjViOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0xMS0yMSAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEtleWJvYXJkIFNob3J0Y3V0IHRvIENs ZWFyIENvbnNvbGUgTWVzc2FnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxNzgwCisKKyAgICAgICAgQWxsIFBsYXRmb3JtczogIEN0cmwrTCAgPSBD bGVhciBDb25zb2xlIE1lc3NhZ2VzCisgICAgICAgIE1hYyBPbmx5OiAgICAgICBDbWQrSyAgID0g Q2xlYXIgQ29uc29sZSBNZXNzYWdlcworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUuX3Byb21wdEtleURvd24pOgorCiAyMDA5LTExLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxqb2Vw ZWNrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDc2NGVhMmQu Ljk3YWQzZmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMK QEAgLTM5Miw2ICszOTIsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0g ewogICAgICAgICAgICAgdGhpcy5fZW50ZXJLZXlQcmVzc2VkKGV2ZW50KTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQorCiAgICAgICAgIGlmIChpc0ZuS2V5KGV2ZW50KSkgewogICAg ICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgJiYgV2ViSW5zcGVjdG9yLmN1 cnJlbnRQYW5lbC5oYW5kbGVLZXlFdmVudCkgewogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5jdXJyZW50UGFuZWwuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwpAQCAtMzk5LDYgKzQwMCwyMCBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKKyAgICAgICAgLy8gQ3RybCtMID0gQ2xlYXIgQ29uc29sZQorICAgICAgICBp ZiAoZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlUrMDA0QyIgJiYgZXZlbnQuY3RybEtleSAmJiAh ZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuYWx0S2V5ICYmICFldmVudC5zaGlmdEtleSkgeworICAg ICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAgICAgIHRoaXMuY2xlYXJN ZXNzYWdlcyh0cnVlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAg IC8vIENvbW1hbmQrSyA9IENsZWFyIENvbnNvbGUgKE1hYyBPbmx5KQorICAgICAgICBpZiAoZXZl bnQua2V5SWRlbnRpZmllciA9PT0gIlUrMDA0QiIgJiYgV2ViSW5zcGVjdG9yLmlzTWFjKCkgJiYg IWV2ZW50LmN0cmxLZXkgJiYgZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuYWx0S2V5ICYmICFldmVu dC5zaGlmdEtleSkgeworICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAg ICAgICAgIHRoaXMuY2xlYXJNZXNzYWdlcyh0cnVlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorCiAgICAgICAgIHRoaXMucHJvbXB0LmhhbmRsZUtleUV2ZW50KGV2ZW50KTsKICAg ICB9LAogCg== 43776 2009-11-24 09:34:14 -0800 2009-11-24 09:41:33 -0800 [PATCH] Cmd+K (Mac), Ctrl+L (All) to Clear Console Using KeyboardShortcut keys.patch text/plain 7466 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDU0YmZiMy4uMTZhZjFiMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0xMS0yNCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEtleWJvYXJkIFNob3J0Y3V0IHRvIENs ZWFyIENvbnNvbGUgTWVzc2FnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxNzgwCisKKyAgICAgICAgQWxsIFBsYXRmb3JtczogIEN0cmwrTCAgPSBD bGVhciBDb25zb2xlIE1lc3NhZ2VzCisgICAgICAgIE1hYyBPbmx5OiAgICAgICBDbWQrSyAgID0g Q2xlYXIgQ29uc29sZSBNZXNzYWdlcworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldyk6IGNyZWF0 ZSBzaG9ydGN1dHMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUu X3Byb21wdEtleURvd24pOiBoYW5kbGUgc2hvcnRjdXRzCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQubWFrZUtleSk6IGNvbnZlbmllbmNlIGNvbnZlcnNpb24gb2YgImEteiIgY2hh cmFjdGVyIHRvIGtleUNvZGUKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwpOiBzdHlsZSBmaXhl cyBmb3Iga2V5Ym9hcmQgc2hvcnRjdXRzCisKIDIwMDktMTEtMjAgIEpvc2VwaCBQZWNvcmFybyAg PGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNo ZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggNzY0 ZWEyZC4uY2FlY2UxZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmll dy5qcwpAQCAtOTIsNiArOTIsMTYgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rp b24oZHJhd2VyKQogICAgIHRoaXMubG9nRWxlbWVudCA9IGNyZWF0ZUZpbHRlckVsZW1lbnQuY2Fs bCh0aGlzLCAiTG9ncyIpOwogCiAgICAgdGhpcy5maWx0ZXIodGhpcy5hbGxFbGVtZW50LCBmYWxz ZSk7CisKKyAgICB2YXIgc2hvcnRjdXQ7CisgICAgdGhpcy5fc2hvcnRjdXRzID0ge307CisgICAg dmFyIGhhbmRsZXIgPSB0aGlzLmNsZWFyTWVzc2FnZXMuYmluZCh0aGlzLCB0cnVlKTsKKworICAg IHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgiayIsIFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5NZXRhKTsKKyAgICB0aGlzLl9z aG9ydGN1dHNbc2hvcnRjdXRdID0gaGFuZGxlcjsKKyAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRj dXRdLmlzTWFjT25seSA9IHRydWU7CisgICAgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5tYWtlS2V5KCJsIiwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9k aWZpZXJzLkN0cmwpOworICAgIHRoaXMuX3Nob3J0Y3V0c1tzaG9ydGN1dF0gPSBoYW5kbGVyOwog fQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewpAQCAtMzkyLDYgKzQw Miw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB0aGlzLl9lbnRlcktleVByZXNzZWQoZXZlbnQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CisKICAgICAgICAgaWYgKGlzRm5LZXkoZXZlbnQpKSB7CiAgICAgICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCAmJiBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsLmhh bmRsZUtleUV2ZW50KSB7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5l bC5oYW5kbGVLZXlFdmVudChldmVudCk7CkBAIC0zOTksNiArNDEwLDE2IEBAIFdlYkluc3BlY3Rv ci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAor ICAgICAgICB2YXIgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtl S2V5RnJvbUV2ZW50KGV2ZW50KTsKKyAgICAgICAgdmFyIGhhbmRsZXIgPSB0aGlzLl9zaG9ydGN1 dHNbc2hvcnRjdXRdOworICAgICAgICBpZiAoaGFuZGxlcikgeworICAgICAgICAgICAgaWYgKCF0 aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXRdLmlzTWFjT25seSB8fCBXZWJJbnNwZWN0b3IuaXNNYWMo KSkgeworICAgICAgICAgICAgICAgIGhhbmRsZXIoKTsKKyAgICAgICAgICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorCiAgICAgICAgIHRoaXMucHJvbXB0LmhhbmRsZUtleUV2ZW50KGV2ZW50KTsK ICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9h cmRTaG9ydGN1dC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0 Y3V0LmpzCmluZGV4IGVkMjhhNDguLmExYjU3NGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCkBAIC03NiwxMiArNzYsMTQgQEAgV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5Q29kZXMgPSB7CiAKIC8qKgogICogQ3JlYXRlcyBh IG51bWJlciBlbmNvZGluZyBrZXlDb2RlIGluIHRoZSBsb3dlciA4IGJpdHMgYW5kIG1vZGlmaWVy cyBtYXNrIGluIHRoZSBoaWdoZXIgOCBiaXRzLgotICogSXQgaXMgdXNlZnVsbCBmb3IgbWF0Y2hp bmcgcHJlc3NlZCBrZXlzLgotICogQHBhcmFtIHtudW1iZXJ9IGtleUNvZGUgQ29kZSBvZiB0aGUg a2V5LgotICogQHBhcmFtIHtudW1iZXJ9IG9wdE1vZGlmaWVycyBPcHRpb25hbCBsaXN0IG9mIG1v ZGlmaWVycyBwYXNzZWQgYXMgYWRkaXRpb25hbCBwYXJhbWVydGVycy4KKyAqIEl0IGlzIHVzZWZ1 bCBmb3IgbWF0Y2hpbmcgcHJlc3NlZCBrZXlzLgorICoga2V5Q29kZSBpcyB0aGUgQ29kZSBvZiB0 aGUga2V5LCBvciBhIGNoYXJhY3RlciAiYS16IiB3aGljaCBpcyBjb252ZXJ0ZWQgdG8gYSBrZXlD b2RlIHZhbHVlLgorICogb3B0TW9kaWZpZXJzIGlzIGFuIE9wdGlvbmFsIGxpc3Qgb2YgbW9kaWZp ZXJzIHBhc3NlZCBhcyBhZGRpdGlvbmFsIHBhcmFtZXJ0ZXJzLgogICovCiBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5ID0gZnVuY3Rpb24oa2V5Q29kZSwgb3B0TW9kaWZpZXJz KQogeworICAgIGlmICh0eXBlb2Yga2V5Q29kZSA9PT0gInN0cmluZyIpCisgICAgICAgIGtleUNv ZGUgPSBrZXlDb2RlLmNoYXJDb2RlQXQoMCkgLSAzMjsKICAgICB2YXIgbW9kaWZpZXJzID0gV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLk5vbmU7CiAgICAgZm9yICh2YXIg aSA9IDE7IGkgPCBhcmd1bWVudHMubGVuZ3RoOyBpKyspCiAgICAgICAgIG1vZGlmaWVycyB8PSBh cmd1bWVudHNbaV07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cwppbmRleCBiYmJjNzkzLi5kNjk1MTZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKQEAgLTE2MSwzNSArMTYxLDM1IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fYnJlYWtwb2ludHNVUkxNYXAgPSB7fTsK IAogICAgIHRoaXMuX3Nob3J0Y3V0cyA9IHt9OwotCisgICAgdmFyIGhhbmRsZXIsIHNob3J0Y3V0 OwogICAgIHZhciBwbGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIgPSBXZWJJbnNwZWN0b3IuaXNNYWMo KSA/IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5NZXRhIDogV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmw7CiAKICAgICAvLyBDb250aW51 ZS4KLSAgICB2YXIgaGFuZGxlciA9IHRoaXMucGF1c2VCdXR0b24uY2xpY2suYmluZCh0aGlzLnBh dXNlQnV0dG9uKTsKLSAgICB2YXIgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLkY4KTsK KyAgICBoYW5kbGVyID0gdGhpcy5wYXVzZUJ1dHRvbi5jbGljay5iaW5kKHRoaXMucGF1c2VCdXR0 b24pOworICAgIHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtl eShXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlDb2Rlcy5GOCk7CiAgICAgdGhpcy5f c2hvcnRjdXRzW3Nob3J0Y3V0XSA9IGhhbmRsZXI7Ci0gICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleShXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5LZXlDb2Rlcy5TbGFzaCwgcGxhdGZvcm1TcGVjaWZpY01vZGlmaWVyKTsKKyAgICBzaG9y dGN1dCA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuS2V5Q29kZXMuU2xhc2gsIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmll cik7CiAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0XSA9IGhhbmRsZXI7CiAKICAgICAvLyBT dGVwIG92ZXIuCi0gICAgdmFyIGhhbmRsZXIgPSB0aGlzLnN0ZXBPdmVyQnV0dG9uLmNsaWNrLmJp bmQodGhpcy5zdGVwT3ZlckJ1dHRvbik7Ci0gICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQubWFrZUtleShXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5L ZXlDb2Rlcy5GMTApOworICAgIGhhbmRsZXIgPSB0aGlzLnN0ZXBPdmVyQnV0dG9uLmNsaWNrLmJp bmQodGhpcy5zdGVwT3ZlckJ1dHRvbik7CisgICAgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleUNv ZGVzLkYxMCk7CiAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0XSA9IGhhbmRsZXI7Ci0gICAg dmFyIHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleShXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlDb2Rlcy5TaW5nbGVRdW90ZSwgcGxhdGZvcm1T cGVjaWZpY01vZGlmaWVyKTsKKyAgICBzaG9ydGN1dCA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5Q29kZXMuU2lu Z2xlUXVvdGUsIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7CiAgICAgdGhpcy5fc2hvcnRjdXRz W3Nob3J0Y3V0XSA9IGhhbmRsZXI7CiAKICAgICAvLyBTdGVwIGludG8uCi0gICAgdmFyIGhhbmRs ZXIgPSB0aGlzLnN0ZXBJbnRvQnV0dG9uLmNsaWNrLmJpbmQodGhpcy5zdGVwSW50b0J1dHRvbik7 Ci0gICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtl eShXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlDb2Rlcy5GMTEpOworICAgIGhhbmRs ZXIgPSB0aGlzLnN0ZXBJbnRvQnV0dG9uLmNsaWNrLmJpbmQodGhpcy5zdGVwSW50b0J1dHRvbik7 CisgICAgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLkYxMSk7CiAgICAgdGhpcy5fc2hv cnRjdXRzW3Nob3J0Y3V0XSA9IGhhbmRsZXI7Ci0gICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleShXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5LZXlDb2Rlcy5TZW1pY29sb24sIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7CisgICAgc2hv cnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLlNlbWljb2xvbiwgcGxhdGZvcm1TcGVjaWZpY01v ZGlmaWVyKTsKICAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXRdID0gaGFuZGxlcjsKIAogICAg IC8vIFN0ZXAgb3V0LgotICAgIHZhciBoYW5kbGVyID0gdGhpcy5zdGVwT3V0QnV0dG9uLmNsaWNr LmJpbmQodGhpcy5zdGVwT3V0QnV0dG9uKTsKLSAgICB2YXIgc2hvcnRjdXQgPSBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 LktleUNvZGVzLkYxMSwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLlNo aWZ0KTsKKyAgICBoYW5kbGVyID0gdGhpcy5zdGVwT3V0QnV0dG9uLmNsaWNrLmJpbmQodGhpcy5z dGVwT3V0QnV0dG9uKTsKKyAgICBzaG9ydGN1dCA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5Q29kZXMuRjExLCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMuU2hpZnQpOwogICAgIHRoaXMu X3Nob3J0Y3V0c1tzaG9ydGN1dF0gPSBoYW5kbGVyOwotICAgIHZhciBzaG9ydGN1dCA9IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5Q29kZXMuU2VtaWNvbG9uLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllcnMuU2hpZnQsIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7CisgICAgc2hvcnRjdXQg PSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0LktleUNvZGVzLlNlbWljb2xvbiwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXJzLlNoaWZ0LCBwbGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIpOwogICAgIHRo aXMuX3Nob3J0Y3V0c1tzaG9ydGN1dF0gPSBoYW5kbGVyOwogCiAgICAgdGhpcy5yZXNldCgpOwo=