104146 2012-12-05 11:30:47 -0800 Web Inspector: Add shortcut to set visibility:hidden on elements in the ElementsPanel 2012-12-07 12:53:37 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 egraether webkit-unassigned apavlov caseq dglazkov egraether keishi loislo nduca pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 783938 0 egraether 2012-12-05 11:30:47 -0800 Web Inspector: Add shortcut to set visibility:hidden on elements in the ElementsPanel 783940 1 177802 egraether 2012-12-05 11:32:56 -0800 Created attachment 177802 Patch 784164 2 177840 egraether 2012-12-05 15:08:36 -0800 Created attachment 177840 Patch 784170 3 egraether 2012-12-05 15:12:38 -0800 pfeldman, thanks for the feedback. I rewrote the patch to using cssStyleModel. 784219 4 177840 webkit.review.bot 2012-12-05 15:54:55 -0800 Comment on attachment 177840 Patch Attachment 177840 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15147671 New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html 785815 5 177840 pfeldman 2012-12-07 05:10:53 -0800 Comment on attachment 177840 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177840&action=review > Source/WebCore/inspector/front-end/DOMAgent.js:777 > + WebInspector.cssModel.getInlineStylesAsync(this.id, updateInlineVisibility); Lets keep CSS -> DOM dependency one way. I.e. toggleInlineVisibility should be in CSSStyleModel and should accept node id (or node) as a parameter. > Source/WebCore/inspector/front-end/treeoutline.js:377 > + else if (event.keyCode === WebInspector.KeyboardShortcut.Keys.H.code) Hide is not generic enough to be dispatched from treeoutline. You should add explicit listener in the ElementsPanel.js that does it. 786007 6 178244 egraether 2012-12-07 11:25:24 -0800 Created attachment 178244 Patch 786008 7 egraether 2012-12-07 11:28:55 -0800 (In reply to comment #5) I updated the patch: > (From update of attachment 177840 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177840&action=review > > > Source/WebCore/inspector/front-end/DOMAgent.js:777 > > + WebInspector.cssModel.getInlineStylesAsync(this.id, updateInlineVisibility); > > Lets keep CSS -> DOM dependency one way. I.e. toggleInlineVisibility should be in CSSStyleModel and should accept node id (or node) as a parameter. done > > Source/WebCore/inspector/front-end/treeoutline.js:377 > > + else if (event.keyCode === WebInspector.KeyboardShortcut.Keys.H.code) > > Hide is not generic enough to be dispatched from treeoutline. You should add explicit listener in the ElementsPanel.js that does it. I found a spot in ElementsTreeOutline.js that seemed to fit. 786077 8 178244 webkit.review.bot 2012-12-07 12:53:33 -0800 Comment on attachment 178244 Patch Clearing flags on attachment: 178244 Committed r136974: <http://trac.webkit.org/changeset/136974> 786078 9 webkit.review.bot 2012-12-07 12:53:37 -0800 All reviewed patches have been landed. Closing bug. 177802 2012-12-05 11:32:56 -0800 2012-12-05 15:08:33 -0800 Patch bug-104146-20121205113021.patch text/plain 7123 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY3ODE3ZDhkMjAzODUy ZTI3ZDAwZGZiNzQwYjljN2YyM2M0NTQwZC4uYzczZDlkYzNkZWY2YWU3N2I0ZTBiMTA3YWI3MGVj MmZhNzA1ODkyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEyLTA1ICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBzaG9ydGN1dCB0byBzZXQgdmlzaWJpbGl0eTpoaWRkZW4gb24gZWxlbWVudHMg aW4gdGhlIEVsZW1lbnRzUGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgdGhlIHNob3J0Y3V0IEggdG8gc2V0IGFuZCB1 bnNldCB2aXNpYmlsaXR5OmhpZGRlbiBvbiB0aGUgc3R5bGUgYXR0cmlidXRlCisgICAgICAgIG9m IGVsZW1lbnRzIGluIHRoZSBFbGVtZW50c3BhbmVsLiBUaGlzIGZlYXR1cmUgaXMgdXNlZnVsIHdo ZW4gbG9va2luZyBmb3IgZWxlbWVudHMgdGhhdAorICAgICAgICBjYXVzZSBiYWQgcmVuZGVyaW5n IHBlcmZvcm1hbmNlLCBiZWNhdXNlIHZpc2liaWxpdHk6aGlkZGVuIGRvZXMgbm90IHBhaW50IHRo ZSBlbGVtZW50LAorICAgICAgICBidXQgcHJlc2VydmVzIHRoZSBsYXlvdXQuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbERlc2NyaXB0 b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbERlc2NyaXB0b3IucHJv dG90eXBlLnJlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNU cmVlRWxlbWVudC5wcm90b3R5cGUub25oaWRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0tleWJvYXJkU2hvcnRjdXQuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90 cmVlb3V0bGluZS5qczoKKyAgICAgICAgKFRyZWVPdXRsaW5lLnByb3RvdHlwZS5fdHJlZUtleURv d24pOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uaGlkZSk6CisKIDIwMTItMTIt MDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIFJlbmFt ZSBWOERPTVdyYXBwZXIgbWVtYmVyIGZ1bmN0aW9ucyB0byBiZSBtb3JlIGRlc2NyaXB0aXZlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5k ZXggZWZmZmExY2Q2NGJkZmZjNDViMmY5ODkxZDBmOThjYTgxNjQ2ZjQxZS4uZTg1MjZmOGIyOWQ3 N2YwODFkZmY4NThjMjJhMzQzYTRkYTEzZTQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv RW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNjQ1LDYgKzY0NSw3IEBAIGxvY2Fs aXplZFN0cmluZ3NbIlRvdWNoIl0gPSAiVG91Y2giOwogbG9jYWxpemVkU3RyaW5nc1siQ2xvc2Ui XSA9ICJDbG9zZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSBPdGhlcnMiXSA9ICJDbG9zZSBP dGhlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xvc2UgQWxsIl0gPSAiQ2xvc2UgQWxsIjsKK2xv Y2FsaXplZFN0cmluZ3NbIkhpZGUgZWxlbWVudCJdID0gIkhpZGUgZWxlbWVudCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJUb2dnbGUgZWRpdCBhcyBIVE1MIl0gPSAiVG9nZ2xlIGVkaXQgYXMgSFRNTCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJQaW4gbmF2aWdhdG9yIl0gPSAiUGluIG5hdmlnYXRvciI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJTaG93IG5hdmlnYXRvciJdID0gIlNob3cgbmF2aWdhdG9yIjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5l bERlc2NyaXB0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzUGFuZWxEZXNjcmlwdG9yLmpzCmluZGV4IDAyNjdmNDViNGFlMmEyZTAwZTI2OGJkNDA5YWMy ZGYzMTA1MzI3YzUuLjJjZWM1ZTZiNTk2ZDlkOGQyYmY2YWI0M2I2MzcwZjU2OWQxNDU4OTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5l bERlc2NyaXB0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcwpAQCAtNjMsNiArNjMsNyBAQCBXZWJJbnNwZWN0b3Iu RWxlbWVudHNQYW5lbERlc2NyaXB0b3IucHJvdG90eXBlID0gewogICAgICAgICBlbGVtZW50c1Nl Y3Rpb24uYWRkUmVsYXRlZEtleXMoZXhwYW5kQ29sbGFwc2UsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRXhwYW5kL2NvbGxhcHNlIikpOwogCiAgICAgICAgIGVsZW1lbnRzU2VjdGlvbi5hZGRBbHRl cm5hdGVLZXlzKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5TaG9ydGN1dEtl eXMuRWRpdEF0dHJpYnV0ZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFZGl0IGF0dHJpYnV0ZSIp KTsKKyAgICAgICAgZWxlbWVudHNTZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoV2ViSW5zcGVjdG9y LkVsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLlNob3J0Y3V0S2V5cy5IaWRlRWxlbWVudCwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJIaWRlIGVsZW1lbnQiKSk7CiAgICAgICAgIGVsZW1lbnRzU2VjdGlv bi5hZGRBbHRlcm5hdGVLZXlzKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5T aG9ydGN1dEtleXMuVG9nZ2xlRWRpdEFzSFRNTCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUb2dn bGUgZWRpdCBhcyBIVE1MIikpOwogCiAgICAgICAgIHZhciBzdHlsZXNQYW5lU2VjdGlvbiA9IFdl Ykluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlN0eWxlcyBQYW5lIikpOwpAQCAtMTA3LDYgKzEwOCwxMCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNQYW5lbERlc2NyaXB0b3IuU2hvcnRjdXRLZXlzID0gewogICAgICAgICBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5LZXlzLkVudGVyKQogICAgIF0sCiAKKyAgICBIaWRlRWxlbWVudDogWworICAgICAgICBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkgpCisgICAgXSwKKwogICAgIFRvZ2dsZUVkaXRBc0hUTUw6 IFsKICAgICAgICAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3Io V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5GMikKICAgICBdLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5l LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzCmluZGV4IGU5YmU5NGUyNzA2N2U3ZGI2ZTQyYTMwNzI0OTZjMTI0YWRhY2QzYmYuLjgz NmZmMGQ3YmU4OTg1Y2I1MmI5ZGI3ODMwMTZiZDdmNGNiNDE5MmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anMKQEAgLTEwOTMsNiArMTA5MywzOCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKKyAgICBvbmhp ZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBub2RlID0gdGhpcy5yZXByZXNlbnRl ZE9iamVjdDsKKyAgICAgICAgdmFyIGlubGluZVN0eWxlID0gbm9kZS5nZXRBdHRyaWJ1dGUoInN0 eWxlIikgfHwgIiI7CisgICAgICAgIHZhciBzdHlsZXMgPSBpbmxpbmVTdHlsZS5zcGxpdCgiOyIp OworICAgICAgICB2YXIgb2xkVmlzaWJpbGl0eSA9ICIiOworCisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgc3R5bGVzLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgICBpZiAoc3R5bGVzW2ld ID09PSAiIikgeworICAgICAgICAgICAgICAgIHN0eWxlcy5zcGxpY2UoaS0tLCAxKTsKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdmFyIHN0 eWxlID0gc3R5bGVzW2ldLnNwbGl0KCI6Iik7CisgICAgICAgICAgICBpZiAoc3R5bGUubGVuZ3Ro ID09PSAyICYmIHN0eWxlWzBdLnRyaW0oKSA9PT0gInZpc2liaWxpdHkiKSB7CisgICAgICAgICAg ICAgICAgb2xkVmlzaWJpbGl0eSA9IHN0eWxlWzFdLnRyaW0oKTsKKyAgICAgICAgICAgICAgICBz dHlsZXMuc3BsaWNlKGktLSwgMSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAg ICBpZiAob2xkVmlzaWJpbGl0eSAhPT0gImhpZGRlbiIpCisgICAgICAgICAgICBzdHlsZXMucHVz aCgidmlzaWJpbGl0eTpoaWRkZW4iKTsKKworICAgICAgICBpZiAoc3R5bGVzLmxlbmd0aCkgewor ICAgICAgICAgICAgaW5saW5lU3R5bGUgPSBzdHlsZXMuam9pbigiOyIpOworICAgICAgICAgICAg bm9kZS5zZXRBdHRyaWJ1dGVWYWx1ZSgic3R5bGUiLCBpbmxpbmVTdHlsZSk7CisgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgbm9kZS5yZW1vdmVBdHRyaWJ1dGUoInN0eWxlIik7CisKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfSwKKwogICAgIHNlbGVjdE9uTW91c2VEb3duOiBmdW5jdGlv bihldmVudCkKICAgICB7CiAgICAgICAgIFRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3RPbk1v dXNlRG93bi5jYWxsKHRoaXMsIGV2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCA5YjhkODY4ZjdhNjk4 ODc5ZThlY2ViYzVjNzBiYmY1Y2MxMWJiYjM2Li45MWJiY2RjNmE5OTk1Y2QxMDQ2M2FmYzhkM2Jm YmNhN2Y0YzYwMDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCkBAIC05MCw3ICs5MCw4IEBAIFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleXMgPSB7CiAgICAgUGVyaW9kOiB7IGNvZGU6IDE5MCwgbmFt ZTogIi4iIH0sCiAgICAgU2xhc2g6IHsgY29kZTogMTkxLCBuYW1lOiAiLyIgfSwKICAgICBBcG9z dHJvcGhlOiB7IGNvZGU6IDE5MiwgbmFtZTogImAiIH0sCi0gICAgU2luZ2xlUXVvdGU6IHsgY29k ZTogMjIyLCBuYW1lOiAiXCciIH0KKyAgICBTaW5nbGVRdW90ZTogeyBjb2RlOiAyMjIsIG5hbWU6 ICJcJyIgfSwKKyAgICBIOiB7IGNvZGU6IDcyLCBuYW1lOiAiSCIgfQogfTsKIAogLyoqCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcwppbmRl eCA5YzUyZDVjODBjMDI5OTMzNTgzMjkwZmJmNzJlYzgyZTM1YTJhMjFkLi5hOWJjNzVlNzBhMjE4 OTA0MDNlZTI5MjhlODk1YWMwNGZiZGRiMWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMKQEAgLTM3NCw2ICszNzQsOCBAQCBUcmVl T3V0bGluZS5wcm90b3R5cGUuX3RyZWVLZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgICAg IGhhbmRsZWQgPSB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25lbnRlcigpOwogICAgIGVsc2Ug aWYgKGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMu U3BhY2UuY29kZSkKICAgICAgICAgaGFuZGxlZCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5v bnNwYWNlKCk7CisgICAgZWxzZSBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuS2V5cy5ILmNvZGUpCisgICAgICAgIGhhbmRsZWQgPSB0aGlzLnNlbGVj dGVkVHJlZUVsZW1lbnQub25oaWRlKCk7CiAKICAgICBpZiAobmV4dFNlbGVjdGVkRWxlbWVudCkg ewogICAgICAgICBuZXh0U2VsZWN0ZWRFbGVtZW50LnJldmVhbCgpOwpAQCAtMTAwMSw2ICsxMDAz LDcgQEAgVHJlZUVsZW1lbnQucHJvdG90eXBlLm9ucG9wdWxhdGUgPSBmdW5jdGlvbigpIHsgfQog VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZW50ZXIgPSBmdW5jdGlvbigpIHsgfQogVHJlZUVsZW1l bnQucHJvdG90eXBlLm9uZGVsZXRlID0gZnVuY3Rpb24oKSB7IH0KIFRyZWVFbGVtZW50LnByb3Rv dHlwZS5vbnNwYWNlID0gZnVuY3Rpb24oKSB7IH0KK1RyZWVFbGVtZW50LnByb3RvdHlwZS5vbmhp ZGUgPSBmdW5jdGlvbigpIHsgfQogVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoID0gZnVu Y3Rpb24oKSB7IH0KIFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmV4cGFuZCA9IGZ1bmN0aW9uKCkg eyB9CiBUcmVlRWxlbWVudC5wcm90b3R5cGUub25jb2xsYXBzZSA9IGZ1bmN0aW9uKCkgeyB9Cg== 177840 2012-12-05 15:08:36 -0800 2012-12-07 11:25:21 -0800 Patch bug-104146-20121205150601.patch text/plain 7577 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY3ODE3ZDhkMjAzODUy ZTI3ZDAwZGZiNzQwYjljN2YyM2M0NTQwZC4uZDI1OThjMjQ4YzlhOWU1MzE4MGZhMWY4ZmVjNWIx MTZiYTI5OGEwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTEyLTA1ICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBzaG9ydGN1dCB0byBzZXQgdmlzaWJpbGl0eTpoaWRkZW4gb24gZWxlbWVudHMg aW4gdGhlIEVsZW1lbnRzUGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgdGhlIHNob3J0Y3V0IEggdG8gc2V0IGFuZCB1 bnNldCB2aXNpYmlsaXR5OmhpZGRlbiBvbiB0aGUgaW5saW5lIHN0eWxlCisgICAgICAgIG9mIGVs ZW1lbnRzIGluIHRoZSBFbGVtZW50c3BhbmVsLiBUaGlzIGZlYXR1cmUgbWFrZXMgaXQgZWFzaWVy IHRvIGxvb2sgZm9yIGVsZW1lbnRzIHRoYXQKKyAgICAgICAgY2F1c2UgYmFkIHJlbmRlcmluZyBw ZXJmb3JtYW5jZSwgYmVjYXVzZSB2aXNpYmlsaXR5OmhpZGRlbiBkb2VzIG5vdCBwYWludCB0aGUg ZWxlbWVudCwKKyAgICAgICAgYnV0IHByZXNlcnZlcyB0aGUgbGF5b3V0LgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnJlc29sdmVVUkwpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnRvZ2dsZUlubGluZVZpc2liaWxpdHkpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbERlc2NyaXB0b3IucHJvdG90eXBlLnJl Z2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRz VHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVu dC5wcm90b3R5cGUub25oaWRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJv YXJkU2hvcnRjdXQuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGlu ZS5qczoKKyAgICAgICAgKFRyZWVPdXRsaW5lLnByb3RvdHlwZS5fdHJlZUtleURvd24pOgorICAg ICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uaGlkZSk6CisKIDIwMTItMTItMDQgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIFJlbmFtZSBWOERPTVdy YXBwZXIgbWVtYmVyIGZ1bmN0aW9ucyB0byBiZSBtb3JlIGRlc2NyaXB0aXZlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggZWZmZmEx Y2Q2NGJkZmZjNDViMmY5ODkxZDBmOThjYTgxNjQ2ZjQxZS4uZTg1MjZmOGIyOWQ3N2YwODFkZmY4 NThjMjJhMzQzYTRkYTEzZTQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNjQ1LDYgKzY0NSw3IEBAIGxvY2FsaXplZFN0cmlu Z3NbIlRvdWNoIl0gPSAiVG91Y2giOwogbG9jYWxpemVkU3RyaW5nc1siQ2xvc2UiXSA9ICJDbG9z ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSBPdGhlcnMiXSA9ICJDbG9zZSBPdGhlcnMiOwog bG9jYWxpemVkU3RyaW5nc1siQ2xvc2UgQWxsIl0gPSAiQ2xvc2UgQWxsIjsKK2xvY2FsaXplZFN0 cmluZ3NbIkhpZGUgZWxlbWVudCJdID0gIkhpZGUgZWxlbWVudCI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJUb2dnbGUgZWRpdCBhcyBIVE1MIl0gPSAiVG9nZ2xlIGVkaXQgYXMgSFRNTCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJQaW4gbmF2aWdhdG9yIl0gPSAiUGluIG5hdmlnYXRvciI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IG5hdmlnYXRvciJdID0gIlNob3cgbmF2aWdhdG9yIjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IGFmYmJkNzY1NTEx ZDJiM2QzZThmMDVmOWIyNDM1MTE0N2MzMWNlZDEuLmMyZTIxZTU1YTUxM2Y0NzEwNWZjODc2NDhk MmFhMDI1NzJlNjQxNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRE9NQWdlbnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9ET01BZ2VudC5qcwpAQCAtNzU5LDYgKzc1OSwyMiBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZS5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5QYXJzZWRV UkwuY29tcGxldGVVUkwoZnJhbWVPd25lckNhbmRpZGF0ZS5iYXNlVVJMLCB1cmwpOwogICAgICAg ICB9CiAgICAgICAgIHJldHVybiBudWxsOworICAgIH0sCisKKyAgICB0b2dnbGVJbmxpbmVWaXNp YmlsaXR5OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmdW5jdGlvbiB1cGRhdGVJbmxpbmVW aXNpYmlsaXR5KGlubGluZVN0eWxlcykKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHZpc2li aWxpdHkgPSBpbmxpbmVTdHlsZXMuZ2V0TGl2ZVByb3BlcnR5KCJ2aXNpYmlsaXR5Iik7CisgICAg ICAgICAgICBpZiAodmlzaWJpbGl0eSkgeworICAgICAgICAgICAgICAgIGlmICh2aXNpYmlsaXR5 LnZhbHVlID09PSAiaGlkZGVuIikKKyAgICAgICAgICAgICAgICAgICAgdmlzaWJpbGl0eS5zZXRU ZXh0KCIiLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgICAgICB2aXNpYmlsaXR5LnNldFZhbHVlKCJoaWRkZW4iLCBmYWxzZSwgdHJ1ZSk7CisgICAg ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBpbmxpbmVTdHlsZXMuYXBwZW5kUHJvcGVy dHkoInZpc2liaWxpdHkiLCAiaGlkZGVuIik7CisgICAgICAgIH0KKyAgICAgICAgV2ViSW5zcGVj dG9yLmNzc01vZGVsLmdldElubGluZVN0eWxlc0FzeW5jKHRoaXMuaWQsIHVwZGF0ZUlubGluZVZp c2liaWxpdHkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuanMKaW5kZXggMDI2 N2Y0NWI0YWUyYTJlMDBlMjY4YmQ0MDlhYzJkZjMxMDUzMjdjNS4uMmNlYzVlNmI1OTZkOWQ4ZDJi ZjZhYjQzYjYzNzBmNTY5ZDE0NTg5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLmpzCkBAIC02 Myw2ICs2Myw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGVsZW1lbnRzU2VjdGlvbi5hZGRSZWxhdGVkS2V5cyhleHBhbmRDb2xs YXBzZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBhbmQvY29sbGFwc2UiKSk7CiAKICAgICAg ICAgZWxlbWVudHNTZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWxEZXNjcmlwdG9yLlNob3J0Y3V0S2V5cy5FZGl0QXR0cmlidXRlLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkVkaXQgYXR0cmlidXRlIikpOworICAgICAgICBlbGVtZW50c1NlY3Rpb24uYWRk QWx0ZXJuYXRlS2V5cyhXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuU2hvcnRj dXRLZXlzLkhpZGVFbGVtZW50LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgZWxlbWVudCIp KTsKICAgICAgICAgZWxlbWVudHNTZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoV2ViSW5zcGVjdG9y LkVsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLlNob3J0Y3V0S2V5cy5Ub2dnbGVFZGl0QXNIVE1MLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvZ2dsZSBlZGl0IGFzIEhUTUwiKSk7CiAKICAgICAgICAg dmFyIHN0eWxlc1BhbmVTZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5zZWN0 aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGVzIFBhbmUiKSk7CkBAIC0xMDcsNiArMTA4 LDEwIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5TaG9ydGN1dEtleXMg PSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9y KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRW50ZXIpCiAgICAgXSwKIAorICAg IEhpZGVFbGVtZW50OiBbCisgICAgICAgIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1h a2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuSCkKKyAgICBd LAorCiAgICAgVG9nZ2xlRWRpdEFzSFRNTDogWwogICAgICAgICBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5L ZXlzLkYyKQogICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggZTliZTk0ZTI3MDY3ZTdkYjZl NDJhMzA3MjQ5NmMxMjRhZGFjZDNiZi4uMTI3NmQ2MWRhNmU1ZTdlMzI4NWVjMmU5NTM1YzkxODZk M2JhMDVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtMTA5Myw2ICsxMDkzLDEyIEBAIFdlYklu c3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfSwKIAorICAgIG9uaGlkZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg dGhpcy5yZXByZXNlbnRlZE9iamVjdC50b2dnbGVJbmxpbmVWaXNpYmlsaXR5KCk7CisgICAgICAg IHJldHVybiB0cnVlOworICAgIH0sCisKICAgICBzZWxlY3RPbk1vdXNlRG93bjogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICBUcmVlRWxlbWVudC5wcm90b3R5cGUuc2VsZWN0T25Nb3Vz ZURvd24uY2FsbCh0aGlzLCBldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKaW5kZXggOWI4ZDg2OGY3YTY5ODg3 OWU4ZWNlYmM1YzcwYmJmNWNjMTFiYmIzNi4uOTFiYmNkYzZhOTk5NWNkMTA0NjNhZmM4ZDNiZmJj YTdmNGM2MDA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9LZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwpAQCAtOTAsNyArOTAsOCBAQCBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5LZXlzID0gewogICAgIFBlcmlvZDogeyBjb2RlOiAxOTAsIG5hbWU6 ICIuIiB9LAogICAgIFNsYXNoOiB7IGNvZGU6IDE5MSwgbmFtZTogIi8iIH0sCiAgICAgQXBvc3Ry b3BoZTogeyBjb2RlOiAxOTIsIG5hbWU6ICJgIiB9LAotICAgIFNpbmdsZVF1b3RlOiB7IGNvZGU6 IDIyMiwgbmFtZTogIlwnIiB9CisgICAgU2luZ2xlUXVvdGU6IHsgY29kZTogMjIyLCBuYW1lOiAi XCciIH0sCisgICAgSDogeyBjb2RlOiA3MiwgbmFtZTogIkgiIH0KIH07CiAKIC8qKgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMKaW5kZXgg OWM1MmQ1YzgwYzAyOTkzMzU4MzI5MGZiZjcyZWM4MmUzNWEyYTIxZC4uYTliYzc1ZTcwYTIxODkw NDAzZWUyOTI4ZTg5NWFjMDRmYmRkYjFiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCkBAIC0zNzQsNiArMzc0LDggQEAgVHJlZU91 dGxpbmUucHJvdG90eXBlLl90cmVlS2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQogICAgICAgICBo YW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uZW50ZXIoKTsKICAgICBlbHNlIGlm IChldmVudC5rZXlDb2RlID09PSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNw YWNlLmNvZGUpCiAgICAgICAgIGhhbmRsZWQgPSB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25z cGFjZSgpOworICAgIGVsc2UgaWYgKGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0LktleXMuSC5jb2RlKQorICAgICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3Rl ZFRyZWVFbGVtZW50Lm9uaGlkZSgpOwogCiAgICAgaWYgKG5leHRTZWxlY3RlZEVsZW1lbnQpIHsK ICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudC5yZXZlYWwoKTsKQEAgLTEwMDEsNiArMTAwMyw3 IEBAIFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnBvcHVsYXRlID0gZnVuY3Rpb24oKSB7IH0KIFRy ZWVFbGVtZW50LnByb3RvdHlwZS5vbmVudGVyID0gZnVuY3Rpb24oKSB7IH0KIFRyZWVFbGVtZW50 LnByb3RvdHlwZS5vbmRlbGV0ZSA9IGZ1bmN0aW9uKCkgeyB9CiBUcmVlRWxlbWVudC5wcm90b3R5 cGUub25zcGFjZSA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxlbWVudC5wcm90b3R5cGUub25oaWRl ID0gZnVuY3Rpb24oKSB7IH0KIFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCA9IGZ1bmN0 aW9uKCkgeyB9CiBUcmVlRWxlbWVudC5wcm90b3R5cGUub25leHBhbmQgPSBmdW5jdGlvbigpIHsg fQogVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uY29sbGFwc2UgPSBmdW5jdGlvbigpIHsgfQo= 178244 2012-12-07 11:25:24 -0800 2012-12-07 12:53:33 -0800 Patch bug-104146-20121207112247.patch text/plain 6360 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMwNWE2ZjE1ZGMzYmJk YjZlOWFlMmM3Y2I1OGEyZGVhODZmZjJiZS4uOTMzYWE0ZWM5NGYxNDRjYjRhYjk0NzU1OWM0Y2Q2 NGVlMjAzZjdkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEyLTA3ICBFYmVy aGFyZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBzaG9ydGN1dCB0byBzZXQgdmlzaWJpbGl0eTpoaWRkZW4gb24gZWxlbWVudHMg aW4gdGhlIEVsZW1lbnRzUGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgdGhlIHNob3J0Y3V0IEggdG8gc2V0IGFuZCB1 bnNldCB2aXNpYmlsaXR5OmhpZGRlbiBvbiB0aGUgaW5saW5lIHN0eWxlCisgICAgICAgIG9mIGVs ZW1lbnRzIGluIHRoZSBFbGVtZW50c3BhbmVsLiBUaGlzIGZlYXR1cmUgbWFrZXMgaXQgZWFzaWVy IHRvIGxvb2sgZm9yIGVsZW1lbnRzIHRoYXQKKyAgICAgICAgY2F1c2UgYmFkIHJlbmRlcmluZyBw ZXJmb3JtYW5jZSwgYmVjYXVzZSB2aXNpYmlsaXR5OmhpZGRlbiBkb2VzIG5vdCBwYWludCB0aGUg ZWxlbWVudCwKKyAgICAgICAgYnV0IHByZXNlcnZlcyB0aGUgbGF5b3V0LgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUudG9nZ2xlSW5saW5lVmlz aWJpbGl0eSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsRGVz Y3JpcHRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRv ci5wcm90b3R5cGUucmVnaXN0ZXJTaG9ydGN1dHMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVt ZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5oYW5kbGVTaG9ydGN1dCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzOgorCiAyMDEyLTEyLTA3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSB0aGUgYmFj a2VuZCBmb3IgZXhwb3NpbmcgdGhlIGxheWVyIHRyZWUgdG8gdGhlIFdlYiBJbnNwZWN0b3IKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRl eCBlZmZmYTFjZDY0YmRmZmM0NWIyZjk4OTFkMGY5OGNhODE2NDZmNDFlLi5lODUyNmY4YjI5ZDc3 ZjA4MWRmZjg1OGMyMmEzNDNhNGRhMTNlNDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9F bmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC02NDUsNiArNjQ1LDcgQEAgbG9jYWxp emVkU3RyaW5nc1siVG91Y2giXSA9ICJUb3VjaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSJd ID0gIkNsb3NlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsb3NlIE90aGVycyJdID0gIkNsb3NlIE90 aGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSBBbGwiXSA9ICJDbG9zZSBBbGwiOworbG9j YWxpemVkU3RyaW5nc1siSGlkZSBlbGVtZW50Il0gPSAiSGlkZSBlbGVtZW50IjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlRvZ2dsZSBlZGl0IGFzIEhUTUwiXSA9ICJUb2dnbGUgZWRpdCBhcyBIVE1MIjsK IGxvY2FsaXplZFN0cmluZ3NbIlBpbiBuYXZpZ2F0b3IiXSA9ICJQaW4gbmF2aWdhdG9yIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlNob3cgbmF2aWdhdG9yIl0gPSAiU2hvdyBuYXZpZ2F0b3IiOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpz CmluZGV4IDBiMzU4ZmIxNTU0MTUwMGQyYWRkZWY4MzA0ZTA0ODU5YWZjMGI3YjAuLmZhYzc3MGNm OWQ4ODQzNTBiMjhiM2QwZjY2NTJlMTRiN2FkODUxYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTUzMCw2ICs1MzAs MjkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gc291cmNlTWFwcGluZyA/IHNvdXJjZU1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRp b24ocmF3TG9jYXRpb24pIDogbnVsbDsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFt IHtET01BZ2VudC5Ob2RlSWR9IG5vZGVJZAorICAgICAqLworICAgIHRvZ2dsZUlubGluZVZpc2li aWxpdHk6IGZ1bmN0aW9uKG5vZGVJZCkKKyAgICB7CisgICAgICAgIC8qKgorICAgICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9ufSBpbmxpbmVTdHlsZXMKKyAg ICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGlubGluZVN0eWxlcykKKyAgICAg ICAgeworICAgICAgICAgICAgdmFyIHZpc2liaWxpdHkgPSBpbmxpbmVTdHlsZXMuZ2V0TGl2ZVBy b3BlcnR5KCJ2aXNpYmlsaXR5Iik7CisgICAgICAgICAgICBpZiAodmlzaWJpbGl0eSkgeworICAg ICAgICAgICAgICAgIGlmICh2aXNpYmlsaXR5LnZhbHVlID09PSAiaGlkZGVuIikKKyAgICAgICAg ICAgICAgICAgICAgdmlzaWJpbGl0eS5zZXRUZXh0KCIiLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2aXNpYmlsaXR5LnNldFZhbHVlKCJo aWRkZW4iLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICBpbmxpbmVTdHlsZXMuYXBwZW5kUHJvcGVydHkoInZpc2liaWxpdHkiLCAiaGlkZGVuIik7Cisg ICAgICAgIH0KKworICAgICAgICB0aGlzLmdldElubGluZVN0eWxlc0FzeW5jKG5vZGVJZCwgY2Fs bGJhY2suYmluZCh0aGlzKSk7CisgICAgfSwKKwogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9y Lk9iamVjdC5wcm90b3R5cGUKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuanMKaW5kZXggMDI2 N2Y0NWI0YWUyYTJlMDBlMjY4YmQ0MDlhYzJkZjMxMDUzMjdjNS4uMmNlYzVlNmI1OTZkOWQ4ZDJi ZjZhYjQzYjYzNzBmNTY5ZDE0NTg5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLmpzCkBAIC02 Myw2ICs2Myw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGVsZW1lbnRzU2VjdGlvbi5hZGRSZWxhdGVkS2V5cyhleHBhbmRDb2xs YXBzZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBhbmQvY29sbGFwc2UiKSk7CiAKICAgICAg ICAgZWxlbWVudHNTZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWxEZXNjcmlwdG9yLlNob3J0Y3V0S2V5cy5FZGl0QXR0cmlidXRlLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkVkaXQgYXR0cmlidXRlIikpOworICAgICAgICBlbGVtZW50c1NlY3Rpb24uYWRk QWx0ZXJuYXRlS2V5cyhXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuU2hvcnRj dXRLZXlzLkhpZGVFbGVtZW50LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgZWxlbWVudCIp KTsKICAgICAgICAgZWxlbWVudHNTZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoV2ViSW5zcGVjdG9y LkVsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLlNob3J0Y3V0S2V5cy5Ub2dnbGVFZGl0QXNIVE1MLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvZ2dsZSBlZGl0IGFzIEhUTUwiKSk7CiAKICAgICAgICAg dmFyIHN0eWxlc1BhbmVTZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5zZWN0 aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGVzIFBhbmUiKSk7CkBAIC0xMDcsNiArMTA4 LDEwIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsRGVzY3JpcHRvci5TaG9ydGN1dEtleXMg PSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9y KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRW50ZXIpCiAgICAgXSwKIAorICAg IEhpZGVFbGVtZW50OiBbCisgICAgICAgIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1h a2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuSCkKKyAgICBd LAorCiAgICAgVG9nZ2xlRWRpdEFzSFRNTDogWwogICAgICAgICBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5L ZXlzLkYyKQogICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggZTliZTk0ZTI3MDY3ZTdkYjZl NDJhMzA3MjQ5NmMxMjRhZGFjZDNiZi4uZmU3MTU5MDlmOWJiODI4OTViNWJiZmI4OWZhMjhmZjY1 NTYwMGZjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtNTU5LDYgKzU1OSwxMCBAQCBXZWJJbnNw ZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAorICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuS2V5cy5ILmNvZGUpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5j c3NNb2RlbC50b2dnbGVJbmxpbmVWaXNpYmlsaXR5KG5vZGUuaWQpOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CiAgICAgfSwKIAogICAgIF90b2dnbGVFZGl0QXNIVE1MOiBmdW5jdGlv bihub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9L ZXlib2FyZFNob3J0Y3V0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9L ZXlib2FyZFNob3J0Y3V0LmpzCmluZGV4IDliOGQ4NjhmN2E2OTg4NzllOGVjZWJjNWM3MGJiZjVj YzExYmJiMzYuLjkxYmJjZGM2YTk5OTVjZDEwNDYzYWZjOGQzYmZiY2E3ZjRjNjAwODAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1 dC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hv cnRjdXQuanMKQEAgLTkwLDcgKzkwLDggQEAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu S2V5cyA9IHsKICAgICBQZXJpb2Q6IHsgY29kZTogMTkwLCBuYW1lOiAiLiIgfSwKICAgICBTbGFz aDogeyBjb2RlOiAxOTEsIG5hbWU6ICIvIiB9LAogICAgIEFwb3N0cm9waGU6IHsgY29kZTogMTky LCBuYW1lOiAiYCIgfSwKLSAgICBTaW5nbGVRdW90ZTogeyBjb2RlOiAyMjIsIG5hbWU6ICJcJyIg fQorICAgIFNpbmdsZVF1b3RlOiB7IGNvZGU6IDIyMiwgbmFtZTogIlwnIiB9LAorICAgIEg6IHsg Y29kZTogNzIsIG5hbWU6ICJIIiB9CiB9OwogCiAvKioK