41247 2010-06-26 04:10:57 -0700 Web Inspector: ScripsPanel.prototype.editScriptSource uses old addBreakpoint signature. 2010-06-26 06:25:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman joepeck podivilov timothy webkit.review.bot yurys oldest_to_newest 243358 0 pfeldman 2010-06-26 04:10:57 -0700 I also added code preventing removed breakpoints from generating events. 243361 1 59829 pfeldman 2010-06-26 04:30:33 -0700 Created attachment 59829 [PATCH] Proposed fix. 243362 2 webkit.review.bot 2010-06-26 04:32:18 -0700 Attachment 59829 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/inspector/front-end/Object.js:57: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 243363 3 59830 pfeldman 2010-06-26 04:41:56 -0700 Created attachment 59830 [PATCH] Style fixed. 243370 4 59830 yurys 2010-06-26 05:51:14 -0700 Comment on attachment 59830 [PATCH] Style fixed. WebCore/inspector/front-end/BreakpointManager.js:151 + this._breakpointManager._saveBreakpointOnBackend(this); These methods should not be called after the breakpoint has been removed. Can you fix the call sites instead? We need a test for this. 243371 5 pfeldman 2010-06-26 06:06:43 -0700 (In reply to comment #4) > (From update of attachment 59830 [details]) > WebCore/inspector/front-end/BreakpointManager.js:151 > + this._breakpointManager._saveBreakpointOnBackend(this); > These methods should not be called after the breakpoint has been removed. Can you fix the call sites instead? > There are no call sites like this - I was just making sure we don't hit this problem in the future. But I see your point, I'll remove the checks and let code fail now that manager reference is cleared. 243373 6 pfeldman 2010-06-26 06:25:53 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/BreakpointManager.js M WebCore/inspector/front-end/Object.js M WebCore/inspector/front-end/ScriptsPanel.js Committed r61954 59829 2010-06-26 04:30:33 -0700 2010-06-26 04:41:56 -0700 [PATCH] Proposed fix. source_edit text/plain 4883 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjUzMjM5ZC4uMDJlNzU5YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNi0yNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBTY3JpcHNQYW5lbC5wcm90b3R5cGUu ZWRpdFNjcmlwdFNvdXJjZSB1c2VzIG9sZCBhZGRCcmVha3BvaW50IHNpZ25hdHVyZS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEyNDcKKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLnJlbW92ZUJyZWFrcG9p bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlLnNldCBlbmFi bGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5zZXQgY29u ZGl0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlLmFkZEV2ZW50TGlzdGVuZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGUucmVtb3ZlRXZlbnRMaXN0ZW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZS5yZW1vdmVBbGxMaXN0ZW5l cnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJj ZS5teWNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorCiAyMDEwLTA2LTI0ICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKaW5kZXggNGY2 OTY1YS4uNGQzNzVlNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Jy ZWFrcG9pbnRNYW5hZ2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50TWFuYWdlci5qcwpAQCAtNjYsNiArNjYsOCBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dE1hbmFnZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCEoYnJlYWtwb2ludC5p ZCBpbiB0aGlzLl9icmVha3BvaW50cykpCiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGJy ZWFrcG9pbnQucmVtb3ZlQWxsTGlzdGVuZXJzKCk7CisgICAgICAgIGRlbGV0ZSBicmVha3BvaW50 Ll9icmVha3BvaW50TWFuYWdlcjsKICAgICAgICAgZGVsZXRlIHRoaXMuX2JyZWFrcG9pbnRzW2Jy ZWFrcG9pbnQuaWRdOwogICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RnJvbUJhY2tlbmQo YnJlYWtwb2ludCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJicmVh a3BvaW50LXJlbW92ZWQiLCBicmVha3BvaW50KTsKQEAgLTE0NSw3ICsxNDcsOCBAQCBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgdGhpcy5fZW5hYmxlZCA9IHg7Ci0gICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2Vy Ll9zYXZlQnJlYWtwb2ludE9uQmFja2VuZCh0aGlzKTsKKyAgICAgICAgaWYgKHRoaXMuX2JyZWFr cG9pbnRNYW5hZ2VyKQorICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuX3NhdmVC cmVha3BvaW50T25CYWNrZW5kKHRoaXMpOwogICAgICAgICBpZiAodGhpcy5fZW5hYmxlZCkKICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJlbmFibGVkIik7CiAgICAg ICAgIGVsc2UKQEAgLTE4Niw3ICsxODksNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fY29uZGl0aW9u ID0gYzsKLSAgICAgICAgaWYgKHRoaXMuZW5hYmxlZCkKKyAgICAgICAgaWYgKHRoaXMuZW5hYmxl ZCAmJiB0aGlzLl9icmVha3BvaW50TWFuYWdlcikKICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyLl9zYXZlQnJlYWtwb2ludE9uQmFja2VuZCh0aGlzKTsKICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImNvbmRpdGlvbi1jaGFuZ2VkIik7CiAgICAgfQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMKaW5kZXggMjdlMjE0NC4uNDI5Y2RhMSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0LmpzCkBAIC0yNyw3ICsyNyw4IEBAIFdlYklu c3BlY3Rvci5PYmplY3QgPSBmdW5jdGlvbigpIHsKIH0KIAogV2ViSW5zcGVjdG9yLk9iamVjdC5w cm90b3R5cGUgPSB7Ci0gICAgYWRkRXZlbnRMaXN0ZW5lcjogZnVuY3Rpb24oZXZlbnRUeXBlLCBs aXN0ZW5lciwgdGhpc09iamVjdCkgeworICAgIGFkZEV2ZW50TGlzdGVuZXI6IGZ1bmN0aW9uKGV2 ZW50VHlwZSwgbGlzdGVuZXIsIHRoaXNPYmplY3QpCisgICAgewogICAgICAgICBpZiAoISgiX2xp c3RlbmVycyIgaW4gdGhpcykpCiAgICAgICAgICAgICB0aGlzLl9saXN0ZW5lcnMgPSB7fTsKICAg ICAgICAgaWYgKCEoZXZlbnRUeXBlIGluIHRoaXMuX2xpc3RlbmVycykpCkBAIC0zNSw3ICszNiw4 IEBAIFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9saXN0 ZW5lcnNbZXZlbnRUeXBlXS5wdXNoKHsgdGhpc09iamVjdDogdGhpc09iamVjdCwgbGlzdGVuZXI6 IGxpc3RlbmVyIH0pOwogICAgIH0sCiAKLSAgICByZW1vdmVFdmVudExpc3RlbmVyOiBmdW5jdGlv bihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0KSB7CisgICAgcmVtb3ZlRXZlbnRMaXN0 ZW5lcjogZnVuY3Rpb24oZXZlbnRUeXBlLCBsaXN0ZW5lciwgdGhpc09iamVjdCkKKyAgICB7CiAg ICAgICAgIGlmICghKCJfbGlzdGVuZXJzIiBpbiB0aGlzKSB8fCAhKGV2ZW50VHlwZSBpbiB0aGlz Ll9saXN0ZW5lcnMpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgbGlzdGVuZXJz ID0gdGhpcy5fbGlzdGVuZXJzW2V2ZW50VHlwZV07CkBAIC01MCw3ICs1MiwxMyBAQCBXZWJJbnNw ZWN0b3IuT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9saXN0 ZW5lcnNbZXZlbnRUeXBlXTsKICAgICB9LAogCi0gICAgZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz OiBmdW5jdGlvbihldmVudFR5cGUsIGV2ZW50RGF0YSkgeworICAgIHJlbW92ZUFsbExpc3RlbmVy czogZnVuY3Rpb24oKQorICAgIHsKKwkgICAgZGVsZXRlIHRoaXMuX2xpc3RlbmVyczsKKyAgICB9 LAorCisgICAgZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzOiBmdW5jdGlvbihldmVudFR5cGUsIGV2 ZW50RGF0YSkKKyAgICB7CiAgICAgICAgIGlmICghKCJfbGlzdGVuZXJzIiBpbiB0aGlzKSB8fCAh KGV2ZW50VHlwZSBpbiB0aGlzLl9saXN0ZW5lcnMpKQogICAgICAgICAgICAgcmV0dXJuOwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBjMjNkYjE0 Li45ZTliMmVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKQEAgLTM2NCw5ICszNjQsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGJy ZWFrcG9pbnRzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnQg PSBicmVha3BvaW50c1tpXTsKKyAgICAgICAgICAgICAgICB2YXIgbmV3TGluZSA9IGJyZWFrcG9p bnQubGluZTsKICAgICAgICAgICAgICAgICBpZiAoc3VjY2VzcyAmJiBicmVha3BvaW50LmxpbmUg Pj0gbGluZSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWtwb2ludC5saW5lICs9IGxpbmVzQ291 bnRUb1NoaWZ0OwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50TWFuYWdl ci5hZGRCcmVha3BvaW50KGJyZWFrcG9pbnQpOworICAgICAgICAgICAgICAgICAgICBuZXdMaW5l ICs9IGxpbmVzQ291bnRUb1NoaWZ0OworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVh a3BvaW50TWFuYWdlci5hZGRCcmVha3BvaW50KHNvdXJjZUlELCBicmVha3BvaW50LnVybCwgbmV3 TGluZSwgYnJlYWtwb2ludC5lbmFibGVkLCBicmVha3BvaW50LmNvbmRpdGlvbik7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH07CiAgICAgICAgIHZhciBjYWxsYmFja0lkID0gV2ViSW5zcGVjdG9y LkNhbGxiYWNrLndyYXAobXljYWxsYmFjay5iaW5kKHRoaXMpKQo= 59830 2010-06-26 04:41:56 -0700 2010-06-26 05:51:14 -0700 [PATCH] Style fixed. source_edit text/plain 4886 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjUzMjM5ZC4uMDJlNzU5YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNi0yNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBTY3JpcHNQYW5lbC5wcm90b3R5cGUu ZWRpdFNjcmlwdFNvdXJjZSB1c2VzIG9sZCBhZGRCcmVha3BvaW50IHNpZ25hdHVyZS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEyNDcKKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLnJlbW92ZUJyZWFrcG9p bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlLnNldCBlbmFi bGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5zZXQgY29u ZGl0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlLmFkZEV2ZW50TGlzdGVuZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGUucmVtb3ZlRXZlbnRMaXN0ZW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZS5yZW1vdmVBbGxMaXN0ZW5l cnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJj ZS5teWNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorCiAyMDEwLTA2LTI0ICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKaW5kZXggNGY2 OTY1YS4uNGQzNzVlNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Jy ZWFrcG9pbnRNYW5hZ2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50TWFuYWdlci5qcwpAQCAtNjYsNiArNjYsOCBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dE1hbmFnZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCEoYnJlYWtwb2ludC5p ZCBpbiB0aGlzLl9icmVha3BvaW50cykpCiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGJy ZWFrcG9pbnQucmVtb3ZlQWxsTGlzdGVuZXJzKCk7CisgICAgICAgIGRlbGV0ZSBicmVha3BvaW50 Ll9icmVha3BvaW50TWFuYWdlcjsKICAgICAgICAgZGVsZXRlIHRoaXMuX2JyZWFrcG9pbnRzW2Jy ZWFrcG9pbnQuaWRdOwogICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RnJvbUJhY2tlbmQo YnJlYWtwb2ludCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJicmVh a3BvaW50LXJlbW92ZWQiLCBicmVha3BvaW50KTsKQEAgLTE0NSw3ICsxNDcsOCBAQCBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgdGhpcy5fZW5hYmxlZCA9IHg7Ci0gICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2Vy Ll9zYXZlQnJlYWtwb2ludE9uQmFja2VuZCh0aGlzKTsKKyAgICAgICAgaWYgKHRoaXMuX2JyZWFr cG9pbnRNYW5hZ2VyKQorICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuX3NhdmVC cmVha3BvaW50T25CYWNrZW5kKHRoaXMpOwogICAgICAgICBpZiAodGhpcy5fZW5hYmxlZCkKICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJlbmFibGVkIik7CiAgICAg ICAgIGVsc2UKQEAgLTE4Niw3ICsxODksNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fY29uZGl0aW9u ID0gYzsKLSAgICAgICAgaWYgKHRoaXMuZW5hYmxlZCkKKyAgICAgICAgaWYgKHRoaXMuZW5hYmxl ZCAmJiB0aGlzLl9icmVha3BvaW50TWFuYWdlcikKICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyLl9zYXZlQnJlYWtwb2ludE9uQmFja2VuZCh0aGlzKTsKICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImNvbmRpdGlvbi1jaGFuZ2VkIik7CiAgICAgfQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMKaW5kZXggMjdlMjE0NC4uNTg3MmI4YiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0LmpzCkBAIC0yNyw3ICsyNyw4IEBAIFdlYklu c3BlY3Rvci5PYmplY3QgPSBmdW5jdGlvbigpIHsKIH0KIAogV2ViSW5zcGVjdG9yLk9iamVjdC5w cm90b3R5cGUgPSB7Ci0gICAgYWRkRXZlbnRMaXN0ZW5lcjogZnVuY3Rpb24oZXZlbnRUeXBlLCBs aXN0ZW5lciwgdGhpc09iamVjdCkgeworICAgIGFkZEV2ZW50TGlzdGVuZXI6IGZ1bmN0aW9uKGV2 ZW50VHlwZSwgbGlzdGVuZXIsIHRoaXNPYmplY3QpCisgICAgewogICAgICAgICBpZiAoISgiX2xp c3RlbmVycyIgaW4gdGhpcykpCiAgICAgICAgICAgICB0aGlzLl9saXN0ZW5lcnMgPSB7fTsKICAg ICAgICAgaWYgKCEoZXZlbnRUeXBlIGluIHRoaXMuX2xpc3RlbmVycykpCkBAIC0zNSw3ICszNiw4 IEBAIFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9saXN0 ZW5lcnNbZXZlbnRUeXBlXS5wdXNoKHsgdGhpc09iamVjdDogdGhpc09iamVjdCwgbGlzdGVuZXI6 IGxpc3RlbmVyIH0pOwogICAgIH0sCiAKLSAgICByZW1vdmVFdmVudExpc3RlbmVyOiBmdW5jdGlv bihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0KSB7CisgICAgcmVtb3ZlRXZlbnRMaXN0 ZW5lcjogZnVuY3Rpb24oZXZlbnRUeXBlLCBsaXN0ZW5lciwgdGhpc09iamVjdCkKKyAgICB7CiAg ICAgICAgIGlmICghKCJfbGlzdGVuZXJzIiBpbiB0aGlzKSB8fCAhKGV2ZW50VHlwZSBpbiB0aGlz Ll9saXN0ZW5lcnMpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgbGlzdGVuZXJz ID0gdGhpcy5fbGlzdGVuZXJzW2V2ZW50VHlwZV07CkBAIC01MCw3ICs1MiwxMyBAQCBXZWJJbnNw ZWN0b3IuT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9saXN0 ZW5lcnNbZXZlbnRUeXBlXTsKICAgICB9LAogCi0gICAgZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz OiBmdW5jdGlvbihldmVudFR5cGUsIGV2ZW50RGF0YSkgeworICAgIHJlbW92ZUFsbExpc3RlbmVy czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2xpc3RlbmVyczsKKyAg ICB9LAorCisgICAgZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzOiBmdW5jdGlvbihldmVudFR5cGUs IGV2ZW50RGF0YSkKKyAgICB7CiAgICAgICAgIGlmICghKCJfbGlzdGVuZXJzIiBpbiB0aGlzKSB8 fCAhKGV2ZW50VHlwZSBpbiB0aGlzLl9saXN0ZW5lcnMpKQogICAgICAgICAgICAgcmV0dXJuOwog CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBjMjNk YjE0Li45ZTliMmVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKQEAgLTM2NCw5ICszNjQsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IGJyZWFrcG9pbnRzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIGJyZWFrcG9p bnQgPSBicmVha3BvaW50c1tpXTsKKyAgICAgICAgICAgICAgICB2YXIgbmV3TGluZSA9IGJyZWFr cG9pbnQubGluZTsKICAgICAgICAgICAgICAgICBpZiAoc3VjY2VzcyAmJiBicmVha3BvaW50Lmxp bmUgPj0gbGluZSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWtwb2ludC5saW5lICs9IGxpbmVz Q291bnRUb1NoaWZ0OwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50TWFu YWdlci5hZGRCcmVha3BvaW50KGJyZWFrcG9pbnQpOworICAgICAgICAgICAgICAgICAgICBuZXdM aW5lICs9IGxpbmVzQ291bnRUb1NoaWZ0OworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5i cmVha3BvaW50TWFuYWdlci5hZGRCcmVha3BvaW50KHNvdXJjZUlELCBicmVha3BvaW50LnVybCwg bmV3TGluZSwgYnJlYWtwb2ludC5lbmFibGVkLCBicmVha3BvaW50LmNvbmRpdGlvbik7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH07CiAgICAgICAgIHZhciBjYWxsYmFja0lkID0gV2ViSW5zcGVj dG9yLkNhbGxiYWNrLndyYXAobXljYWxsYmFjay5iaW5kKHRoaXMpKQo=