57010 2011-03-24 06:38:49 -0700 Web Inspector: fix console messages positions in formatted scripts. 2011-03-28 05:24:08 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 372778 0 podivilov 2011-03-24 06:38:49 -0700 Web Inspector: fix console messages positions in formatted scripts. 372779 1 86766 podivilov 2011-03-24 06:39:26 -0700 Created attachment 86766 Patch. 372803 2 86766 yurys 2011-03-24 07:22:08 -0700 Comment on attachment 86766 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=86766&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:187 > + presentationMessage.sourceFileId = sourceFile.id; Would be nice to see sourceFile declaration above didRequestMapping 374417 3 podivilov 2011-03-28 05:23:44 -0700 Committed r82107: <http://trac.webkit.org/changeset/82107> 374418 4 podivilov 2011-03-28 05:24:08 -0700 (In reply to comment #2) > (From update of attachment 86766 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86766&action=review > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:187 > > + presentationMessage.sourceFileId = sourceFile.id; > > Would be nice to see sourceFile declaration above didRequestMapping Done. 86766 2011-03-24 06:39:26 -0700 2011-03-24 07:22:08 -0700 Patch. patch text/plain 11824 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MDhmNGViLi4wYjM2OGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTEtMDMtMjQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogZml4IGNvbnNvbGUgbWVzc2FnZXMgcG9zaXRpb25zIGluIGZvcm1hdHRlZCBzY3Jp cHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcw MTAKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS50b2dnbGVGb3JtYXRTb3VyY2VGaWxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuYWRkQ29uc29sZU1lc3NhZ2UuZGlkUmVx dWVzdE1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLmFkZENvbnNvbGVNZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5jbGVhckNvbnNvbGVNZXNzYWdl cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90 b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJl ZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3Rv dHlwZS5hZGRDb25zb2xlTWVzc2FnZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmFkZENvbnNvbGVNZXNz YWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmNsZWFy Q29uc29sZU1lc3NhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlLl9jb25zb2xlTWVzc2FnZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl9zb3VyY2VGcmFtZUxvYWRlZCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZp bGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmFkZE1lc3NhZ2UpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fYWRkRXhpc3RpbmdNZXNz YWdlc1RvU291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUuYWRkTWVzc2FnZVRvU291cmNlKToKKwogMjAxMS0wMy0yMyAgUGF2ZWwgUG9kaXZpbG92ICA8 cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBiODU0NjlhLi4zNzlkOGFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC0zMSw2ICszMSw3IEBACiBXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9IGZ1bmN0aW9uKCkKIHsKICAgICB0 aGlzLl9zb3VyY2VGaWxlcyA9IHt9OworICAgIHRoaXMuX21lc3NhZ2VzID0gW107CiAgICAgdGhp cy5fcHJlc2VudGF0aW9uQnJlYWtwb2ludHMgPSB7fTsKIAogICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZl bnRzLkRlYnVnZ2VyV2FzRW5hYmxlZCwgdGhpcy5fZGVidWdnZXJXYXNFbmFibGVkLCB0aGlzKTsK QEAgLTQ0LDYgKzQ1LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwg PSBmdW5jdGlvbigpCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVu dHMgPSB7CiAgICAgU291cmNlRmlsZUFkZGVkOiAic291cmNlLWZpbGUtYWRkZWQiLAogICAgIFNv dXJjZUZpbGVDaGFuZ2VkOiAic291cmNlLWZpbGUtY2hhbmdlZCIsCisgICAgQ29uc29sZU1lc3Nh Z2VBZGRlZDogImNvbnNvbGUtbWVzc2FnZS1hZGRlZCIsCiAgICAgQnJlYWtwb2ludEFkZGVkOiAi YnJlYWtwb2ludC1hZGRlZCIsCiAgICAgQnJlYWtwb2ludFJlbW92ZWQ6ICJicmVha3BvaW50LXJl bW92ZWQiCiB9CkBAIC0xNjEsMTQgKzE2Myw0NSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9mb3JtYXRTb3Vy Y2VGaWxlcyAmJiAhdGhpcy5fZm9ybWF0dGVyKQogICAgICAgICAgICAgdGhpcy5fZm9ybWF0dGVy ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIoKTsKIAorICAgICAgICB2YXIgbWVz c2FnZXMgPSB0aGlzLl9tZXNzYWdlczsKKwogICAgICAgICB0aGlzLl9yZXNldCgpOworCiAgICAg ICAgIHZhciBzY3JpcHRzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0czsKICAg ICAgICAgZm9yICh2YXIgaWQgaW4gc2NyaXB0cykKICAgICAgICAgICAgIHRoaXMuX2FkZFNjcmlw dChzY3JpcHRzW2lkXSk7CiAKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtZXNzYWdlcy5s ZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMuYWRkQ29uc29sZU1lc3NhZ2UobWVzc2FnZXNb aV0pOworCiAgICAgICAgIHRoaXMuX3JlZnJlc2hCcmVha3BvaW50cygpOwogICAgIH0sCiAKKyAg ICBhZGRDb25zb2xlTWVzc2FnZTogZnVuY3Rpb24obWVzc2FnZSkKKyAgICB7CisgICAgICAgIHRo aXMuX21lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisKKyAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVz dE1hcHBpbmcobWFwcGluZykKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHByZXNlbnRhdGlv bk1lc3NhZ2UgPSB7fTsKKyAgICAgICAgICAgIHByZXNlbnRhdGlvbk1lc3NhZ2Uuc291cmNlRmls ZUlkID0gc291cmNlRmlsZS5pZDsKKyAgICAgICAgICAgIHByZXNlbnRhdGlvbk1lc3NhZ2UubGlu ZU51bWJlciA9IG1hcHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxvY2F0aW9uKG1lc3NhZ2Uu bGluZSAtIDEsIDApLmxpbmVOdW1iZXI7CisgICAgICAgICAgICBwcmVzZW50YXRpb25NZXNzYWdl Lm9yaWdpbmFsTWVzc2FnZSA9IG1lc3NhZ2U7CisgICAgICAgICAgICBzb3VyY2VGaWxlLm1lc3Nh Z2VzLnB1c2gocHJlc2VudGF0aW9uTWVzc2FnZSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5F dmVudHMuQ29uc29sZU1lc3NhZ2VBZGRlZCwgcHJlc2VudGF0aW9uTWVzc2FnZSk7CisgICAgICAg IH0KKyAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLnNvdXJjZUZpbGVGb3JTY3JpcHRVUkwo bWVzc2FnZS51cmwpOworICAgICAgICBpZiAoc291cmNlRmlsZSkKKyAgICAgICAgICAgIHNvdXJj ZUZpbGUucmVxdWVzdE1hcHBpbmcoZGlkUmVxdWVzdE1hcHBpbmcuYmluZCh0aGlzKSk7CisgICAg fSwKKworICAgIGNsZWFyQ29uc29sZU1lc3NhZ2VzOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICB0aGlzLl9tZXNzYWdlcyA9IFtdOworICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl9zb3Vy Y2VGaWxlcykKKyAgICAgICAgICAgIHRoaXMuX3NvdXJjZUZpbGVzW2lkXS5tZXNzYWdlcyA9IFtd OworICAgIH0sCisKICAgICBjb250aW51ZVRvTGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBs aW5lTnVtYmVyKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdE1hcHBpbmcobWFw cGluZykKQEAgLTM3Niw2ICs0MDksNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgX3Jlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICB0aGlzLl9zb3VyY2VGaWxlcyA9IHt9OworICAgICAgICB0aGlzLl9tZXNzYWdlcyA9IFtd OwogICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25CcmVha3BvaW50cyA9IHt9OwogICAgIH0KIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VU cmVlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VHJlZU1vZGVsLmpzCmluZGV4IGRhMmQ0N2EuLmM5ZmFjZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwpAQCAt MTA4LDcgKzEwOCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgdmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVZpZXcucmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UpOwotICAgICAgICBpZiAodmll dy5hZGRNZXNzYWdlKQorICAgICAgICBpZiAodmlldy5hZGRNZXNzYWdlICYmIG1zZy5pc0Vycm9y T3JXYXJuaW5nKCkgJiYgbXNnLm1lc3NhZ2UpCiAgICAgICAgICAgICB2aWV3LmFkZE1lc3NhZ2Uo bXNnKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGI3NWRmMGMuLjkyNjgyOWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xOTIs NiArMTkyLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAg IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlNvdXJjZUZpbGVBZGRlZCwgdGhpcy5fc291 cmNlRmlsZUFkZGVkLCB0aGlzKQogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlNv dXJjZUZpbGVDaGFuZ2VkLCB0aGlzLl9zb3VyY2VGaWxlQ2hhbmdlZCwgdGhpcyk7CisgICAgdGhp cy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ29uc29sZU1lc3NhZ2VBZGRlZCwgdGhpcy5fY29u c29sZU1lc3NhZ2VBZGRlZCwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVu dHMuQnJlYWtwb2ludEFkZGVkLCB0aGlzLl9icmVha3BvaW50QWRkZWQsIHRoaXMpOwogICAgIHRo aXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCB0aGlzLl9icmVh a3BvaW50UmVtb3ZlZCwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMu Q2FsbEZyYW1lU2VsZWN0ZWQsIHRoaXMuX2NhbGxGcmFtZVNlbGVjdGVkLCB0aGlzKTsKQEAgLTMx MCwxNyArMzExLDI0IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgYWRkQ29uc29sZU1lc3NhZ2U6IGZ1bmN0aW9uKG1lc3NhZ2UpCiAgICAgewotICAgICAg ICB0aGlzLl9tZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOwotICAgICAgICB2YXIgc291cmNlRnJhbWUg PSB0aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lW21lc3NhZ2UudXJsXTsKLSAgICAgICAg aWYgKHNvdXJjZUZyYW1lKQotICAgICAgICAgICAgc291cmNlRnJhbWUuYWRkTWVzc2FnZShtZXNz YWdlKTsKKyAgICAgICAgaWYgKG1lc3NhZ2UuaXNFcnJvck9yV2FybmluZygpICYmIG1lc3NhZ2Uu bWVzc2FnZSkKKyAgICAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZENvbnNvbGVN ZXNzYWdlKG1lc3NhZ2UpOwogICAgIH0sCiAKICAgICBjbGVhckNvbnNvbGVNZXNzYWdlczogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKLSAgICAgICAgZm9y ICh2YXIgdXJsIGluIHRoaXMuX3NvdXJjZUZpbGVJZFRvU291cmNlRnJhbWUpCi0gICAgICAgICAg ICB0aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lW3VybF0uY2xlYXJNZXNzYWdlcygpOwor ICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5jbGVhckNvbnNvbGVNZXNzYWdlcygpOwor ICAgICAgICBmb3IgKHZhciBzb3VyY2VGaWxlSWQgaW4gdGhpcy5fc291cmNlRmlsZUlkVG9Tb3Vy Y2VGcmFtZSkKKyAgICAgICAgICAgIHRoaXMuX3NvdXJjZUZpbGVJZFRvU291cmNlRnJhbWVbc291 cmNlRmlsZUlkXS5jbGVhck1lc3NhZ2VzKCk7CisgICAgfSwKKworICAgIF9jb25zb2xlTWVzc2Fn ZUFkZGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBtZXNzYWdlID0gZXZl bnQuZGF0YTsKKworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGaWxlSWRU b1NvdXJjZUZyYW1lW21lc3NhZ2Uuc291cmNlRmlsZUlkXTsKKyAgICAgICAgaWYgKHNvdXJjZUZy YW1lICYmIHNvdXJjZUZyYW1lLmxvYWRlZCkKKyAgICAgICAgICAgIHNvdXJjZUZyYW1lLmFkZE1l c3NhZ2VUb1NvdXJjZShtZXNzYWdlLmxpbmVOdW1iZXIsIG1lc3NhZ2Uub3JpZ2luYWxNZXNzYWdl KTsKICAgICB9LAogCiAgICAgX2JyZWFrcG9pbnRBZGRlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC00 NDgsNyArNDU2LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgdGhpcy5fc291cmNlRmlsZUlkVG9Tb3VyY2VGcmFtZSA9IHt9OwogICAgICAgICB0 aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uID0ge307Ci0gICAgICAgIHRoaXMu X21lc3NhZ2VzID0gW107CiAgICAgICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5yZW1vdmVD aGlsZHJlbigpOwogICAgICAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQucmVtb3ZlQ2hp bGRyZW4oKTsKICAgICAgICAgdGhpcy52aWV3c0NvbnRhaW5lckVsZW1lbnQucmVtb3ZlQ2hpbGRy ZW4oKTsKQEAgLTU4NiwxMSArNTkzLDEyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gZXZlbnQudGFyZ2V0 OwogICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gc291cmNlRnJhbWUuX3NvdXJjZUZpbGVJZDsK KyAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zb3VyY2VG aWxlKHNvdXJjZUZpbGVJZCk7CiAKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9t ZXNzYWdlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSB0aGlzLl9t ZXNzYWdlc1tpXTsKLSAgICAgICAgICAgIGlmIChtZXNzYWdlLnVybCA9PT0gc291cmNlRmlsZUlk KQotICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lLmFkZE1lc3NhZ2UobWVzc2FnZSk7CisgICAg ICAgIHZhciBtZXNzYWdlcyA9IHNvdXJjZUZpbGUubWVzc2FnZXM7CisgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgbWVzc2FnZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBtZXNz YWdlID0gbWVzc2FnZXNbaV07CisgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRNZXNzYWdlVG9T b3VyY2UobWVzc2FnZS5saW5lTnVtYmVyLCBtZXNzYWdlLm9yaWdpbmFsTWVzc2FnZSk7CiAgICAg ICAgIH0KIAogICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5icmVha3BvaW50c0ZvclNvdXJjZUZpbGVJZChzb3VyY2VGaWxlSWQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4IDIwZDRmNWIu LmQ4NTJiYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRmlsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZpbGUuanMKQEAgLTM5LDYgKzM5LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUgPSBm dW5jdGlvbihpZCwgc2NyaXB0LCBjb250ZW50Q2hhbmdlZERlbGVnYXRlKQogICAgIHRoaXMuaWQg PSBpZDsKICAgICB0aGlzLnVybCA9IHNjcmlwdC5zb3VyY2VVUkw7CiAgICAgdGhpcy5pc0V4dGVu c2lvblNjcmlwdCA9IHNjcmlwdC53b3JsZFR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3JpcHQuV29y bGRUeXBlLkVYVEVOU0lPTlNfV09STEQ7CisgICAgdGhpcy5tZXNzYWdlcyA9IFtdOwogICAgIHRo aXMuYnJlYWtwb2ludHMgPSB7fTsKIAogICAgIGlmICh0aGlzLl9oYXNQZW5kaW5nUmVzb3VyY2Uo KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzCmluZGV4IDk2YzMwODEuLjIzODVhMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTExLDEyICsxMTEsOSBAQCBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgYWRkTWVzc2FnZTogZnVu Y3Rpb24obXNnKQogICAgIHsKLSAgICAgICAgLy8gRG9uJ3QgYWRkIHRoZSBtZXNzYWdlIGlmIHRo ZXJlIGlzIG5vIG1lc3NhZ2Ugb3IgdmFsaWQgbGluZSBvciBpZiB0aGUgbXNnIGlzbid0IGFuIGVy cm9yIG9yIHdhcm5pbmcuCi0gICAgICAgIGlmICghbXNnLm1lc3NhZ2UgfHwgbXNnLmxpbmUgPD0g MCB8fCAhbXNnLmlzRXJyb3JPcldhcm5pbmcoKSkKLSAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgdGhpcy5fbWVzc2FnZXMucHVzaChtc2cpOwogICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdl cikKLSAgICAgICAgICAgIHRoaXMuX2FkZE1lc3NhZ2VUb1NvdXJjZShtc2cpOworICAgICAgICAg ICAgdGhpcy5hZGRNZXNzYWdlVG9Tb3VyY2UobXNnLmxpbmUgLSAxLCBtc2cpOwogICAgIH0sCiAK ICAgICBjbGVhck1lc3NhZ2VzOiBmdW5jdGlvbigpCkBAIC0zOTMsMjYgKzM5MCwyNiBAQCBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIGxl bmd0aCA9IHRoaXMuX21lc3NhZ2VzLmxlbmd0aDsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBsZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX2FkZE1lc3NhZ2VUb1NvdXJjZSh0aGlz Ll9tZXNzYWdlc1tpXSk7CisgICAgICAgICAgICB0aGlzLmFkZE1lc3NhZ2VUb1NvdXJjZSh0aGlz Ll9tZXNzYWdlc1tpXS5saW5lIC0gMSwgdGhpcy5fbWVzc2FnZXNbaV0pOwogICAgIH0sCiAKLSAg ICBfYWRkTWVzc2FnZVRvU291cmNlOiBmdW5jdGlvbihtc2cpCisgICAgYWRkTWVzc2FnZVRvU291 cmNlOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBtc2cpCiAgICAgewotICAgICAgICBpZiAobXNnLmxp bmUgPiB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3VudCkKKyAgICAgICAgaWYgKGxpbmVOdW1iZXIg Pj0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgdmFyIG1lc3NhZ2VCdWJibGVFbGVtZW50ID0gdGhpcy5fbWVzc2FnZUJ1YmJsZXNbbXNn LmxpbmVdOworICAgICAgICB2YXIgbWVzc2FnZUJ1YmJsZUVsZW1lbnQgPSB0aGlzLl9tZXNzYWdl QnViYmxlc1tsaW5lTnVtYmVyXTsKICAgICAgICAgaWYgKCFtZXNzYWdlQnViYmxlRWxlbWVudCB8 fCBtZXNzYWdlQnViYmxlRWxlbWVudC5ub2RlVHlwZSAhPT0gTm9kZS5FTEVNRU5UX05PREUgfHwg IW1lc3NhZ2VCdWJibGVFbGVtZW50Lmhhc1N0eWxlQ2xhc3MoIndlYmtpdC1odG1sLW1lc3NhZ2Ut YnViYmxlIikpIHsKICAgICAgICAgICAgIG1lc3NhZ2VCdWJibGVFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgICAgICBtZXNzYWdlQnViYmxlRWxlbWVudC5j bGFzc05hbWUgPSAid2Via2l0LWh0bWwtbWVzc2FnZS1idWJibGUiOwotICAgICAgICAgICAgdGhp cy5fbWVzc2FnZUJ1YmJsZXNbbXNnLmxpbmVdID0gbWVzc2FnZUJ1YmJsZUVsZW1lbnQ7Ci0gICAg ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmFkZERlY29yYXRpb24obXNnLmxpbmUgLSAxLCBtZXNz YWdlQnViYmxlRWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9tZXNzYWdlQnViYmxlc1tsaW5l TnVtYmVyXSA9IG1lc3NhZ2VCdWJibGVFbGVtZW50OworICAgICAgICAgICAgdGhpcy5fdGV4dFZp ZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsIG1lc3NhZ2VCdWJibGVFbGVtZW50KTsKICAg ICAgICAgfQogCi0gICAgICAgIHZhciByb3dNZXNzYWdlcyA9IHRoaXMuX3Jvd01lc3NhZ2VzW21z Zy5saW5lXTsKKyAgICAgICAgdmFyIHJvd01lc3NhZ2VzID0gdGhpcy5fcm93TWVzc2FnZXNbbGlu ZU51bWJlcl07CiAgICAgICAgIGlmICghcm93TWVzc2FnZXMpIHsKICAgICAgICAgICAgIHJvd01l c3NhZ2VzID0gW107Ci0gICAgICAgICAgICB0aGlzLl9yb3dNZXNzYWdlc1ttc2cubGluZV0gPSBy b3dNZXNzYWdlczsKKyAgICAgICAgICAgIHRoaXMuX3Jvd01lc3NhZ2VzW2xpbmVOdW1iZXJdID0g cm93TWVzc2FnZXM7CiAgICAgICAgIH0KIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJv d01lc3NhZ2VzLmxlbmd0aDsgKytpKSB7Cg==