104694 2012-12-11 11:51:59 -0800 Web Inspector: follow up to r136974: handle visibility shortcut in keydown event of ElementsTreeOutline.element 2012-12-12 13:34:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 egraether webkit-unassigned webkit.review.bot oldest_to_newest 788637 0 egraether 2012-12-11 11:51:59 -0800 Web Inspector: follow up to r136974: handle visibility shortcut in keydown event of ElementsTreeOutline.element 788639 1 178843 egraether 2012-12-11 11:53:53 -0800 Created attachment 178843 Patch 789632 2 178843 pfeldman 2012-12-12 09:28:19 -0800 Comment on attachment 178843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178843&action=review > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:474 > + _onkeydown: function(event) @param {Event} event > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:478 > + if (!node || !treeElement) No need to check for node here. > Source/WebCore/inspector/front-end/KeyboardShortcut.js:140 > + * @param {KeyboardEvent} event @return {boolean} 789681 3 179078 egraether 2012-12-12 10:32:34 -0800 Created attachment 179078 Patch 789859 4 179078 webkit.review.bot 2012-12-12 13:34:54 -0800 Comment on attachment 179078 Patch Clearing flags on attachment: 179078 Committed r137510: <http://trac.webkit.org/changeset/137510> 789860 5 webkit.review.bot 2012-12-12 13:34:57 -0800 All reviewed patches have been landed. Closing bug. 178843 2012-12-11 11:53:53 -0800 2012-12-12 10:32:32 -0800 Patch bug-104694-20121211115114.patch text/plain 4715 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYxOGM0MGZlNjQ1ZTEz MjZlN2QwNmFjMTdiZDkwOTAyYjJmMjBmYS4uYTA3YWZmNzQzNmM2N2RmZTI4MTNjMzEwYTkyZTVk NTZkYWE0ZDUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEyLTExICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGZvbGxvdyB1cCB0byByMTM2OTc0OiBoYW5kbGUgdmlzaWJpbGl0eSBzaG9ydGN1dCBp biBrZXlkb3duIGV2ZW50IG9mIEVsZW1lbnRzVHJlZU91dGxpbmUuZWxlbWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0Njk0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHlwaW5nIEggaW4gdGhlIFN0 eWxlc1NpZGViYXJQYW5lIGNhdXNlZCB0b2dnbGluZyBvZiB0aGUgc2VsZWN0ZWQgZWxlbWVudHMg dmlzaWJpbGl0eS4gVGhpcyBjaGFuZ2Ugb25seSBoYW5kbGVzCisgICAgICAgIHRoZSBIIGtleWRv d24gd2hlbiB0aGUgRWxlbWVudHNQYW5lbCBpcyBmb2N1c2VkLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25rZXlkb3du KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5o YW5kbGVTaG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNo b3J0Y3V0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuaGFzTm9N b2RpZmllcnMpOgorCiAyMDEyLTEyLTExICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUm91dGUgbWFpbiByZXNvdXJjZSBsb2FkcyB0aHJvdWdoIHRoZSBtZW1v cnkgY2FjaGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggOTA5ZDA5ZDRlYzg4NTE0ZTExZTI5ZjMz MmRjOWU0ZjUyY2VkODFmOS4uZmFkZjAxZTE3MDBhYWVjNDBkZDNlZDk1ZGNiYjMzY2YyNTcwOWY3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtNDgsNiArNDgsNyBAQCBXZWJJbnNwZWN0b3IuRWxl bWVudHNUcmVlT3V0bGluZSA9IGZ1bmN0aW9uKG9taXRSb290RE9NTm9kZSwgc2VsZWN0RW5hYmxl ZCwgc2hvdwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcmFnbGVhdmUiLCB0 aGlzLl9vbmRyYWdsZWF2ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImRyb3AiLCB0aGlzLl9vbmRyb3AuYmluZCh0aGlzKSwgZmFsc2UpOwog ICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcmFnZW5kIiwgdGhpcy5fb25kcmFn ZW5kLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigia2V5ZG93biIsIHRoaXMuX29ua2V5ZG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICBU cmVlT3V0bGluZS5jYWxsKHRoaXMsIHRoaXMuZWxlbWVudCk7CiAKQEAgLTQ3MCw2ICs0NzEsMjAg QEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAg ICB9CiAgICAgfSwKIAorICAgIF9vbmtleWRvd246IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAg ICAgICAgdmFyIG5vZGUgPSB0aGlzLnNlbGVjdGVkRE9NTm9kZSgpOworICAgICAgICB2YXIgdHJl ZUVsZW1lbnQgPSB0aGlzLmdldENhY2hlZFRyZWVFbGVtZW50KG5vZGUpOworICAgICAgICBpZiAo IW5vZGUgfHwgIXRyZWVFbGVtZW50KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlm ICghdHJlZUVsZW1lbnQuX2VkaXRpbmcgJiYgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu aGFzTm9Nb2RpZmllcnMoZXZlbnQpICYmIGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleXMuSC5jb2RlKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu Y3NzTW9kZWwudG9nZ2xlSW5saW5lVmlzaWJpbGl0eShub2RlLmlkKTsKKyAgICAgICAgICAgIGV2 ZW50LmNvbnN1bWUodHJ1ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9 LAorCiAgICAgX2NvbnRleHRNZW51RXZlbnRGaXJlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewog ICAgICAgICBpZiAoIXRoaXMuX3Nob3dJbkVsZW1lbnRzUGFuZWxFbmFibGVkKQpAQCAtNTM5LDI0 ICs1NTQsMjIgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0g ewogCiAgICAgICAgIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiRjIiKSB7CiAgICAgICAg ICAgICB0aGlzLl90b2dnbGVFZGl0QXNIVE1MKG5vZGUpOworICAgICAgICAgICAgZXZlbnQuaGFu ZGxlZCA9IHRydWU7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICBp ZiAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRhKGV2ZW50 KSAmJiBub2RlLnBhcmVudE5vZGUpIHsKICAgICAgICAgICAgIGlmIChldmVudC5rZXlJZGVudGlm aWVyID09PSAiVXAiICYmIG5vZGUucHJldmlvdXNTaWJsaW5nKSB7CiAgICAgICAgICAgICAgICAg bm9kZS5tb3ZlVG8obm9kZS5wYXJlbnROb2RlLCBub2RlLnByZXZpb3VzU2libGluZywgdGhpcy5f c2VsZWN0Tm9kZUFmdGVyRWRpdC5iaW5kKHRoaXMsIG51bGwsIHRyZWVFbGVtZW50LmV4cGFuZGVk KSk7CisgICAgICAgICAgICAgICAgZXZlbnQuaGFuZGxlZCA9IHRydWU7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGV2ZW50LmtleUlkZW50 aWZpZXIgPT09ICJEb3duIiAmJiBub2RlLm5leHRTaWJsaW5nKSB7CiAgICAgICAgICAgICAgICAg bm9kZS5tb3ZlVG8obm9kZS5wYXJlbnROb2RlLCBub2RlLm5leHRTaWJsaW5nLm5leHRTaWJsaW5n LCB0aGlzLl9zZWxlY3ROb2RlQWZ0ZXJFZGl0LmJpbmQodGhpcywgbnVsbCwgdHJlZUVsZW1lbnQu ZXhwYW5kZWQpKTsKKyAgICAgICAgICAgICAgICBldmVudC5oYW5kbGVkID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLQotICAgICAgICBp ZiAoIXRyZWVFbGVtZW50Ll9lZGl0aW5nICYmIGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleXMuSC5jb2RlKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0 b3IuY3NzTW9kZWwudG9nZ2xlSW5saW5lVmlzaWJpbGl0eShub2RlLmlkKTsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQogICAgIH0sCiAKICAgICBfdG9nZ2xlRWRpdEFzSFRNTDogZnVu Y3Rpb24obm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCA5MWJiY2RjNmE5OTk1Y2QxMDQ2M2FmYzhkM2Jm YmNhN2Y0YzYwMDgwLi4zMDZjNjAzOGU2Zjc4OTA1ZjcxYzJlN2U3OWVlYTFiNjczYTI5ZTc0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hv cnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2Fy ZFNob3J0Y3V0LmpzCkBAIC0xMzYsNiArMTM2LDE0IEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LmV2ZW50SGFzQ3RybE9yTWV0YSA9IGZ1bmN0aW9uKGV2ZW50KQogICAgIHJldHVybiBX ZWJJbnNwZWN0b3IuaXNNYWMoKSA/IGV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0cmxLZXkgOiBl dmVudC5jdHJsS2V5ICYmICFldmVudC5tZXRhS2V5OwogfQogCisvKioKKyAqIEBwYXJhbSB7S2V5 Ym9hcmRFdmVudH0gZXZlbnQKKyAqLworV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuaGFz Tm9Nb2RpZmllcnMgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICByZXR1cm4gIWV2ZW50LmN0cmxL ZXkgJiYgIWV2ZW50LnNoaWZ0S2V5ICYmICFldmVudC5hbHRLZXkgJiYgIWV2ZW50Lm1ldGFLZXk7 Cit9CisKIC8qKiBAdHlwZWRlZiB7e2tleTogbnVtYmVyLCBuYW1lOiBzdHJpbmd9fSAqLwogV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuRGVzY3JpcHRvcjsKIAo= 179078 2012-12-12 10:32:34 -0800 2012-12-12 13:34:54 -0800 Patch bug-104694-20121212102955.patch text/plain 4960 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDgxN2U0MmJhNDQxMTY4 MjdjMGJlOGQwZWQwYzQ3NGIwN2Q3MTE0OC4uZmFhMmQwN2ZkZjBiMjViNGYzNTllZDcwNjI0NmNj N2I0NWEwYjk4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEyLTEyICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGZvbGxvdyB1cCB0byByMTM2OTc0OiBoYW5kbGUgdmlzaWJpbGl0eSBzaG9ydGN1dCBp biBrZXlkb3duIGV2ZW50IG9mIEVsZW1lbnRzVHJlZU91dGxpbmUuZWxlbWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0Njk0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHlwaW5nIEggaW4gdGhlIFN0 eWxlc1NpZGViYXJQYW5lIGNhdXNlZCB0b2dnbGluZyBvZiB0aGUgc2VsZWN0ZWQgZWxlbWVudHMg dmlzaWJpbGl0eS4gVGhpcyBjaGFuZ2Ugb25seSBoYW5kbGVzCisgICAgICAgIHRoZSBIIGtleWRv d24gd2hlbiB0aGUgRWxlbWVudHNQYW5lbCBpcyBmb2N1c2VkLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25rZXlkb3du KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5o YW5kbGVTaG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNo b3J0Y3V0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuaGFzTm9N b2RpZmllcnMpOgorCiAyMDEyLTEyLTEyICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIEltcGxlbWVudCBDU1MgcGFy c2luZyBhbmQgaGFuZGxpbmcgZm9yIG1pbi1jb250ZW50IGFuZCBtYXgtY29udGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVP dXRsaW5lLmpzCmluZGV4IDkwOWQwOWQ0ZWM4ODUxNGUxMWUyOWYzMzJkYzllNGY1MmNlZDgxZjku LjBmMzQwZmM5YjJhYTZmZjM1ODVlMmU2YjQ2MzFlNTRkMjFhMWRjZjUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxp bmUuanMKQEAgLTQ4LDYgKzQ4LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUg PSBmdW5jdGlvbihvbWl0Um9vdERPTU5vZGUsIHNlbGVjdEVuYWJsZWQsIHNob3cKICAgICB0aGlz LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ2xlYXZlIiwgdGhpcy5fb25kcmFnbGVhdmUu YmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJk cm9wIiwgdGhpcy5fb25kcm9wLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiZHJhZ2VuZCIsIHRoaXMuX29uZHJhZ2VuZC5iaW5kKHRoaXMpLCBm YWxzZSk7CisgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlz Ll9vbmtleWRvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgVHJlZU91dGxpbmUuY2FsbCh0 aGlzLCB0aGlzLmVsZW1lbnQpOwogCkBAIC00NzAsNiArNDcxLDIzIEBAIFdlYkluc3BlY3Rvci5F bGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqLworICAgIF9vbmtleWRv d246IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIG5vZGUgPSB0aGlzLnNlbGVj dGVkRE9NTm9kZSgpOworICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLmdldENhY2hlZFRy ZWVFbGVtZW50KG5vZGUpOworICAgICAgICBpZiAoIXRyZWVFbGVtZW50KQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIGlmICghdHJlZUVsZW1lbnQuX2VkaXRpbmcgJiYgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuaGFzTm9Nb2RpZmllcnMoZXZlbnQpICYmIGV2ZW50LmtleUNv ZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuSC5jb2RlKSB7CisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwudG9nZ2xlSW5saW5lVmlzaWJpbGl0eShub2Rl LmlkKTsKKyAgICAgICAgICAgIGV2ZW50LmNvbnN1bWUodHJ1ZSk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX2NvbnRleHRNZW51RXZlbnRGaXJlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3Nob3dJbkVsZW1lbnRzUGFu ZWxFbmFibGVkKQpAQCAtNTM5LDI0ICs1NTcsMjIgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJl ZU91dGxpbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmIChldmVudC5rZXlJZGVudGlmaWVy ID09PSAiRjIiKSB7CiAgICAgICAgICAgICB0aGlzLl90b2dnbGVFZGl0QXNIVE1MKG5vZGUpOwor ICAgICAgICAgICAgZXZlbnQuaGFuZGxlZCA9IHRydWU7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KIAogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuZXZl bnRIYXNDdHJsT3JNZXRhKGV2ZW50KSAmJiBub2RlLnBhcmVudE5vZGUpIHsKICAgICAgICAgICAg IGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiVXAiICYmIG5vZGUucHJldmlvdXNTaWJsaW5n KSB7CiAgICAgICAgICAgICAgICAgbm9kZS5tb3ZlVG8obm9kZS5wYXJlbnROb2RlLCBub2RlLnBy ZXZpb3VzU2libGluZywgdGhpcy5fc2VsZWN0Tm9kZUFmdGVyRWRpdC5iaW5kKHRoaXMsIG51bGws IHRyZWVFbGVtZW50LmV4cGFuZGVkKSk7CisgICAgICAgICAgICAgICAgZXZlbnQuaGFuZGxlZCA9 IHRydWU7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAg ICAgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJEb3duIiAmJiBub2RlLm5leHRTaWJsaW5n KSB7CiAgICAgICAgICAgICAgICAgbm9kZS5tb3ZlVG8obm9kZS5wYXJlbnROb2RlLCBub2RlLm5l eHRTaWJsaW5nLm5leHRTaWJsaW5nLCB0aGlzLl9zZWxlY3ROb2RlQWZ0ZXJFZGl0LmJpbmQodGhp cywgbnVsbCwgdHJlZUVsZW1lbnQuZXhwYW5kZWQpKTsKKyAgICAgICAgICAgICAgICBldmVudC5o YW5kbGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KLQotICAgICAgICBpZiAoIXRyZWVFbGVtZW50Ll9lZGl0aW5nICYmIGV2ZW50Lmtl eUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuSC5jb2RlKSB7Ci0g ICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwudG9nZ2xlSW5saW5lVmlzaWJpbGl0eShu b2RlLmlkKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogICAgIH0sCiAKICAgICBf dG9nZ2xlRWRpdEFzSFRNTDogZnVuY3Rpb24obm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCA5MWJiY2Rj NmE5OTk1Y2QxMDQ2M2FmYzhkM2JmYmNhN2Y0YzYwMDgwLi45NmQ4ZTZlNmIwODgxYjI1YjA2MDc1 ODcyMWNmZDY2M2M5ZjY1YzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCkBAIC0xMzAsMTIgKzEzMCwyMiBAQCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5RnJvbUV2ZW50ID0gZnVuY3Rpb24o a2V5Ym9hcmRFdmVudCkKIAogLyoqCiAgKiBAcGFyYW0ge0tleWJvYXJkRXZlbnR9IGV2ZW50Cisg KiBAcmV0dXJuIHtib29sZWFufQogICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5l dmVudEhhc0N0cmxPck1ldGEgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICByZXR1cm4gV2ViSW5z cGVjdG9yLmlzTWFjKCkgPyBldmVudC5tZXRhS2V5ICYmICFldmVudC5jdHJsS2V5IDogZXZlbnQu Y3RybEtleSAmJiAhZXZlbnQubWV0YUtleTsKIH0KIAorLyoqCisgKiBAcGFyYW0ge0tleWJvYXJk RXZlbnR9IGV2ZW50CisgKiBAcmV0dXJuIHtib29sZWFufQorICovCitXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5oYXNOb01vZGlmaWVycyA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIHJl dHVybiAhZXZlbnQuY3RybEtleSAmJiAhZXZlbnQuc2hpZnRLZXkgJiYgIWV2ZW50LmFsdEtleSAm JiAhZXZlbnQubWV0YUtleTsKK30KKwogLyoqIEB0eXBlZGVmIHt7a2V5OiBudW1iZXIsIG5hbWU6 IHN0cmluZ319ICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5EZXNjcmlwdG9yOwog Cg==