62714 2011-06-15 03:46:42 -0700 Web Inspector: breakpointsWithoutSourceFile values should be a maps, not arrays. 2011-06-17 05:41:01 -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 421171 0 podivilov 2011-06-15 03:46:42 -0700 Web Inspector: breakpointsWithoutSourceFile values should be a maps, not arrays. First, that way it is guaranteed that there is no duplicates. Second, breakpoints without source files will have the same structure as sourceFiles -> sourceFile.breakpoints, so we will be able to merge them together to reduce the complexity. 421174 1 97272 podivilov 2011-06-15 03:47:33 -0700 Created attachment 97272 Patch. 421176 2 97272 yurys 2011-06-15 03:52:18 -0700 Comment on attachment 97272 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=97272&action=review > Source/WebCore/inspector/front-end/Settings.js:-82 > - this._migrateSettings(); This code should be preserved to get rid of existing duplicates. Otherwise, inspector will be slow until next time breakpoints are persisted and override existing settings. r- for this. 421265 3 podivilov 2011-06-15 07:36:31 -0700 (In reply to comment #2) > (From update of attachment 97272 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97272&action=review > > > Source/WebCore/inspector/front-end/Settings.js:-82 > > - this._migrateSettings(); > > This code should be preserved to get rid of existing duplicates. Otherwise, inspector will be slow until next time breakpoints are persisted and override existing settings. r- for this. If breakpoints are duplicated in local storage, chances are that inspector is slow for quite some time. Why can not it be slow just a little bit longer? From the other side, migrating the settings causes the loss of all breakpoints, even if there were no duplicates. 421267 4 pfeldman 2011-06-15 07:38:00 -0700 We could introduce a threshold and nuke breakpoints only in case the value length is > 2000000 + migrate to the map. 421900 5 97433 podivilov 2011-06-16 04:07:09 -0700 Created attachment 97433 Added a threshold to nuke breakpoints. 422577 6 podivilov 2011-06-17 05:41:01 -0700 Committed r89135: <http://trac.webkit.org/changeset/89135> 97272 2011-06-15 03:47:33 -0700 2011-06-16 04:07:09 -0700 Patch. patch text/plain 6047 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ODBjOTk0Li5iYjgxZjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMTUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZSB2YWx1ZXMgc2hvdWxkIGJlIGEg bWFwcywgbm90IGFycmF5cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYyNzE0CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3Jlc3RvcmVCcmVha3BvaW50cyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0Rm9ybWF0 U291cmNlRmlsZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLl9yZXN0b3JlQnJlYWtwb2ludHNGcm9tU2V0dGluZ3MpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zYXZl QnJlYWtwb2ludHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T ZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlLl9zZXQpOgorCiAyMDExLTA2LTE1ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhdmlkIEh5YXR0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGY2MDll NTEuLmJiZTlmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTEzOCw4ICsx MzgsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl ID0gewogICAgIF9yZXN0b3JlQnJlYWtwb2ludHM6IGZ1bmN0aW9uKHNvdXJjZUZpbGUpCiAgICAg ewogICAgICAgICB2YXIgcGVuZGluZ0JyZWFrcG9pbnRzID0gdGhpcy5fYnJlYWtwb2ludHNXaXRo b3V0U291cmNlRmlsZVtzb3VyY2VGaWxlLmlkXTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IHBl bmRpbmdCcmVha3BvaW50cyAmJiBpIDwgcGVuZGluZ0JyZWFrcG9pbnRzLmxlbmd0aDsgKytpKSB7 Ci0gICAgICAgICAgICB2YXIgYnJlYWtwb2ludERhdGEgPSBwZW5kaW5nQnJlYWtwb2ludHNbaV07 CisgICAgICAgIGlmICghcGVuZGluZ0JyZWFrcG9pbnRzKQorICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIHBlbmRpbmdCcmVha3BvaW50cykgeworICAg ICAgICAgICAgdmFyIGJyZWFrcG9pbnREYXRhID0gcGVuZGluZ0JyZWFrcG9pbnRzW2xpbmVOdW1i ZXJdOwogICAgICAgICAgICAgaWYgKCJkZWJ1Z2dlcklkIiBpbiBicmVha3BvaW50RGF0YSkgewog ICAgICAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gbmV3IFdlYkluc3BlY3Rvci5QcmVzZW50 YXRpb25CcmVha3BvaW50KHNvdXJjZUZpbGUsIGJyZWFrcG9pbnREYXRhLmxpbmVOdW1iZXIsIGJy ZWFrcG9pbnREYXRhLmNvbmRpdGlvbiwgYnJlYWtwb2ludERhdGEuZW5hYmxlZCk7CiAgICAgICAg ICAgICAgICAgdGhpcy5fYmluZERlYnVnZ2VySWQoYnJlYWtwb2ludCwgYnJlYWtwb2ludERhdGEu ZGVidWdnZXJJZCk7CkBAIC0yMzIsOCArMjM0LDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGZvciAodmFyIGlkIGluIHRo aXMuX2JyZWFrcG9pbnRzV2l0aG91dFNvdXJjZUZpbGUpIHsKICAgICAgICAgICAgIHZhciBicmVh a3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzV2l0aG91dFNvdXJjZUZpbGVbaWRdOwotICAgICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50cy5sZW5ndGg7ICsraSkKLSAgICAg ICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RnJvbURlYnVnZ2VyKGJyZWFrcG9pbnRz W2ldKTsKKyAgICAgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIgaW4gYnJlYWtwb2ludHMpCisg ICAgICAgICAgICAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludEZyb21EZWJ1Z2dlcihicmVha3Bv aW50c1tsaW5lTnVtYmVyXSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgbWVzc2FnZXMgPSB0 aGlzLl9tZXNzYWdlczsKQEAgLTQ5NywxMCArNDk5LDEwIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIC8vIEFkZCBicmVh a3BvaW50IG9uY2Ugc291cmNlIGZpbGUgYmVjb21lcyBhdmFpbGFibGUuCiAgICAgICAgICAgICB2 YXIgcGVuZGluZ0JyZWFrcG9pbnRzID0gdGhpcy5fYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmls ZVtzb3VyY2VGaWxlSWRdOwogICAgICAgICAgICAgaWYgKCFwZW5kaW5nQnJlYWtwb2ludHMpIHsK LSAgICAgICAgICAgICAgICBwZW5kaW5nQnJlYWtwb2ludHMgPSBbXTsKKyAgICAgICAgICAgICAg ICBwZW5kaW5nQnJlYWtwb2ludHMgPSB7fTsKICAgICAgICAgICAgICAgICB0aGlzLl9icmVha3Bv aW50c1dpdGhvdXRTb3VyY2VGaWxlW3NvdXJjZUZpbGVJZF0gPSBwZW5kaW5nQnJlYWtwb2ludHM7 CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBwZW5kaW5nQnJlYWtwb2ludHMucHVzaChicmVh a3BvaW50RGF0YSk7CisgICAgICAgICAgICBwZW5kaW5nQnJlYWtwb2ludHNbYnJlYWtwb2ludERh dGEubGluZU51bWJlcl0gPSBicmVha3BvaW50RGF0YTsKICAgICAgICAgfQogICAgIH0sCiAKQEAg LTUxOSw4ICs1MjEsMTEgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgLy8gU3RvcmUgbm90IGFkZGVkIGJy ZWFrcG9pbnRzLgotICAgICAgICBmb3IgKHZhciBzb3VyY2VGaWxlSWQgaW4gdGhpcy5fYnJlYWtw b2ludHNXaXRob3V0U291cmNlRmlsZSkKLSAgICAgICAgICAgIHNlcmlhbGl6ZWRCcmVha3BvaW50 cyA9IHNlcmlhbGl6ZWRCcmVha3BvaW50cy5jb25jYXQodGhpcy5fYnJlYWtwb2ludHNXaXRob3V0 U291cmNlRmlsZVtzb3VyY2VGaWxlSWRdKTsKKyAgICAgICAgZm9yICh2YXIgc291cmNlRmlsZUlk IGluIHRoaXMuX2JyZWFrcG9pbnRzV2l0aG91dFNvdXJjZUZpbGUpIHsKKyAgICAgICAgICAgIHZh ciBicmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzV2l0aG91dFNvdXJjZUZpbGVbc291cmNl RmlsZUlkXTsKKyAgICAgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIgaW4gYnJlYWtwb2ludHMp CisgICAgICAgICAgICAgICAgc2VyaWFsaXplZEJyZWFrcG9pbnRzLnB1c2goYnJlYWtwb2ludHNb bGluZU51bWJlcl0pOworICAgICAgICB9CiAKICAgICAgICAgLy8gU2FuaXRpemUgZGVidWdnZXIg aWRzLgogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNlcmlhbGl6ZWRCcmVha3BvaW50cy5s ZW5ndGg7ICsraSkgewpAQCAtNjAwLDEwICs2MDUsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgZm9yICh2YXIgbGlu ZSBpbiBzb3VyY2VGaWxlLmJyZWFrcG9pbnRzKSB7CiAgICAgICAgICAgICAgICAgdmFyIGJyZWFr cG9pbnRzID0gdGhpcy5fYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZVtzb3VyY2VGaWxlLmlk XTsKICAgICAgICAgICAgICAgICBpZiAoIWJyZWFrcG9pbnRzKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGJyZWFrcG9pbnRzID0gW107CisgICAgICAgICAgICAgICAgICAgIGJyZWFrcG9pbnRzID0g e307CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzV2l0aG91dFNvdXJjZUZp bGVbc291cmNlRmlsZS5pZF0gPSBicmVha3BvaW50czsKICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgYnJlYWtwb2ludHMucHVzaChzb3VyY2VGaWxlLmJyZWFrcG9pbnRzW2xpbmVd LnNlcmlhbGl6ZSgpKTsKKyAgICAgICAgICAgICAgICBicmVha3BvaW50c1tsaW5lXSA9IHNvdXJj ZUZpbGUuYnJlYWtwb2ludHNbbGluZV0uc2VyaWFsaXplKCk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T ZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMKaW5kZXggOTM5NGI4OC4uNWUzNGM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC03OCwxMiArNzgsOCBAQCBXZWJJbnNwZWN0b3Iu U2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0aW5n KCJldmVudExpc3RlbmVyQnJlYWtwb2ludHMiLCBbXSk7CiAgICAgdGhpcy5pbnN0YWxsQXBwbGlj YXRpb25TZXR0aW5nKCJkb21CcmVha3BvaW50cyIsIFtdKTsKICAgICB0aGlzLmluc3RhbGxBcHBs aWNhdGlvblNldHRpbmcoInhockJyZWFrcG9pbnRzIiwgW10pOwotCi0gICAgdGhpcy5fbWlncmF0 ZVNldHRpbmdzKCk7CiB9CiAKLVdlYkluc3BlY3Rvci5TZXR0aW5ncy52ZXJzaW9uID0gIjEiOwot CiBXZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlID0gewogICAgIGluc3RhbGxBcHBsaWNh dGlvblNldHRpbmc6IGZ1bmN0aW9uKGtleSwgZGVmYXVsdFZhbHVlKQogICAgIHsKQEAgLTExMCwy MSArMTA2LDYgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIGlmICh3aW5kb3cubG9jYWxTdG9yYWdlICE9IG51bGwpCiAgICAgICAgICAgICB3aW5k b3cubG9jYWxTdG9yYWdlW2tleV0gPSBKU09OLnN0cmluZ2lmeSh2YWx1ZSk7Ci0gICAgfSwKLQot ICAgIF9taWdyYXRlU2V0dGluZ3M6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICghd2lu ZG93LmxvY2FsU3RvcmFnZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdmFyIHZlcnNp b24gPSBsb2NhbFN0b3JhZ2UudmVyc2lvbjsKLSAgICAgICAgaWYgKHZlcnNpb24gPT09IFdlYklu c3BlY3Rvci5TZXR0aW5ncy52ZXJzaW9uKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IHZhciBicmVha3BvaW50S2V5cyA9IFsiYnJlYWtwb2ludHMiLCAiZXZlbnRMaXN0ZW5lckJyZWFr cG9pbnRzIiwgImRvbUJyZWFrcG9pbnRzIiwgInhockJyZWFrcG9pbnRzIl07Ci0gICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludEtleXMubGVuZ3RoOyBpKyspCi0gICAgICAgICAg ICBkZWxldGUgbG9jYWxTdG9yYWdlW2JyZWFrcG9pbnRLZXlzW2ldXTsKLQotICAgICAgICBsb2Nh bFN0b3JhZ2UudmVyc2lvbiA9IFdlYkluc3BlY3Rvci5TZXR0aW5ncy52ZXJzaW9uOwogICAgIH0K IH0KIAo= 97433 2011-06-16 04:07:09 -0700 2011-06-16 04:42:15 -0700 Added a threshold to nuke breakpoints. patch text/plain 6286 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZDhmMTcwLi5hMjkwZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZSB2YWx1ZXMgc2hvdWxkIGJlIGEg bWFwcywgbm90IGFycmF5cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYyNzE0CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3Jlc3RvcmVCcmVha3BvaW50cyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0Rm9ybWF0 U291cmNlRmlsZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLl9yZXN0b3JlQnJlYWtwb2ludHNGcm9tU2V0dGluZ3MpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zYXZl QnJlYWtwb2ludHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T ZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlLl9zZXQpOgorCiAyMDExLTA2LTE1ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggMWUyMjg2YS4uNTViYWVh NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtMTU5LDggKzE1OSwxMCBAQCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAg X3Jlc3RvcmVCcmVha3BvaW50czogZnVuY3Rpb24oc291cmNlRmlsZSkKICAgICB7CiAgICAgICAg IHZhciBwZW5kaW5nQnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1dpdGhvdXRTb3VyY2VG aWxlW3NvdXJjZUZpbGUuaWRdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgcGVuZGluZ0JyZWFr cG9pbnRzICYmIGkgPCBwZW5kaW5nQnJlYWtwb2ludHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAg ICAgIHZhciBicmVha3BvaW50RGF0YSA9IHBlbmRpbmdCcmVha3BvaW50c1tpXTsKKyAgICAgICAg aWYgKCFwZW5kaW5nQnJlYWtwb2ludHMpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGZv ciAodmFyIGxpbmVOdW1iZXIgaW4gcGVuZGluZ0JyZWFrcG9pbnRzKSB7CisgICAgICAgICAgICB2 YXIgYnJlYWtwb2ludERhdGEgPSBwZW5kaW5nQnJlYWtwb2ludHNbbGluZU51bWJlcl07CiAgICAg ICAgICAgICBpZiAoImRlYnVnZ2VySWQiIGluIGJyZWFrcG9pbnREYXRhKSB7CiAgICAgICAgICAg ICAgICAgdmFyIGJyZWFrcG9pbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkJyZWFr cG9pbnQoc291cmNlRmlsZSwgYnJlYWtwb2ludERhdGEubGluZU51bWJlciwgYnJlYWtwb2ludERh dGEuY29uZGl0aW9uLCBicmVha3BvaW50RGF0YS5lbmFibGVkKTsKICAgICAgICAgICAgICAgICB0 aGlzLl9iaW5kRGVidWdnZXJJZChicmVha3BvaW50LCBicmVha3BvaW50RGF0YS5kZWJ1Z2dlcklk KTsKQEAgLTI1Myw4ICsyNTUsOCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2YXIgaWQgaW4gdGhpcy5fYnJlYWtw b2ludHNXaXRob3V0U291cmNlRmlsZSkgewogICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0g dGhpcy5fYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZVtpZF07Ci0gICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IGJyZWFrcG9pbnRzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAg IHRoaXMuX3JlbW92ZUJyZWFrcG9pbnRGcm9tRGVidWdnZXIoYnJlYWtwb2ludHNbaV0pOworICAg ICAgICAgICAgZm9yICh2YXIgbGluZU51bWJlciBpbiBicmVha3BvaW50cykKKyAgICAgICAgICAg ICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RnJvbURlYnVnZ2VyKGJyZWFrcG9pbnRzW2xpbmVO dW1iZXJdKTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBtZXNzYWdlcyA9IHRoaXMuX21lc3Nh Z2VzOwpAQCAtNTIxLDEwICs1MjMsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gQWRkIGJyZWFrcG9pbnQgb25j ZSBzb3VyY2UgZmlsZSBiZWNvbWVzIGF2YWlsYWJsZS4KICAgICAgICAgICAgIHZhciBwZW5kaW5n QnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1dpdGhvdXRTb3VyY2VGaWxlW3NvdXJjZUZp bGVJZF07CiAgICAgICAgICAgICBpZiAoIXBlbmRpbmdCcmVha3BvaW50cykgewotICAgICAgICAg ICAgICAgIHBlbmRpbmdCcmVha3BvaW50cyA9IFtdOworICAgICAgICAgICAgICAgIHBlbmRpbmdC cmVha3BvaW50cyA9IHt9OwogICAgICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzV2l0aG91 dFNvdXJjZUZpbGVbc291cmNlRmlsZUlkXSA9IHBlbmRpbmdCcmVha3BvaW50czsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIHBlbmRpbmdCcmVha3BvaW50cy5wdXNoKGJyZWFrcG9pbnREYXRh KTsKKyAgICAgICAgICAgIHBlbmRpbmdCcmVha3BvaW50c1ticmVha3BvaW50RGF0YS5saW5lTnVt YmVyXSA9IGJyZWFrcG9pbnREYXRhOwogICAgICAgICB9CiAgICAgfSwKIApAQCAtNTQzLDggKzU0 NSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBTdG9yZSBub3QgYWRkZWQgYnJlYWtwb2ludHMu Ci0gICAgICAgIGZvciAodmFyIHNvdXJjZUZpbGVJZCBpbiB0aGlzLl9icmVha3BvaW50c1dpdGhv dXRTb3VyY2VGaWxlKQotICAgICAgICAgICAgc2VyaWFsaXplZEJyZWFrcG9pbnRzID0gc2VyaWFs aXplZEJyZWFrcG9pbnRzLmNvbmNhdCh0aGlzLl9icmVha3BvaW50c1dpdGhvdXRTb3VyY2VGaWxl W3NvdXJjZUZpbGVJZF0pOworICAgICAgICBmb3IgKHZhciBzb3VyY2VGaWxlSWQgaW4gdGhpcy5f YnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZSkgeworICAgICAgICAgICAgdmFyIGJyZWFrcG9p bnRzID0gdGhpcy5fYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZVtzb3VyY2VGaWxlSWRdOwor ICAgICAgICAgICAgZm9yICh2YXIgbGluZU51bWJlciBpbiBicmVha3BvaW50cykKKyAgICAgICAg ICAgICAgICBzZXJpYWxpemVkQnJlYWtwb2ludHMucHVzaChicmVha3BvaW50c1tsaW5lTnVtYmVy XSk7CisgICAgICAgIH0KIAogICAgICAgICAvLyBTYW5pdGl6ZSBkZWJ1Z2dlciBpZHMuCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2VyaWFsaXplZEJyZWFrcG9pbnRzLmxlbmd0aDsgKytp KSB7CkBAIC02MjQsMTAgKzYyOSwxMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb3IgKHZhciBsaW5lIGluIHNvdXJj ZUZpbGUuYnJlYWtwb2ludHMpIHsKICAgICAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSB0 aGlzLl9icmVha3BvaW50c1dpdGhvdXRTb3VyY2VGaWxlW3NvdXJjZUZpbGUuaWRdOwogICAgICAg ICAgICAgICAgIGlmICghYnJlYWtwb2ludHMpIHsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWtw b2ludHMgPSBbXTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWtwb2ludHMgPSB7fTsKICAgICAg ICAgICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNXaXRob3V0U291cmNlRmlsZVtzb3VyY2VG aWxlLmlkXSA9IGJyZWFrcG9pbnRzOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAg ICBicmVha3BvaW50cy5wdXNoKHNvdXJjZUZpbGUuYnJlYWtwb2ludHNbbGluZV0uc2VyaWFsaXpl KCkpOworICAgICAgICAgICAgICAgIGJyZWFrcG9pbnRzW2xpbmVdID0gc291cmNlRmlsZS5icmVh a3BvaW50c1tsaW5lXS5zZXJpYWxpemUoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA5 Mzk0Yjg4Li43YWRjZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMKQEAgLTc5LDExICs3OSwxMiBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3Mg PSBmdW5jdGlvbigpCiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0aW5nKCJkb21CcmVh a3BvaW50cyIsIFtdKTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInhockJy ZWFrcG9pbnRzIiwgW10pOwogCi0gICAgdGhpcy5fbWlncmF0ZVNldHRpbmdzKCk7CisgICAgLy8g SWYgdGhlcmUgYXJlIHRvbyBtYW55IGJyZWFrcG9pbnRzIGluIGEgc3RvcmFnZSwgaXQgaXMgbGlr ZWx5IGR1ZSB0byBhIHJlY2VudCBidWcgdGhhdCBjYXVzZWQKKyAgICAvLyBwZXJpb2RpY2FsIGJy ZWFrcG9pbnRzIGR1cGxpY2F0aW9uIGxlYWRpbmcgdG8gaW5zcGVjdG9yIHNsb3duZXNzLgorICAg IGlmICh3aW5kb3cubG9jYWxTdG9yYWdlLmJyZWFrcG9pbnRzICYmIHdpbmRvdy5sb2NhbFN0b3Jh Z2UuYnJlYWtwb2ludHMubGVuZ3RoID4gNTAwMDAwKQorICAgICAgICBkZWxldGUgd2luZG93Lmxv Y2FsU3RvcmFnZS5icmVha3BvaW50czsKIH0KIAotV2ViSW5zcGVjdG9yLlNldHRpbmdzLnZlcnNp b24gPSAiMSI7Ci0KIFdlYkluc3BlY3Rvci5TZXR0aW5ncy5wcm90b3R5cGUgPSB7CiAgICAgaW5z dGFsbEFwcGxpY2F0aW9uU2V0dGluZzogZnVuY3Rpb24oa2V5LCBkZWZhdWx0VmFsdWUpCiAgICAg ewpAQCAtMTEwLDIxICsxMTEsNiBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgaWYgKHdpbmRvdy5sb2NhbFN0b3JhZ2UgIT0gbnVsbCkKICAgICAg ICAgICAgIHdpbmRvdy5sb2NhbFN0b3JhZ2Vba2V5XSA9IEpTT04uc3RyaW5naWZ5KHZhbHVlKTsK LSAgICB9LAotCi0gICAgX21pZ3JhdGVTZXR0aW5nczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAg ICAgaWYgKCF3aW5kb3cubG9jYWxTdG9yYWdlKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB2YXIgdmVyc2lvbiA9IGxvY2FsU3RvcmFnZS52ZXJzaW9uOwotICAgICAgICBpZiAodmVyc2lv biA9PT0gV2ViSW5zcGVjdG9yLlNldHRpbmdzLnZlcnNpb24pCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgdmFyIGJyZWFrcG9pbnRLZXlzID0gWyJicmVha3BvaW50cyIsICJldmVudExp c3RlbmVyQnJlYWtwb2ludHMiLCAiZG9tQnJlYWtwb2ludHMiLCAieGhyQnJlYWtwb2ludHMiXTsK LSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50S2V5cy5sZW5ndGg7IGkrKykK LSAgICAgICAgICAgIGRlbGV0ZSBsb2NhbFN0b3JhZ2VbYnJlYWtwb2ludEtleXNbaV1dOwotCi0g ICAgICAgIGxvY2FsU3RvcmFnZS52ZXJzaW9uID0gV2ViSW5zcGVjdG9yLlNldHRpbmdzLnZlcnNp b247CiAgICAgfQogfQogCg==