69744 2011-10-10 00:16:29 -0700 Web Inspector: small memory leak in scripts panel 2011-10-10 05:49:31 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov bweinstein caseq joepeck keishi loislo ossy pfeldman pmuellr rik timothy yurys oldest_to_newest 480855 0 loislo 2011-10-10 00:16:29 -0700 Scripts panel doesn't clean the list of child views. 480856 1 110334 loislo 2011-10-10 00:19:39 -0700 Created attachment 110334 Patch 480863 2 110334 yurys 2011-10-10 00:49:58 -0700 Comment on attachment 110334 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110334&action=review > Source/WebCore/inspector/front-end/Panel.js:100 > + WebInspector.View.prototype.reset.call(this); This may well break some panels. We shouldn't remove all child views on reset I think. Can you do this clean-up in the ScriptsPanel for now? > Source/WebCore/inspector/front-end/View.js:158 > + reset: function() I'd rather renamed this to something like removeAllChildView 480866 3 110334 caseq 2011-10-10 01:06:02 -0700 Comment on attachment 110334 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110334&action=review > Source/WebCore/inspector/front-end/View.js:165 > + for (var i = 0; i < this._children.length; ++i) { > + var view = this._children[i]; > + view._parentView = null; > + view._detach(); > + } > + this._children = []; We shouldn't destroy view hierarchy upon reset, reset is a model event that typically causes model objects be removed, but does not necessarily affect UI objects (consider NetworkLogView, which is not removed upon reset(), although may be cleaned). There does not seem to be a valid reason for View.reset() to exist at all. I suggest we rather handler view removal in the higher-level code, symmetrical to how the particular view is created. 480869 4 110337 loislo 2011-10-10 01:39:45 -0700 Created attachment 110337 Patch 480870 5 110337 caseq 2011-10-10 01:45:51 -0700 Comment on attachment 110337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110337&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:569 > + this._detachSourceFramesViews(); Why don't we get an event upon script removal from the model instead? We already have UISourceCodeAdded and UISourceCodeReplaced, it would seem natural to have UISourceCodeRemoved. Besides, DebuggerPresentationModel already handles reset event and cleans up the source code accordingly. 480888 6 110342 loislo 2011-10-10 02:33:15 -0700 Created attachment 110342 Patch 480889 7 110342 caseq 2011-10-10 02:34:17 -0700 Comment on attachment 110342 Patch LGTM 480892 8 110342 yurys 2011-10-10 02:39:57 -0700 Comment on attachment 110342 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110342&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:435 > + this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.UISourceCodeRemoved, this._rawSourceCode[id].sourceMapping.uiSourceCode); Pavel Podivilov was going to allow for multiple UISourceCode's per single RawSourceCode, but I assume it is not landed yet. Also we may want to introduce something like UISourceCodesCleared event for performance reasons., but for now this approach is fine. 480895 9 loislo 2011-10-10 02:53:12 -0700 Committed r97050: <http://trac.webkit.org/changeset/97050> 480906 10 ossy 2011-10-10 03:55:46 -0700 It broke inspector/debugger/script-formatter.html on the SL and on the Qt bot: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20%28Tests%29/r97050%20%2833774%29/inspector/debugger/script-formatter-pretty-diff.html Reopen to fix it. 480907 11 110342 ossy 2011-10-10 03:56:08 -0700 Comment on attachment 110342 Patch remove r+ from landed patch 480923 12 ossy 2011-10-10 05:49:31 -0700 Fix landed in http://trac.webkit.org/changeset/97055 110334 2011-10-10 00:19:39 -0700 2011-10-10 01:39:37 -0700 Patch bug-69744-20111010111937.patch text/plain 3028 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OGE5ODdhMTI0ZTU1ZDU1 YjIxYjNiOGQ2MjZmODRhNjhjMDE5MDg5Li5mZGYwNWFmMTcxMzEyZjY3ZmJlMDQ0NjZiM2FhNzEz OTM5OWYyOGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTAgIElseWEg VGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNtYWxsIG1lbW9yeSBsZWFrIGluIHNjcmlwdHMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTc0NAorCisgICAgICAgIFNjcmlwdHMg cGFuZWwgZG9lc24ndCBjbGVhbiB0aGUgbGlzdCBvZiBjaGlsZCB2aWV3cy4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnJlc2V0 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmll dy5wcm90b3R5cGUucmVzZXQpOgorCiAyMDExLTEwLTA5ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNA d2Via2l0Lm9yZz4KIAogICAgICAgICBBbm90aGVyIGF0dGVtcHQgdG8gZml4IHRoZSBMZW9wYXJk IEludGVsIERlYnVnIGJ1aWxkIGFmdGVyIGNoYW5nZXNldCA5NzAzNCA8aHR0cDovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvOTcwMzQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9QYW5lbC5qcwppbmRleCAwYzdiMzI0OTRkNzRjMDJkYjAwNGE2ZmIxZWQ2YTc0YzU4OTc3 ZTdhLi42ZTY2MTc3MDQ0M2RmYmUyOThiMDE5YjBhM2ZkMzZkOWVjYTRkMWUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTk3LDYgKzk3LDcgQEAg V2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICByZXNldDogZnVuY3Rpb24oKQog ICAgIHsKICAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxlZCgpOworICAgICAgICBXZWJJbnNwZWN0 b3IuVmlldy5wcm90b3R5cGUucmVzZXQuY2FsbCh0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0IGRl ZmF1bHRGb2N1c2VkRWxlbWVudCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDYzNzA3OWRiZThmNTI1MTU3ZTVkNzUxNTkx MzZkMmZlMDI4Y2EzODAuLjA2YjdlMzg2ODJlMjEzZmFjYjE0YjE3OGU4ZjMwMzc4ZjRmMGUwMmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCkBAIC01NTgsNyArNTU4LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSBudWxsOwogCiAgICAgICAgIGRl bGV0ZSB0aGlzLmN1cnJlbnRRdWVyeTsKLSAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxlZCgpOwog CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUmVzdW1lZCgpOwogCkBAIC01NzYsNiArNTc1LDggQEAg V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2lk ZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMucmVzZXQoKTsKICAgICAgICAgaWYgKCFwcmVzZXJ2 ZUl0ZW1zICYmIHRoaXMuc2lkZWJhclBhbmVzLndvcmtlcnMpCiAgICAgICAgICAgICB0aGlzLnNp ZGViYXJQYW5lcy53b3JrZXJzLnJlc2V0KCk7CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLlBhbmVs LnByb3RvdHlwZS5yZXNldC5jYWxsKHRoaXMpOwogICAgIH0sCiAKICAgICBfcmVzZXRGaWxlc1Nl bGVjdDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9WaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3 LmpzCmluZGV4IDIyMjkyZDEzOWNmNjdjYjM4ZmE0MTk3YjAwOWY1ZjQ5M2U1OTQ3MzkuLmQ0MzAx NGM5NDE5YmIwZjc2MjBhNTU4NDMxYzJlMmNjMGU3MTNmOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1ZpZXcuanMKQEAgLTE1NSw2ICsxNTUsMTYgQEAgV2ViSW5zcGVj dG9yLlZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2aWV3Ll9kZXRhY2goKTsKICAgICB9LAog CisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciB2aWV3ID0g dGhpcy5fY2hpbGRyZW5baV07CisgICAgICAgICAgICB2aWV3Ll9wYXJlbnRWaWV3ID0gbnVsbDsK KyAgICAgICAgICAgIHZpZXcuX2RldGFjaCgpOworICAgICAgICB9CisgICAgICAgIHRoaXMuX2No aWxkcmVuID0gW107CisgICAgfSwKKwogICAgIG9uUmVzaXplOiBmdW5jdGlvbigpCiAgICAgewog ICAgIH0sCg== 110337 2011-10-10 01:39:45 -0700 2011-10-10 02:33:03 -0700 Patch bug-69744-20111010123943.patch text/plain 2077 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OGE5ODdhMTI0ZTU1ZDU1 YjIxYjNiOGQ2MjZmODRhNjhjMDE5MDg5Li42NWMyN2E2OWEwMWE3NWU0Y2E3NjdjZTRlODIyNDFm ZTU1NDI1NmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAtMTAgIElseWEg VGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNtYWxsIG1lbW9yeSBsZWFrIGluIHNjcmlwdHMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTc0NAorCisgICAgICAgIFNjcmlwdHMg cGFuZWwgZG9lc24ndCBjbGVhbiB0aGUgbGlzdCBvZiBjaGlsZCB2aWV3cy4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuX2RldGFjaFNvdXJjZUZyYW1lc1ZpZXdzKToKKwogMjAxMS0xMC0wOSAgRGFuaWVsIEJh dGVzICA8ZGJhdGVzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQW5vdGhlciBhdHRlbXB0IHRvIGZp eCB0aGUgTGVvcGFyZCBJbnRlbCBEZWJ1ZyBidWlsZCBhZnRlciBjaGFuZ2VzZXQgOTcwMzQgPGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzk3MDM0PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA2MzcwNzlkYmU4 ZjUyNTE1N2U1ZDc1MTU5MTM2ZDJmZTAyOGNhMzgwLi4yNDQ2YzNhMjY3ZTZkMDVmZWQ5ODE0MTI0 ZWQ0ZTNjNmE3M2E0MWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtNTY2LDYgKzU2Niw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jdXJyZW50QmFja0Zvcndh cmRJbmRleCA9IC0xOwogICAgICAgICB0aGlzLl91cGRhdGVCYWNrQW5kRm9yd2FyZEJ1dHRvbnMo KTsKIAorICAgICAgICB0aGlzLl9kZXRhY2hTb3VyY2VGcmFtZXNWaWV3cygpOwogICAgICAgICB0 aGlzLl9yZXNldEZpbGVzU2VsZWN0KCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlc1NlbGVj dEVsZW1lbnQuaW5pdGlhbFNlbGVjdGlvblByb2Nlc3NlZDsKIApAQCAtNTc4LDYgKzU3OSwxNSBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRo aXMuc2lkZWJhclBhbmVzLndvcmtlcnMucmVzZXQoKTsKICAgICB9LAogCisgICAgX2RldGFjaFNv dXJjZUZyYW1lc1ZpZXdzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5sZW5ndGg7ICsraSkgeworICAgICAgICAg ICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudFtpXTsKKyAgICAgICAgICAg IGlmIChvcHRpb24uX3VpU291cmNlQ29kZSAmJiBvcHRpb24uX3VpU291cmNlQ29kZS5fc291cmNl RnJhbWUpCisgICAgICAgICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZFZpZXcob3B0aW9uLl91aVNv dXJjZUNvZGUuX3NvdXJjZUZyYW1lKTsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBfcmVzZXRG aWxlc1NlbGVjdDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RF bGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Cg== 110342 2011-10-10 02:33:15 -0700 2011-10-10 03:56:08 -0700 Patch bug-69744-20111010133313.patch text/plain 4100 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OGE5ODdhMTI0ZTU1ZDU1 YjIxYjNiOGQ2MjZmODRhNjhjMDE5MDg5Li5kY2M4ZmY2MTk2MjA0NDEwNjhhMTllMTUwY2YxYjhk OTg2ZWZlNjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMTAgIElseWEg VGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNtYWxsIG1lbW9yeSBsZWFrIGluIHNjcmlwdHMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTc0NAorCisgICAgICAgIFNjcmlwdHMg cGFuZWwgZG9lc24ndCBjbGVhbiB0aGUgbGlzdCBvZiBjaGlsZCB2aWV3cy4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGVidWdnZXJSZXNldCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fdWlTb3VyY2VDb2RlUmVtb3ZlZCk6CisK IDIwMTEtMTAtMDkgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgogCiAgICAgICAg IEFub3RoZXIgYXR0ZW1wdCB0byBmaXggdGhlIExlb3BhcmQgSW50ZWwgRGVidWcgYnVpbGQgYWZ0 ZXIgY2hhbmdlc2V0IDk3MDM0IDxodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC85NzAz ND4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCAyNTMwMmQwYTAxYmRjYmM4ZTcx NDZmYzE2OGFjMmIxNDEwMTU1MmY5Li5hNzI4ZTk4ZjBlNDRkOWQ1ZGQwOGZlYjA1MmRlZTA4ZjBm ZTU3OTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC01Niw2ICs1Niw3IEBA IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsID0gZnVuY3Rpb24oKQogV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzID0gewogICAgIFVJU291 cmNlQ29kZUFkZGVkOiAic291cmNlLWZpbGUtYWRkZWQiLAogICAgIFVJU291cmNlQ29kZVJlcGxh Y2VkOiAic291cmNlLWZpbGUtcmVwbGFjZWQiLAorICAgIFVJU291cmNlQ29kZVJlbW92ZWQ6ICJz b3VyY2UtZmlsZS1yZW1vdmVkIiwKICAgICBDb25zb2xlTWVzc2FnZUFkZGVkOiAiY29uc29sZS1t ZXNzYWdlLWFkZGVkIiwKICAgICBDb25zb2xlTWVzc2FnZXNDbGVhcmVkOiAiY29uc29sZS1tZXNz YWdlcy1jbGVhcmVkIiwKICAgICBCcmVha3BvaW50QWRkZWQ6ICJicmVha3BvaW50LWFkZGVkIiwK QEAgLTQzMCw4ICs0MzEsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwucHJvdG90eXBlID0gewogCiAgICAgX2RlYnVnZ2VyUmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 Ci0gICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX3Jhd1NvdXJjZUNvZGUpCisgICAgICAgIGZv ciAodmFyIGlkIGluIHRoaXMuX3Jhd1NvdXJjZUNvZGUpIHsKKyAgICAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLkV2ZW50cy5VSVNvdXJjZUNvZGVSZW1vdmVkLCB0aGlzLl9yYXdTb3VyY2VDb2RlW2lkXS5z b3VyY2VNYXBwaW5nLnVpU291cmNlQ29kZSk7CiAgICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VD b2RlW2lkXS5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKKyAgICAgICAgfQogICAgICAgICB0aGlzLl9y YXdTb3VyY2VDb2RlID0ge307CiAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMg PSBbXTsKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWUgPSBudWxsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA2 MzcwNzlkYmU4ZjUyNTE1N2U1ZDc1MTU5MTM2ZDJmZTAyOGNhMzgwLi44YTBhMGZlYzc5M2ZkOTM4 NzIzMTE0OTIzNmViM2ZmYmM4NzliYTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTcxLDYgKzE3MSw3IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKIAogICAg IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCB0aGlzLl91 aVNvdXJjZUNvZGVBZGRlZCwgdGhpcykKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50 cy5VSVNvdXJjZUNvZGVSZXBsYWNlZCwgdGhpcy5fdWlTb3VyY2VDb2RlUmVwbGFjZWQsIHRoaXMp OworICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQs IHRoaXMuX3VpU291cmNlQ29kZVJlbW92ZWQsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuRXZlbnRzLkNvbnNvbGVNZXNzYWdlQWRkZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlQWRk ZWQsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNvbnNvbGVNZXNz YWdlc0NsZWFyZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlc0NsZWFyZWQsIHRoaXMpOwogICAgIHRo aXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRBZGRlZCwgdGhpcy5fYnJlYWtw b2ludEFkZGVkLCB0aGlzKTsKQEAgLTI1Myw2ICsyNTQsMTMgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zaG93U291cmNlRnJhbWVB bmRBZGRUb0hpc3RvcnkodWlTb3VyY2VDb2RlKTsKICAgICB9LAogCisgICAgX3VpU291cmNlQ29k ZVJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIHVpU291cmNlQ29k ZSA9IGV2ZW50LmRhdGE7CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUuX3NvdXJjZUZyYW1lKQor ICAgICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZFZpZXcodWlTb3VyY2VDb2RlLl9zb3VyY2VGcmFt ZSk7CisgICAgfSwKKwogICAgIF9zaG93U2NyaXB0Rm9sZGVyc1NldHRpbmdDaGFuZ2VkOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICB2YXIgc2VsZWN0ZWRPcHRpb24gPSB0aGlzLl9maWxlc1Nl bGVjdEVsZW1lbnRbdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXhdOwo=