100593 2012-10-27 08:09:50 -0700 Web Inspector: Restoring breakpoints for formatted UISourceCode should be triggered by BreakpointManager, not ScriptsPanel. 2012-11-01 05:27:59 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov dglazkov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 752759 0 vsevik 2012-10-27 08:09:50 -0700 Patch to follow. 752765 1 171091 vsevik 2012-10-27 08:17:18 -0700 Created attachment 171091 Patch 752860 2 171091 webkit.review.bot 2012-10-27 18:09:52 -0700 Comment on attachment 171091 Patch Attachment 171091 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14615607 New failing tests: inspector/debugger/linkifier.html inspector/debugger/script-formatter-console.html inspector/debugger/script-formatter-breakpoints.html inspector/debugger/script-formatter-search.html 752928 3 171091 buildbot 2012-10-28 03:01:42 -0700 Comment on attachment 171091 Patch Attachment 171091 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14617700 New failing tests: inspector/debugger/script-formatter-console.html inspector/debugger/script-formatter-breakpoints.html inspector/debugger/script-formatter-search.html 753139 4 171091 pfeldman 2012-10-29 01:25:31 -0700 Comment on attachment 171091 Patch I thought that formatting was encapsulated in the UI layer, why does breakpoint manager need to care about it? 756115 5 171091 webkit.review.bot 2012-11-01 05:27:55 -0700 Comment on attachment 171091 Patch Clearing flags on attachment: 171091 Committed r133151: <http://trac.webkit.org/changeset/133151> 756116 6 webkit.review.bot 2012-11-01 05:27:59 -0700 All reviewed patches have been landed. Closing bug. 171091 2012-10-27 08:17:18 -0700 2012-11-01 05:27:55 -0700 Patch bug-100593-20121027191547.patch text/plain 14850 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY1OTY3M2RiMTI4Yzkz MjU5MmQ1ODdhZDA1NDNiYTM5YzE2ZDA4MC4uMzUwZTgxNzVhMDhkYjY0MTI5YTU0YzQ0ZjI3NmY3 YmU2MWE2YTA3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTEwLTI3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlc3RvcmluZyBicmVha3BvaW50cyBmb3IgZm9ybWF0dGVkIFVJU291cmNlQ29kZSBzaG91 bGQgYmUgdHJpZ2dlcmVkIGJ5IEJyZWFrcG9pbnRNYW5hZ2VyLCBub3QgU2NyaXB0c1BhbmVsLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNTkzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnJlYWtwb2lu dE1hbmFnZXIgbm93IGxpc3RlbiBmb3IgRm9ybWF0dGVkQ2hhbmdlZCBldmVudCBhbmQgcmVzdG9y ZXMgZm9ybWF0dGVkIGJyZWFrcG9pbnRzIG9uIGl0LgorICAgICAgICBSZW1vdmVkIG5vdyByZWR1 bmRhbnQgY2FsbGJhY2sgZnJvbSBVSVNvdXJjZUNvZGUuc2V0Rm9ybWF0dGVkKCkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fcmVzdG9yZUJyZWFrcG9p bnRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUu X3VpU291cmNlQ29kZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFu YWdlci5wcm90b3R5cGUuX3VpU291cmNlQ29kZUZvcm1hdHRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl91aVNvdXJjZUNvZGVSZW1vdmVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRVSVNvdXJjZUNvZGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3JldmVhbEV4ZWN1 dGlvbkxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu X3RvZ2dsZUZvcm1hdFNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNv dXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlw ZS5fZmlyZUNvbnRlbnRBdmFpbGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZS5wcm90b3R5cGUuc2V0Rm9ybWF0dGVkLmZvcm1hdHRlZENoYW5nZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuc2V0Rm9ybWF0dGVkLmRpZEdldENv bnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuc2V0 Rm9ybWF0dGVkKToKKwogMjAxMi0xMC0yNiAgUGhpbGlwIFJvZ2VycyAgPHBkckBnb29nbGUuY29t PgogCiAgICAgICAgIFByZXZlbnQgTmFOIG9mZnNldCB2YWx1ZXMgaW4gRWxlbWVudFRpbWVDb250 cm9sLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50TWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJl YWtwb2ludE1hbmFnZXIuanMKaW5kZXggYWU1NGI3OTU3YzAxMmU3NTI4Zjk3OTRiZjEwMGFlNzIx MmE2NzMwNy4uNjlmNTZjMDA0MGEwNDE2ZTE2NDM1NjNiZWE4MzU0OWFiOTQzYjBlZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdl ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRN YW5hZ2VyLmpzCkBAIC02Nyw3ICs2Nyw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdl ci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKi8KLSAgICByZXN0b3JlQnJlYWtwb2ludHM6 IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICBfcmVzdG9yZUJyZWFrcG9pbnRzOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUpCiAgICAgewogICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLmJyZWFrcG9pbnRTdG9yYWdlSWQodWlTb3VyY2VDb2Rl KTsKICAgICAgICAgaWYgKCFzb3VyY2VGaWxlSWQgfHwgdGhpcy5fc291cmNlRmlsZXNXaXRoUmVz dG9yZWRCcmVha3BvaW50c1tzb3VyY2VGaWxlSWRdKQpAQCAtOTIsOCArOTIsMTkgQEAgV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICBfdWlTb3VyY2VDb2Rl QWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9 IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gKi8gZXZlbnQuZGF0YTsKLSAg ICAgICAgaWYgKHVpU291cmNlQ29kZS5jb250ZW50VHlwZSgpID09PSBXZWJJbnNwZWN0b3IucmVz b3VyY2VUeXBlcy5TY3JpcHQgfHwgdWlTb3VyY2VDb2RlLmNvbnRlbnRUeXBlKCkgPT09IFdlYklu c3BlY3Rvci5yZXNvdXJjZVR5cGVzLkRvY3VtZW50KQotICAgICAgICAgICAgdGhpcy5yZXN0b3Jl QnJlYWtwb2ludHModWlTb3VyY2VDb2RlKTsKKyAgICAgICAgaWYgKHVpU291cmNlQ29kZS5jb250 ZW50VHlwZSgpID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQgfHwgdWlTb3Vy Y2VDb2RlLmNvbnRlbnRUeXBlKCkgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLkRvY3Vt ZW50KSB7CisgICAgICAgICAgICB0aGlzLl9yZXN0b3JlQnJlYWtwb2ludHModWlTb3VyY2VDb2Rl KTsKKyAgICAgICAgICAgIHVpU291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUuRXZlbnRzLkZvcm1hdHRlZENoYW5nZWQsIHRoaXMuX3VpU291cmNlQ29k ZUZvcm1hdHRlZCwgdGhpcyk7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX3VpU291cmNl Q29kZUZvcm1hdHRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC50 YXJnZXQ7CisgICAgICAgIHRoaXMuX3Jlc3RvcmVCcmVha3BvaW50cyh1aVNvdXJjZUNvZGUpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTEyNiw3ICsxMzcsNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtw b2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHRo aXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVzKCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50TWFuYWdlci5icmVha3BvaW50U3RvcmFnZUlkKHVpU291cmNlQ29kZXNb aV0pID09PSBzb3VyY2VGaWxlSWQpCi0gICAgICAgICAgICAgICAgdGhpcy5yZXN0b3JlQnJlYWtw b2ludHModWlTb3VyY2VDb2Rlc1tpXSk7CisgICAgICAgICAgICAgICAgdGhpcy5fcmVzdG9yZUJy ZWFrcG9pbnRzKHVpU291cmNlQ29kZXNbaV0pOwogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRl eCA4YzM1YjI3Mzc0M2IyMWM2NjQ1NTQ4ZDUxMzczMWIzMGY1NjUwOGI3Li45NDY5ODcwMjFjNGQx NGJlNzRkZDk2M2JkMWZmNWIxMDI1MDRkOWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjQ3LDcgKzI0Nyw3IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIF9hZGRVSVNvdXJjZUNv ZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl90b2dn bGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCkKLSAgICAgICAgICAgIHVpU291cmNlQ29kZS5z ZXRGb3JtYXR0ZWQodHJ1ZSwgdGhpcy5fdWlTb3VyY2VDb2RlRm9ybWF0dGVkLmJpbmQodGhpcywg dWlTb3VyY2VDb2RlKSk7CisgICAgICAgICAgICB1aVNvdXJjZUNvZGUuc2V0Rm9ybWF0dGVkKHRy dWUpOwogCiAgICAgICAgIHRoaXMuX25hdmlnYXRvci5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VD b2RlKTsKICAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLmFkZFVJU291cmNlQ29kZSh1aVNv dXJjZUNvZGUpOwpAQCAtNTE3LDcgKzUxNyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHRoaXMu X2VkaXRvckNvbnRhaW5lci5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKICAgICAgICAg ICAgIGlmICh1aVNvdXJjZUNvZGUuZm9ybWF0dGVkKCkgIT09IHRoaXMuX3RvZ2dsZUZvcm1hdFNv dXJjZUJ1dHRvbi50b2dnbGVkKQotICAgICAgICAgICAgICAgIHVpU291cmNlQ29kZS5zZXRGb3Jt YXR0ZWQodGhpcy5fdG9nZ2xlRm9ybWF0U291cmNlQnV0dG9uLnRvZ2dsZWQsIHRoaXMuX3VpU291 cmNlQ29kZUZvcm1hdHRlZC5iaW5kKHRoaXMsIHVpU291cmNlQ29kZSkpOworICAgICAgICAgICAg ICAgIHVpU291cmNlQ29kZS5zZXRGb3JtYXR0ZWQodGhpcy5fdG9nZ2xlRm9ybWF0U291cmNlQnV0 dG9uLnRvZ2dsZWQpOwogICAgICAgICB9CiAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMu X3Nob3dGaWxlKHVpU291cmNlQ29kZSk7CiAgICAgICAgIHNvdXJjZUZyYW1lLnJldmVhbExpbmUo dWlMb2NhdGlvbi5saW5lTnVtYmVyKTsKQEAgLTk0MSwxNyArOTQxLDEyIEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2aWV3LnJlcGxhY2VBbGxXaXRo KHF1ZXJ5LCB0ZXh0KTsKICAgICB9LAogCi0gICAgX3VpU291cmNlQ29kZUZvcm1hdHRlZDogZnVu Y3Rpb24odWlTb3VyY2VDb2RlKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmJyZWFrcG9p bnRNYW5hZ2VyLnJlc3RvcmVCcmVha3BvaW50cyh1aVNvdXJjZUNvZGUpOwotICAgIH0sCi0KICAg ICBfdG9nZ2xlRm9ybWF0U291cmNlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl90 b2dnbGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCA9ICF0aGlzLl90b2dnbGVGb3JtYXRTb3Vy Y2VCdXR0b24udG9nZ2xlZDsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl93b3Jr c3BhY2UudWlTb3VyY2VDb2RlcygpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291 cmNlQ29kZXMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB1aVNvdXJjZUNvZGVzW2ldLnNldEZv cm1hdHRlZCh0aGlzLl90b2dnbGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCwgdGhpcy5fdWlT b3VyY2VDb2RlRm9ybWF0dGVkLmJpbmQodGhpcywgdWlTb3VyY2VDb2Rlc1tpXSkpOworICAgICAg ICAgICAgdWlTb3VyY2VDb2Rlc1tpXS5zZXRGb3JtYXR0ZWQodGhpcy5fdG9nZ2xlRm9ybWF0U291 cmNlQnV0dG9uLnRvZ2dsZWQpOwogICAgIH0sCiAKICAgICBhZGRUb1dhdGNoOiBmdW5jdGlvbihl eHByZXNzaW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9VSVNvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZS5qcwppbmRleCBjMzEyYzFiNGEyNTFhNjE2MDQ1Y2U1MzQxNDJjYmJlYzBjNGQy Mjg3Li45OGE1MTQ2NTE3MmMxZTQyNmE0NjY0NzUyNDdmMmZhMmNiODE0NmEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwpAQCAt Mzk5LDE2ICszOTksOCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGNhbGxiYWNrc1tpXShjb250ZW50LCBjb250ZW50RW5jb2RlZCwgbWltZVR5 cGUpOwogCiAgICAgICAgIGlmICh0aGlzLl9mb3JtYXRPbkxvYWQpIHsKLSAgICAgICAgICAgIGZ1 bmN0aW9uIGZvcm1hdHRlZENhbGxiYWNrKCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3BlbmRpbmdGb3JtYXR0ZWRDYWxsYmFja3MubGVu Z3RoOyArK2kpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuX3BlbmRpbmdGb3JtYXR0ZWRDYWxs YmFja3NbaV0oKTsKLSAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ0Zvcm1hdHRl ZENhbGxiYWNrczsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgIH0KLQogICAgICAgICAg ICAgZGVsZXRlIHRoaXMuX2Zvcm1hdE9uTG9hZDsKLSAgICAgICAgICAgIHRoaXMuc2V0Rm9ybWF0 dGVkKHRydWUsIGZvcm1hdHRlZENhbGxiYWNrLmJpbmQodGhpcykpOworICAgICAgICAgICAgdGhp cy5zZXRGb3JtYXR0ZWQodHJ1ZSk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC01MDIsMTQgKzQ5 NCw2IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIC8qKgog ICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgdG9nZ2xpbmdGb3JtYXR0ZXI6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90b2dnbGluZ0Zvcm1hdHRl cjsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHJldHVybiB7Ym9vbGVhbn0KLSAgICAgKi8K ICAgICBmb3JtYXR0ZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVybiAhIXRoaXMu X2Zvcm1hdHRlZDsKQEAgLTUxNywyMyArNTAxLDE2IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGUucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29sZWFufSBmb3Jt YXR0ZWQKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKCk9fSBjYWxsYmFjawogICAgICAqLwotICAg IHNldEZvcm1hdHRlZDogZnVuY3Rpb24oZm9ybWF0dGVkLCBjYWxsYmFjaykKKyAgICBzZXRGb3Jt YXR0ZWQ6IGZ1bmN0aW9uKGZvcm1hdHRlZCkKICAgICB7Ci0gICAgICAgIGNhbGxiYWNrID0gY2Fs bGJhY2sgfHwgZnVuY3Rpb24oKSB7fTsKICAgICAgICAgaWYgKCF0aGlzLmNvbnRlbnRMb2FkZWQo KSkgewotICAgICAgICAgICAgaWYgKCF0aGlzLl9wZW5kaW5nRm9ybWF0dGVkQ2FsbGJhY2tzKQot ICAgICAgICAgICAgICAgIHRoaXMuX3BlbmRpbmdGb3JtYXR0ZWRDYWxsYmFja3MgPSBbXTsKLSAg ICAgICAgICAgIHRoaXMuX3BlbmRpbmdGb3JtYXR0ZWRDYWxsYmFja3MucHVzaChjYWxsYmFjayk7 CiAgICAgICAgICAgICB0aGlzLl9mb3JtYXRPbkxvYWQgPSBmb3JtYXR0ZWQ7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy5fZm9ybWF0dGVkID09PSBm b3JtYXR0ZWQpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKCk7CisgICAgICAgIGlmICh0aGlzLl9m b3JtYXR0ZWQgPT09IGZvcm1hdHRlZCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQog CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZCA9IGZvcm1hdHRlZDsKIApAQCAtNTY0LDE0ICs1NDEs MTEgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICAgKi8KICAgICAgICAgICAgIGZ1bmN0aW9uIGZvcm1hdHRlZENoYW5nZWQoY29udGVudCwgZm9y bWF0dGVyTWFwcGluZykKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB0aGlzLl90b2dn bGluZ0Zvcm1hdHRlciA9IHRydWU7CiAgICAgICAgICAgICAgICAgdGhpcy5fY29udGVudCA9IGNv bnRlbnQ7CiAgICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3dvcmtpbmdDb3B5OwotICAgICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUuRXZlbnRzLkZvcm1hdHRlZENoYW5nZWQsIHtjb250ZW50OiBjb250ZW50fSk7Ci0g ICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RvZ2dsaW5nRm9ybWF0dGVyOwogICAgICAgICAg ICAgICAgIHRoaXMuX2Zvcm1hdHRlck1hcHBpbmcgPSBmb3JtYXR0ZXJNYXBwaW5nOworICAgICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUuRXZlbnRzLkZvcm1hdHRlZENoYW5nZWQsIHtjb250ZW50OiBjb250ZW50fSk7CiAg ICAgICAgICAgICAgICAgdGhpcy51cGRhdGVMaXZlTG9jYXRpb25zKCk7Ci0gICAgICAgICAgICAg ICAgY2FsbGJhY2soKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0sCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg M2ViMDNhYjhlMzVjYmIwYWE1ODRhODBhYjk4Nzg1MGIwODgyNGJmMS4uZTRmOTk2NWQwM2ZiZWU0 OWE0OTFlODFkM2E1MjYwOGU2YTczMTNkOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEw LTI3ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFJlc3RvcmluZyBicmVha3BvaW50cyBmb3IgZm9ybWF0dGVkIFVJU291cmNl Q29kZSBzaG91bGQgYmUgdHJpZ2dlcmVkIGJ5IEJyZWFrcG9pbnRNYW5hZ2VyLCBub3QgU2NyaXB0 c1BhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAwNTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1icmVha3BvaW50cy5odG1sOgor ICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNvbnNvbGUuaHRt bDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1zZWFyY2gt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0 dGVyLXNlYXJjaC5odG1sOgorCiAyMDEyLTEwLTI2ICBQaGlsaXAgUm9nZXJzICA8cGRyQGdvb2ds ZS5jb20+CiAKICAgICAgICAgUHJldmVudCBOYU4gb2Zmc2V0IHZhbHVlcyBpbiBFbGVtZW50VGlt ZUNvbnRyb2wuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2Ny aXB0LWZvcm1hdHRlci1icmVha3BvaW50cy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXItYnJlYWtwb2ludHMuaHRtbAppbmRleCA4YWZhMmFlN2U5 YTc1Y2E5OWJjYWQ1Y2UyNzQxZTI0ZGEzYjk0ZDE5Li45ZDc0M2U3NjhiYzZmODk0YzEwZjVlNzFi OWE3ZDUxMmYxNDQ4NjNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvc2NyaXB0LWZvcm1hdHRlci1icmVha3BvaW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWJyZWFrcG9pbnRzLmh0bWwKQEAgLTQx LDExICs0MSwxMyBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKIAogICAgICAgICAgICAgZnVuY3Rp b24gcmVzdW1lZCgpCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgc291cmNlRnJhbWUu X3VpU291cmNlQ29kZS5zZXRGb3JtYXR0ZWQodHJ1ZSwgZGlkRm9ybWF0UGFnZSk7CisgICAgICAg ICAgICAgICAgc291cmNlRnJhbWUuX3VpU291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkZvcm1hdHRlZENoYW5nZWQsIGRpZEZvcm1hdFBh Z2UsIHRoaXMpOworICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lLl91aVNvdXJjZUNvZGUuc2V0 Rm9ybWF0dGVkKHRydWUpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBk aWRGb3JtYXRQYWdlKCkKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBzb3VyY2VGcmFt ZS5fdWlTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZS5FdmVudHMuRm9ybWF0dGVkQ2hhbmdlZCwgZGlkRm9ybWF0UGFnZSwgdGhpcyk7CiAgICAg ICAgICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIGJlIGEgYnJlYWtwb2ludCBpbiBmMSBhbHRob3Vn aCBzY3JpcHQgaXMgcHJldHR5LXByaW50ZWQuCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC53YWl0VW50aWxQYXVzZWQocGF1c2VkSW5GMUFnYWluKTsKICAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlV2l0aFRpbWVvdXQoImYxKCkiKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNvbnNvbGUu aHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNv bnNvbGUuaHRtbAppbmRleCAzNWFhYTYwNTQwY2NhZDQwMGFmMmIzOTE5M2ViNDAzMzIwZjY4ODBm Li5kZmNlNjZhODdiYjMxNzI3Yjc3ZWNhODZlYTQ2NmZkY2FjYTY1ZGQzIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXIt Y29uc29sZS5odG1sCkBAIC0zMyw3ICszMyw4IEBAIHZhciB0ZXN0ID0gZnVuY3Rpb24oKQogICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJQcmUtZm9ybWF0IHJvdyBtZXNz YWdlIGxpc3Q6Iik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoSlNP Ti5zdHJpbmdpZnkoT2JqZWN0LmtleXMoc291cmNlRnJhbWUuX3Jvd01lc3NhZ2VzKSkpOwogICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KEpTT04uc3RyaW5naWZ5KE9iamVj dC5rZXlzKHNvdXJjZUZyYW1lLl9tZXNzYWdlQnViYmxlcykpKTsKLSAgICAgICAgICAgICAgICBz b3VyY2VGcmFtZS5fdWlTb3VyY2VDb2RlLnNldEZvcm1hdHRlZCh0cnVlLCBkaWRGb3JtYXRMaW5r VGV4dCk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLCAidXBkYXRlTGl2ZUxvY2F0aW9ucyIsIGRpZEZv cm1hdExpbmtUZXh0KTsKKyAgICAgICAgICAgICAgICBzb3VyY2VGcmFtZS5fdWlTb3VyY2VDb2Rl LnNldEZvcm1hdHRlZCh0cnVlKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZnVuY3Rp b24gZGlkRm9ybWF0TGlua1RleHQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXItc2VhcmNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLXNlYXJjaC1leHBlY3RlZC50 eHQKaW5kZXggNWVkNWNjZWQ0OTQ2OTI2MGJmY2U0MDhiMTEzMzIzNWU5MDkxYzFlYi4uNzc0MGE0 NDRkZmJlZGZlZTkwMDhhMzMzM2JkNmY1MjMyOTI5N2U4MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXItc2VhcmNoLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1z ZWFyY2gtZXhwZWN0ZWQudHh0CkBAIC0zLDEzICszLDEzIEBAIFRlc3RzIHRoYXQgc2VhcmNoIGFj cm9zcyBmaWxlcyB3b3JrcyB3aXRoIGZvcm1hdHRlZCBzY3JpcHRzLgogRGVidWdnZXIgd2FzIGVu YWJsZWQuCiBQcmUtZm9ybWF0IHNlYXJjaCByZXN1bHRzOgogU2VhcmNoIG1hdGNoZXM6IAotbGlu ZU51bWJlcjogMjQsIGxpbmU6ICcgICAgICAgIHNjcmlwdFNvdXJjZS5zZWFyY2hJbkNvbnRlbnQo Im1hcmdpYy1zdHJpbmciLCB0cnVlLCBmYWxzZSwgZHVtcDEpOycKLWxpbmVOdW1iZXI6IDM3LCBs aW5lOiAnICAgICAgICBzY3JpcHRTb3VyY2Uuc2VhcmNoSW5Db250ZW50KCJtYXJnaWMtc3RyaW5n IiwgdHJ1ZSwgZmFsc2UsIGR1bXAyKTsnCitsaW5lTnVtYmVyOiAyNCwgbGluZTogJyAgICAgICAg c2NyaXB0U291cmNlLnNlYXJjaEluQ29udGVudCgibWFnaWMtc3RyaW5nIiwgdHJ1ZSwgZmFsc2Us IGR1bXAxKTsnCitsaW5lTnVtYmVyOiAzOSwgbGluZTogJyAgICAgICAgc2NyaXB0U291cmNlLnNl YXJjaEluQ29udGVudCgibWFnaWMtc3RyaW5nIiwgdHJ1ZSwgZmFsc2UsIGR1bXAyKTsnCiAKIE9y aWdpbmFsIGNvbnRlbnQgd2FzIHJlcXVlc3RlZC4KIFBvc3QtZm9ybWF0IHNlYXJjaCByZXN1bHRz OgogU2VhcmNoIG1hdGNoZXM6IAotbGluZU51bWJlcjogMjgsIGxpbmU6ICcgICAgICAgIHNjcmlw dFNvdXJjZS5zZWFyY2hJbkNvbnRlbnQoIm1hcmdpYy1zdHJpbmciLCB0cnVlLCBmYWxzZSwgZHVt cDEpOycKLWxpbmVOdW1iZXI6IDQxLCBsaW5lOiAnICAgICAgICBzY3JpcHRTb3VyY2Uuc2VhcmNo SW5Db250ZW50KCJtYXJnaWMtc3RyaW5nIiwgdHJ1ZSwgZmFsc2UsIGR1bXAyKTsnCitsaW5lTnVt YmVyOiAyOCwgbGluZTogJyAgICAgICAgc2NyaXB0U291cmNlLnNlYXJjaEluQ29udGVudCgibWFn aWMtc3RyaW5nIiwgdHJ1ZSwgZmFsc2UsIGR1bXAxKTsnCitsaW5lTnVtYmVyOiA0MywgbGluZTog JyAgICAgICAgc2NyaXB0U291cmNlLnNlYXJjaEluQ29udGVudCgibWFnaWMtc3RyaW5nIiwgdHJ1 ZSwgZmFsc2UsIGR1bXAyKTsnCiAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXItc2VhcmNoLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1zZWFyY2guaHRtbAppbmRleCA3NjlkZDky MjJjYzA5MTk3MjVkMDdiNDFiNWEyNTk0M2ZlNjdjNzY0Li5mOGIwYzZlYzkyMGZjMDJiNzU2YTNh N2JlYjUyOWRkMmIwNzVmYzQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0LWZvcm1hdHRlci1zZWFyY2guaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1zZWFyY2guaHRtbApAQCAtMjIsNyArMjIs NyBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHNjcmlwdFNvdXJjZSA9 IGZyYW1lLl91aVNvdXJjZUNvZGU7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihz Y3JpcHRTb3VyY2UuX3dvcmtzcGFjZSwgInJlcXVlc3RGaWxlQ29udGVudCIsIHJlcXVlc3RDb250 ZW50U25pZmZlcik7Ci0gICAgICAgIHNjcmlwdFNvdXJjZS5zZWFyY2hJbkNvbnRlbnQoIm1hcmdp Yy1zdHJpbmciLCB0cnVlLCBmYWxzZSwgZHVtcDEpOworICAgICAgICBzY3JpcHRTb3VyY2Uuc2Vh cmNoSW5Db250ZW50KCJtYWdpYy1zdHJpbmciLCB0cnVlLCBmYWxzZSwgZHVtcDEpOwogICAgIH0K IAogICAgIGZ1bmN0aW9uIGR1bXAxKG1hdGNoZXMpCkBAIC0zMCwxMiArMzAsMTQgQEAgdmFyIHRl c3QgPSBmdW5jdGlvbigpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJQcmUtZm9y bWF0IHNlYXJjaCByZXN1bHRzOiIpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTZWFyY2hN YXRjaGVzKG1hdGNoZXMpOwogICAgICAgICBzaG91bGRSZXF1ZXN0Q29udGVudCA9IHRydWU7Ci0g ICAgICAgIHNjcmlwdFNvdXJjZS5zZXRGb3JtYXR0ZWQodHJ1ZSwgZGlkRm9ybWF0KTsKKyAgICAg ICAgc2NyaXB0U291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZS5FdmVudHMuRm9ybWF0dGVkQ2hhbmdlZCwgZGlkRm9ybWF0LCB0aGlzKTsKKyAgICAgICAgc2Ny aXB0U291cmNlLnNldEZvcm1hdHRlZCh0cnVlKTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBkaWRG b3JtYXQoKQogICAgIHsKLSAgICAgICAgc2NyaXB0U291cmNlLnNlYXJjaEluQ29udGVudCgibWFy Z2ljLXN0cmluZyIsIHRydWUsIGZhbHNlLCBkdW1wMik7CisgICAgICAgIHNjcmlwdFNvdXJjZS5y ZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkZvcm1h dHRlZENoYW5nZWQsIGRpZEZvcm1hdCwgdGhpcyk7CisgICAgICAgIHNjcmlwdFNvdXJjZS5zZWFy Y2hJbkNvbnRlbnQoIm1hZ2ljLXN0cmluZyIsIHRydWUsIGZhbHNlLCBkdW1wMik7CiAgICAgfQog CiAgICAgZnVuY3Rpb24gZHVtcDIobWF0Y2hlcykK