56179 2011-03-11 03:39:26 -0800 Web Inspector: move breakpoints restoring after live edit to debugger presentation model 2011-03-14 06:37:18 -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 365914 0 podivilov 2011-03-11 03:39:26 -0800 Web Inspector: move breakpoints restoring after live edit to debugger presentation model. Presentation model should move breakpoints based on text diff as required by "revert to revision" action in resources panel. 365915 1 85456 podivilov 2011-03-11 03:40:09 -0800 Created attachment 85456 Patch. 366952 2 85456 pfeldman 2011-03-14 06:04:44 -0700 Comment on attachment 85456 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=85456&action=review > Source/WebCore/inspector/front-end/DebuggerModel.js:33 > + this._debuggerPausedDetails = {}; Is this relevant to the change? 366959 3 podivilov 2011-03-14 06:37:18 -0700 Committed r81020: <http://trac.webkit.org/changeset/81020> 85456 2011-03-11 03:40:09 -0800 2011-03-14 06:04:43 -0700 Patch. patch text/plain 11279 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODkyNzlhLi4zNzZmZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMDMtMTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBicmVha3BvaW50cyByZXN0b3JpbmcgYWZ0ZXIgbGl2ZSBlZGl0IHRvIGRl YnVnZ2VyIHByZXNlbnRhdGlvbiBtb2RlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU2MTc5CisKKyAgICAgICAgUHJlc2VudGF0aW9uIG1vZGVsIHNo b3VsZCBtb3ZlIGJyZWFrcG9pbnRzIGJhc2VkIG9uIHRleHQgZGlmZiBhcyByZXF1aXJlZCBieSAi cmV2ZXJ0IHRvIHJldmlzaW9uIiBhY3Rpb24gaW4gcmVzb3VyY2VzIHBhbmVsLgorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9k ZWwucHJvdG90eXBlLnNldEJyZWFrcG9pbnQuZGlkU2V0QnJlYWtwb2ludCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuc2V0QnJlYWtwb2ludCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUucmVzZXQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2Uu ZGlkRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2Rl bC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJNb2RlbC5wcm90b3R5cGUuZ2V0IGNhbGxGcmFtZXMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLl9wYXVzZWRTY3JpcHQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLl9yZXN1bWVkU2NyaXB0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3Njcmlw dFNvdXJjZUNoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3Nj cmlwdFNvdXJjZUNoYW5nZWQpOgorCiAyMDExLTAzLTExICBSb2xhbmQgU3RlaW5lciAgPHJvbGFu ZHN0ZWluZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3 YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJN b2RlbC5qcwppbmRleCBiZmRmYTU2Li42ZTVjOWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC0zMCw4ICszMCw3IEBA CiAKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsID0gZnVuY3Rpb24oKQogewotICAgIHRoaXMu X3BhdXNlZCA9IGZhbHNlOwotICAgIHRoaXMuX2NhbGxGcmFtZXMgPSBbXTsKKyAgICB0aGlzLl9k ZWJ1Z2dlclBhdXNlZERldGFpbHMgPSB7fTsKICAgICB0aGlzLl9icmVha3BvaW50cyA9IHt9Owog ICAgIHRoaXMuX3NjcmlwdHMgPSB7fTsKIApAQCAtODksMTEgKzg4LDkgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIGRpZFNldEJy ZWFrcG9pbnQoYnJlYWtwb2ludHNQdXNoZWRUb0JhY2tlbmQsIGJyZWFrcG9pbnRJZCwgbG9jYXRp b25zKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIWJyZWFrcG9pbnRJZCkgewotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2coImZhaWxlZCIpOworICAgICAgICAgICAgaWYgKCFi cmVha3BvaW50SWQpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgIAorCiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IG5ldyBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludChicmVha3BvaW50SWQsIHVybCwgIiIsIGxpbmVOdW1iZXIsIGNvbHVt bk51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKICAgICAgICAgICAgIGJyZWFrcG9pbnQubG9j YXRpb25zID0gbG9jYXRpb25zOwogICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNbYnJlYWtw b2ludElkXSA9IGJyZWFrcG9pbnQ7CkBAIC0xODcsOCArMTg0LDcgQEAgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX3BhdXNlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9jYWxsRnJhbWVz ID0gW107CisgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VkRGV0YWlscyA9IHt9OwogICAgICAg ICBmb3IgKHZhciBpZCBpbiB0aGlzLl9icmVha3BvaW50cykgewogICAgICAgICAgICAgdmFyIGJy ZWFrcG9pbnQgPSB0aGlzLl9icmVha3BvaW50c1tpZF07CiAgICAgICAgICAgICBpZiAoIWJyZWFr cG9pbnQudXJsKQpAQCAtMjIyLDc5ICsyMTgsNDAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9k ZWwucHJvdG90eXBlID0gewogCiAgICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oc291cmNl SUQsIHNjcmlwdFNvdXJjZSkKICAgICB7CisgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3Jp cHRzW3NvdXJjZUlEXTsKKyAgICAgICAgdmFyIG9sZFNvdXJjZSA9IHNjcmlwdC5zb3VyY2U7CisK ICAgICAgICAgZnVuY3Rpb24gZGlkRWRpdFNjcmlwdFNvdXJjZShzdWNjZXNzLCBuZXdCb2R5T3JF cnJvck1lc3NhZ2UsIGNhbGxGcmFtZXMpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChzdWNj ZXNzKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZXMgJiYgY2FsbEZyYW1lcy5sZW5n dGgpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2NhbGxGcmFtZXMgPSBjYWxsRnJhbWVzOwot ICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNjcmlwdFNvdXJjZShzb3VyY2VJRCwgbmV3Qm9k eU9yRXJyb3JNZXNzYWdlKTsKKyAgICAgICAgICAgICAgICBzY3JpcHQuc291cmNlID0gbmV3Qm9k eU9yRXJyb3JNZXNzYWdlOworICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5TY3JpcHRTb3VyY2VDaGFu Z2VkLCB7IHNvdXJjZUlEOiBzb3VyY2VJRCwgb2xkU291cmNlOiBvbGRTb3VyY2UgfSk7CisKKyAg ICAgICAgICAgICAgICBpZiAoY2FsbEZyYW1lcyAmJiBjYWxsRnJhbWVzLmxlbmd0aCkgeworICAg ICAgICAgICAgICAgICAgICB0aGlzLl9kZWJ1Z2dlclBhdXNlZERldGFpbHMuY2FsbEZyYW1lcyA9 IGNhbGxGcmFtZXM7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlclBhdXNlZCwg dGhpcy5fZGVidWdnZXJQYXVzZWREZXRhaWxzKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKG5ld0JvZHlPckVy cm9yTWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5XYXJu aW5nKTsKICAgICAgICAgfQogICAgICAgICBEZWJ1Z2dlckFnZW50LmVkaXRTY3JpcHRTb3VyY2Uo c291cmNlSUQsIHNjcmlwdFNvdXJjZSwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsK ICAgICB9LAogCi0gICAgX3VwZGF0ZVNjcmlwdFNvdXJjZTogZnVuY3Rpb24oc291cmNlSUQsIHNj cmlwdFNvdXJjZSkKLSAgICB7Ci0gICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRzW3Nv dXJjZUlEXTsKLSAgICAgICAgdmFyIG9sZFNvdXJjZSA9IHNjcmlwdC5zb3VyY2U7Ci0gICAgICAg IHNjcmlwdC5zb3VyY2UgPSBzY3JpcHRTb3VyY2U7Ci0KLSAgICAgICAgLy8gQ2xlYXIgYW5kIHJl LWNyZWF0ZSBicmVha3BvaW50cyBhY2NvcmRpbmcgdG8gdGV4dCBkaWZmLgotICAgICAgICB2YXIg ZGlmZiA9IEFycmF5LmRpZmYob2xkU291cmNlLnNwbGl0KCJcbiIpLCBzY3JpcHQuc291cmNlLnNw bGl0KCJcbiIpKTsKLSAgICAgICAgZm9yICh2YXIgaWQgaW4gdGhpcy5fYnJlYWtwb2ludHMpIHsK LSAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fYnJlYWtwb2ludHNbaWRdOwotICAg ICAgICAgICAgaWYgKGJyZWFrcG9pbnQudXJsKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGJyZWFr cG9pbnQudXJsICE9PSBzY3JpcHQuc291cmNlVVJMKQotICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgaWYgKGJyZWFrcG9p bnQuc291cmNlSUQgIT09IHNvdXJjZUlEKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHRoaXMucmVtb3ZlQnJlYWtwb2ludChicmVha3Bv aW50LmlkKTsKLSAgICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gYnJlYWtwb2ludC5saW5lTnVt YmVyOwotICAgICAgICAgICAgdmFyIG5ld0xpbmVOdW1iZXIgPSBkaWZmLmxlZnRbbGluZU51bWJl cl0ucm93OwotICAgICAgICAgICAgaWYgKG5ld0xpbmVOdW1iZXIgPT09IHVuZGVmaW5lZCkgewot ICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSBsaW5lTnVtYmVyIC0gMTsgaSA+PSAwOyAtLWkp IHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRpZmYubGVmdFtpXS5yb3cgPT09IHVuZGVmaW5l ZCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgICAg ICB2YXIgc2hpZnRlZExpbmVOdW1iZXIgPSBkaWZmLmxlZnRbaV0ucm93ICsgbGluZU51bWJlciAt IGk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChzaGlmdGVkTGluZU51bWJlciA8IGRpZmYucmln aHQubGVuZ3RoKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB2YXIgb3JpZ2luYWxMaW5lTnVt YmVyID0gZGlmZi5yaWdodFtzaGlmdGVkTGluZU51bWJlcl0ucm93OwotICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKG9yaWdpbmFsTGluZU51bWJlciA9PT0gbGluZU51bWJlciB8fCBvcmlnaW5h bExpbmVOdW1iZXIgPT09IHVuZGVmaW5lZCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBu ZXdMaW5lTnVtYmVyID0gc2hpZnRlZExpbmVOdW1iZXI7Ci0gICAgICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgfQotICAgICAgICAgICAgaWYgKG5ld0xpbmVOdW1iZXIgPT09IHVuZGVmaW5lZCkKLSAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGlmIChicmVha3BvaW50LnVybCkKLSAg ICAgICAgICAgICAgICB0aGlzLnNldEJyZWFrcG9pbnQoYnJlYWtwb2ludC51cmwsIG5ld0xpbmVO dW1iZXIsIGJyZWFrcG9pbnQuY29sdW1uTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlvbiwgYnJl YWtwb2ludC5lbmFibGVkKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0aGlz LnNldEJyZWFrcG9pbnRCeVNvdXJjZUlkKHNvdXJjZUlELCBuZXdMaW5lTnVtYmVyLCBicmVha3Bv aW50LmNvbHVtbk51bWJlciwgYnJlYWtwb2ludC5jb25kaXRpb24sIGJyZWFrcG9pbnQuZW5hYmxl ZCk7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuU2NyaXB0U291cmNlQ2hhbmdlZCwgeyBz b3VyY2VJRDogc291cmNlSUQsIG9sZFNvdXJjZTogb2xkU291cmNlIH0pOwotICAgIH0sCi0KICAg ICBnZXQgY2FsbEZyYW1lcygpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fY2FsbEZyYW1l czsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2RlYnVnZ2VyUGF1c2VkRGV0YWlscy5jYWxsRnJhbWVz OwogICAgIH0sCiAKICAgICBfcGF1c2VkU2NyaXB0OiBmdW5jdGlvbihkZXRhaWxzKQogICAgIHsK LSAgICAgICAgdGhpcy5fcGF1c2VkID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fY2FsbEZyYW1lcyA9 IGRldGFpbHMuY2FsbEZyYW1lczsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZWREZXRhaWxz ID0gZGV0YWlsczsKICAgICAgICAgZGV0YWlscy5icmVha3BvaW50ID0gdGhpcy5fYnJlYWtwb2lu dEZvckNhbGxGcmFtZShkZXRhaWxzLmNhbGxGcmFtZXNbMF0pOwogICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRGVi dWdnZXJQYXVzZWQsIGRldGFpbHMpOwogICAgIH0sCiAKICAgICBfcmVzdW1lZFNjcmlwdDogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fcGF1c2VkID0gZmFsc2U7Ci0gICAgICAgIHRo aXMuX2NhbGxGcmFtZXMgPSBbXTsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZWREZXRhaWxz ID0ge307CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJlc3VtZWQpOwogICAgIH0sCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCA2MTczZjA5Li5jMTU5MTNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC0zNSw2ICszNSw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsID0gZnVuY3Rpb24oKQogCiAgICAgV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5F dmVudHMuUGFyc2VkU2NyaXB0U291cmNlLCB0aGlzLl9wYXJzZWRTY3JpcHRTb3VyY2UsIHRoaXMp OwogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UsIHRo aXMuX2ZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu RXZlbnRzLlNjcmlwdFNvdXJjZUNoYW5nZWQsIHRoaXMuX3NjcmlwdFNvdXJjZUNoYW5nZWQsIHRo aXMpOwogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRBZGRlZCwgdGhpcy5fYnJl YWtwb2ludEFkZGVkLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5CcmVha3BvaW50 UmVtb3ZlZCwgdGhpcy5fYnJlYWtwb2ludFJlbW92ZWQsIHRoaXMpOwogICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9k ZWwuRXZlbnRzLkJyZWFrcG9pbnRSZXNvbHZlZCwgdGhpcy5fYnJlYWtwb2ludFJlc29sdmVkLCB0 aGlzKTsKQEAgLTcxLDYgKzcyLDQ5IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKKyAgICBfc2NyaXB0U291 cmNlQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgc291cmNlSUQg PSBldmVudC5kYXRhLnNvdXJjZUlEOworICAgICAgICB2YXIgb2xkU291cmNlID0gZXZlbnQuZGF0 YS5vbGRTb3VyY2U7CisgICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJN b2RlbC5zY3JpcHRGb3JTb3VyY2VJRChzb3VyY2VJRCk7CisKKyAgICAgICAgLy8gQ2xlYXIgYW5k IHJlLWNyZWF0ZSBicmVha3BvaW50cyBhY2NvcmRpbmcgdG8gdGV4dCBkaWZmLgorICAgICAgICB2 YXIgZGlmZiA9IEFycmF5LmRpZmYob2xkU291cmNlLnNwbGl0KCJcbiIpLCBzY3JpcHQuc291cmNl LnNwbGl0KCJcbiIpKTsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuYnJlYWtwb2ludHM7CisgICAgICAgIGZvciAodmFyIGlkIGluIGJyZWFrcG9p bnRzKSB7CisgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGJyZWFrcG9pbnRzW2lkXTsKKyAg ICAgICAgICAgIGlmIChicmVha3BvaW50LnVybCkgeworICAgICAgICAgICAgICAgIGlmIChicmVh a3BvaW50LnVybCAhPT0gc2NyaXB0LnNvdXJjZVVSTCkKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGlmIChicmVha3Bv aW50LnNvdXJjZUlEICE9PSBzb3VyY2VJRCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5y ZW1vdmVCcmVha3BvaW50KGJyZWFrcG9pbnQuaWQpOworICAgICAgICAgICAgdmFyIGxpbmVOdW1i ZXIgPSBicmVha3BvaW50LmxpbmVOdW1iZXI7CisgICAgICAgICAgICB2YXIgbmV3TGluZU51bWJl ciA9IGRpZmYubGVmdFtsaW5lTnVtYmVyXS5yb3c7CisgICAgICAgICAgICBpZiAobmV3TGluZU51 bWJlciA9PT0gdW5kZWZpbmVkKSB7CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IGxpbmVO dW1iZXIgLSAxOyBpID49IDA7IC0taSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoZGlmZi5s ZWZ0W2ldLnJvdyA9PT0gdW5kZWZpbmVkKQorICAgICAgICAgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICAgICAgICAgIHZhciBzaGlmdGVkTGluZU51bWJlciA9IGRpZmYubGVm dFtpXS5yb3cgKyBsaW5lTnVtYmVyIC0gaTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHNoaWZ0 ZWRMaW5lTnVtYmVyIDwgZGlmZi5yaWdodC5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHZhciBvcmlnaW5hbExpbmVOdW1iZXIgPSBkaWZmLnJpZ2h0W3NoaWZ0ZWRMaW5lTnVtYmVy XS5yb3c7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAob3JpZ2luYWxMaW5lTnVtYmVyID09 PSBsaW5lTnVtYmVyIHx8IG9yaWdpbmFsTGluZU51bWJlciA9PT0gdW5kZWZpbmVkKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG5ld0xpbmVOdW1iZXIgPSBzaGlmdGVkTGluZU51bWJlcjsK KyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobmV3TGluZU51bWJl ciA9PT0gdW5kZWZpbmVkKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg aWYgKGJyZWFrcG9pbnQudXJsKQorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLnNldEJyZWFrcG9pbnQoYnJlYWtwb2ludC51cmwsIG5ld0xpbmVOdW1iZXIsIGJyZWFr cG9pbnQuY29sdW1uTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlvbiwgYnJlYWtwb2ludC5lbmFi bGVkKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5zZXRCcmVha3BvaW50QnlTb3VyY2VJZChzY3JpcHQuc291cmNlSUQsIG5ld0xp bmVOdW1iZXIsIGJyZWFrcG9pbnQuY29sdW1uTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlvbiwg YnJlYWtwb2ludC5lbmFibGVkKTsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBjb250aW51ZVRv TGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQogICAgIHsKICAgICAgICAg dmFyIGxvY2F0aW9uID0gdGhpcy5fc291cmNlTG9jYXRpb25Ub0FjdHVhbExvY2F0aW9uKHNvdXJj ZUZpbGVJZCwgbGluZU51bWJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDk3MTM2NDAuLjlkYzNkM2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBA IC0yNjcsMTAgKzI2Nyw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogCiAgICAgICAgIHZhciBzb3VyY2VGaWxlSWQgPSB0aGlzLl9zb3VyY2VGaWxlSWRGb3JTY3Jp cHQoc2NyaXB0KTsKICAgICAgICAgdGhpcy5fcmVjcmVhdGVTb3VyY2VGcmFtZShzb3VyY2VGaWxl SWQpOwotCi0gICAgICAgIHZhciBjYWxsRnJhbWVzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9k ZWwuY2FsbEZyYW1lczsKLSAgICAgICAgaWYgKGNhbGxGcmFtZXMubGVuZ3RoKQotICAgICAgICAg ICAgdGhpcy5fZGVidWdnZXJQYXVzZWQoeyBkYXRhOiB7IGNhbGxGcmFtZXM6IGNhbGxGcmFtZXMg fSB9KTsKICAgICB9LAogCiAgICAgX2FkZFNjcmlwdDogZnVuY3Rpb24oc2NyaXB0KQo=