57009 2011-03-24 06:30:31 -0700 Web Inspector: [REGRESSION] console message count is not updated in scripts and resources panels 2011-08-12 08:35:00 -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 vsevik yurys oldest_to_newest 372777 0 podivilov 2011-03-24 06:30:31 -0700 Web Inspector: [REGRESSION] console message count is not updated in scripts and resources panels. 449679 1 103597 podivilov 2011-08-11 03:10:42 -0700 Created attachment 103597 Patch 449766 2 103597 vsevik 2011-08-11 07:53:28 -0700 Comment on attachment 103597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103597&action=review This does not work for me. Sometimes it leads to resource element bubble and source frame message showing different number of messages. I think this happens because some messages are processed twice in SourceFrame because of an extra MessageAdded event. > Source/WebCore/inspector/front-end/ConsoleView.js:145 > + console.dispatchEventToListeners(WebInspector.ConsoleView.Events.MessageAdded, msg); I believe this could cause side effects 449794 3 103630 podivilov 2011-08-11 08:34:12 -0700 Created attachment 103630 Patch 449797 4 podivilov 2011-08-11 08:37:19 -0700 (In reply to comment #2) > (From update of attachment 103597 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103597&action=review > > This does not work for me. > Sometimes it leads to resource element bubble and source frame message showing different number of messages. I think this happens because some messages are processed twice in SourceFrame because of an extra MessageAdded event. Thanks for spotting this! We should use last message totalRepeatCount to update source frame bubble properly. > > > Source/WebCore/inspector/front-end/ConsoleView.js:145 > > + console.dispatchEventToListeners(WebInspector.ConsoleView.Events.MessageAdded, msg); > > I believe this could cause side effects There are two listeners: DebuggerPresentationModel and ResourceTreeModel, both add message to messages list and update corresponding source frame. I don't think there can be any side effects. 449803 5 vsevik 2011-08-11 08:50:42 -0700 Looks good to me now. 450325 6 103630 yurys 2011-08-11 23:57:52 -0700 Comment on attachment 103630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103630&action=review > Source/WebCore/inspector/front-end/SourceFrame.js:561 > + _updateMessageRepeatCount: function(rowMessage) I'd rather introduce RowMessage class and have this method on the new class, then have RowMessage listening to update events propagated by corresponding ConsoleMessage. What do you think? 450370 7 podivilov 2011-08-12 02:22:34 -0700 (In reply to comment #6) > (From update of attachment 103630 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103630&action=review > > > Source/WebCore/inspector/front-end/SourceFrame.js:561 > > + _updateMessageRepeatCount: function(rowMessage) > > I'd rather introduce RowMessage class and have this method on the new class, then have RowMessage listening to update events propagated by corresponding ConsoleMessage. What do you think? I think it's a good idea, but quite unrelated to this bug. Maybe we could do this as a separate change since it requires a bunch of additional changes in resources and console? 450439 8 podivilov 2011-08-12 08:35:00 -0700 Committed r92964: <http://trac.webkit.org/changeset/92964> 103597 2011-08-11 03:10:42 -0700 2011-08-11 08:34:04 -0700 Patch bug-57009-20110811141040.patch text/plain 5136 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNjg0NTA0OWI1ZGQzMTNl MzRhOTA2MjUyZmUzOTFlMGUwMTc5MzE5Li4zNjFmOTA1YTQ3MjgwMzE1ZmQ2ZDA4MTFiOTk3NGRj ZDA4MzUxZTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMTEgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogcHJvcGVybHkgdXBkYXRlIGNvbnNvbGUgbWVzc2FnZSBjb3VudCBpbiBzb3VyY2UgZnJh bWVzIGFuZCByZXNvdXJjZXMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NzAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3JlZ2lzdGVyQ29uc29s ZURvbWFpbkRpc3BhdGNoZXIuZGlzcGF0Y2hlci5tZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuYWRkTWVzc2FnZVRvU291cmNlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX3VwZGF0ZU1lc3NhZ2VSZXBl YXRDb3VudCk6CisKIDIwMTEtMDgtMTAgIExhcnMgS251ZHNlbiAgPGxhcnMua251ZHNlbkBub2tp YS5jb20+CiAKICAgICAgICAgQWRkIGRldmljZSBzcGVjaWZpYyBzZXR0aW5ncyB0byBzdXBwb3J0 IHZpZXdwb3J0IGNvbXB1dGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggOTc0Nzc1ODg3MmI2NmI2M2UwMDBmZGVkMGI4MjAw ODAxMzEzZjk0ZS4uMWY5NTM0OTFhNjQwOWZiNzg0ZGNmN2I2Y2U4MmJhOWY2OGQyOWMzMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3Lmpz CkBAIC0xNDIsNiArMTQyLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICAgICAgbXNnLnRvdGFsUmVwZWF0Q291bnQgPSBjb3VudDsKICAg ICAgICAgICAgICAgICAgICAgbXNnLl91cGRhdGVSZXBlYXRDb3VudCgpOwogICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLl9pbmNyZW1lbnRFcnJvcldhcm5pbmdDb3VudChtc2cpOworICAgICAg ICAgICAgICAgICAgICBjb25zb2xlLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcuRXZlbnRzLk1lc3NhZ2VBZGRlZCwgbXNnKTsKICAgICAgICAgICAgICAg ICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICB2YXIgbXNnQ29weSA9IG5ldyBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UobXNnLnNvdXJjZSwgbXNnLnR5cGUsIG1zZy5sZXZlbCwgbXNn LmxpbmUsIG1zZy51cmwsIGNvdW50IC0gcHJldlJlcGVhdENvdW50LCBtc2cuX21lc3NhZ2VUZXh0 LCBtc2cuX3BhcmFtZXRlcnMsIG1zZy5fc3RhY2tUcmFjZSwgbXNnLl9yZXF1ZXN0SWQpOwogICAg ICAgICAgICAgICAgICAgICBtc2dDb3B5LnRvdGFsUmVwZWF0Q291bnQgPSBjb3VudDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4 IDM0MGJjNzY3ZGRiOGE1NDM5Njg4Y2YxMjg4NmYwNTMzZmJiZTAxMWEuLmU0Njg5NjBhMjg1OWI0 NjgzZGEyNTZiOTFlNzI1ZjllYWZmYzc5MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtODIsNyArODIsNyBAQCBXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuVmll dy5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVsZW1lbnQpOwogCiAgICAgICAgIHRo aXMuX2Vuc3VyZUNvbnRlbnRMb2FkZWQoKTsKLSAgICAgICAgCisKICAgICAgICAgdGhpcy5yZXN0 b3JlU2Nyb2xsUG9zaXRpb25zKCk7CiAKICAgICAgICAgLy8gUmVzaXplIGFmdGVyIHNldHRpbmcg dGhlIGluaXRpYWwgc2Nyb2xsIHBvc2l0aW9ucyB0byBhdm9pZCB1bm5lY2Vzc2FyeSByZW5kZXJp bmcgd29yay4KQEAgLTQ0NywyMSArNDQ3LDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHJhbmdlczsKICAgICB9LAogCi0gICAgX2luY3Jl bWVudE1lc3NhZ2VSZXBlYXRDb3VudDogZnVuY3Rpb24obXNnLCByZXBlYXREZWx0YSkKLSAgICB7 Ci0gICAgICAgIGlmICghbXNnLl9yZXNvdXJjZU1lc3NhZ2VMaW5lRWxlbWVudCkKLSAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICBpZiAoIW1zZy5fcmVzb3VyY2VNZXNzYWdlUmVwZWF0Q291 bnRFbGVtZW50KSB7Ci0gICAgICAgICAgICB2YXIgcmVwZWF0ZWRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICAgICAgbXNnLl9yZXNvdXJjZU1lc3NhZ2VM aW5lRWxlbWVudC5hcHBlbmRDaGlsZChyZXBlYXRlZEVsZW1lbnQpOwotICAgICAgICAgICAgbXNn Ll9yZXNvdXJjZU1lc3NhZ2VSZXBlYXRDb3VudEVsZW1lbnQgPSByZXBlYXRlZEVsZW1lbnQ7Ci0g ICAgICAgIH0KLQotICAgICAgICBtc2cucmVwZWF0Q291bnQgKz0gcmVwZWF0RGVsdGE7Ci0gICAg ICAgIG1zZy5fcmVzb3VyY2VNZXNzYWdlUmVwZWF0Q291bnRFbGVtZW50LnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIgKHJlcGVhdGVkICVkIHRpbWVzKSIsIG1zZy5yZXBlYXRD b3VudCk7Ci0gICAgfSwKLQogICAgIHNldEV4ZWN1dGlvbkxpbmU6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIsIHNraXBSZXZlYWxMaW5lKQogICAgIHsKICAgICAgICAgdGhpcy5fZXhlY3V0aW9uTGluZU51 bWJlciA9IGxpbmVOdW1iZXI7CkBAIC01MzUsMTMgKzUyMCwxNSBAQCBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCByb3dNZXNzYWdlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgaWYgKHJvd01l c3NhZ2VzW2ldLmlzRXF1YWwobXNnKSkgewotICAgICAgICAgICAgICAgIHRoaXMuX2luY3JlbWVu dE1lc3NhZ2VSZXBlYXRDb3VudChyb3dNZXNzYWdlc1tpXSwgbXNnLnJlcGVhdERlbHRhKTsKKyAg ICAgICAgICAgIGlmIChyb3dNZXNzYWdlc1tpXS5jb25zb2xlTWVzc2FnZS5pc0VxdWFsKG1zZykp IHsKKyAgICAgICAgICAgICAgICByb3dNZXNzYWdlc1tpXS5yZXBlYXRDb3VudCArPSBtc2cucmVw ZWF0RGVsdGE7CisgICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlTWVzc2FnZVJlcGVhdENvdW50 KHJvd01lc3NhZ2VzW2ldKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KIAotICAgICAgICByb3dNZXNzYWdlcy5wdXNoKG1zZyk7CisgICAgICAgIHZh ciByb3dNZXNzYWdlID0geyBjb25zb2xlTWVzc2FnZTogbXNnIH07CisgICAgICAgIHJvd01lc3Nh Z2VzLnB1c2gocm93TWVzc2FnZSk7CiAKICAgICAgICAgdmFyIGltYWdlVVJMOwogICAgICAgICBz d2l0Y2ggKG1zZy5sZXZlbCkgewpAQCAtNTY2LDcgKzU1MywyMyBAQCBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBtZXNzYWdlTGluZUVsZW1lbnQuYXBwZW5k Q2hpbGQoaW1hZ2UpOwogICAgICAgICBtZXNzYWdlTGluZUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlVGV4dE5vZGUobXNnLm1lc3NhZ2UpKTsKIAotICAgICAgICBtc2cuX3Jlc291 cmNlTWVzc2FnZUxpbmVFbGVtZW50ID0gbWVzc2FnZUxpbmVFbGVtZW50OworICAgICAgICByb3dN ZXNzYWdlLmVsZW1lbnQgPSBtZXNzYWdlTGluZUVsZW1lbnQ7CisgICAgICAgIHJvd01lc3NhZ2Uu cmVwZWF0Q291bnQgPSBtc2cudG90YWxSZXBlYXRDb3VudDsKKyAgICAgICAgdGhpcy5fdXBkYXRl TWVzc2FnZVJlcGVhdENvdW50KHJvd01lc3NhZ2UpOworICAgIH0sCisKKyAgICBfdXBkYXRlTWVz c2FnZVJlcGVhdENvdW50OiBmdW5jdGlvbihyb3dNZXNzYWdlKQorICAgIHsKKyAgICAgICAgaWYg KHJvd01lc3NhZ2UucmVwZWF0Q291bnQgPCAyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgIGlmICghcm93TWVzc2FnZS5yZXBlYXRDb3VudEVsZW1lbnQpIHsKKyAgICAgICAgICAgIHZh ciByZXBlYXRDb3VudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Cisg ICAgICAgICAgICByb3dNZXNzYWdlLmVsZW1lbnQuYXBwZW5kQ2hpbGQocmVwZWF0Q291bnRFbGVt ZW50KTsKKyAgICAgICAgICAgIHJvd01lc3NhZ2UucmVwZWF0Q291bnRFbGVtZW50ID0gcmVwZWF0 Q291bnRFbGVtZW50OworICAgICAgICB9CisKKyAgICAgICAgcm93TWVzc2FnZS5yZXBlYXRDb3Vu dEVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiAocmVwZWF0ZWQg JWQgdGltZXMpIiwgcm93TWVzc2FnZS5yZXBlYXRDb3VudCk7CiAgICAgfSwKIAogICAgIGFkZEJy ZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIHJlc29sdmVkLCBjb25kaXRpb25hbCwgZW5h YmxlZCkK 103630 2011-08-11 08:34:12 -0700 2011-08-12 04:23:05 -0700 Patch bug-57009-20110811193410.patch text/plain 5219 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4MzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MTkwODRjMDJlYTRkYjNj NzE0MGU1YjEyN2ZhYjI4OGZiY2ZhZjYzLi4zNDM2NWQ0ZjRmNTcwZWQxYWE3MzRhZDI1ZThmYjM2 OTI0ODc5NzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTEtMDgtMTEgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogcHJvcGVybHkgdXBkYXRlIGNvbnNvbGUgbWVzc2FnZSBjb3VudCBpbiBzb3VyY2UgZnJh bWVzIGFuZCByZXNvdXJjZXMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NzAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3JlZ2lzdGVyQ29uc29s ZURvbWFpbkRpc3BhdGNoZXIuZGlzcGF0Y2hlci5tZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuYWRkTWVzc2FnZVRvU291cmNlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX3VwZGF0ZU1lc3NhZ2VSZXBl YXRDb3VudCk6CisKKzIwMTEtMDgtMTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJv bWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlIHNvdXJjZS1maWxlLXJlcGxh Y2VkIGluc3RlYWQgb2Ygc291cmNlLWZpbGUtY2hhbmdlZCBldmVudC4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTUxCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDk3NDc3NTg4 NzJiNjZiNjNlMDAwZmRlZDBiODIwMDgwMTMxM2Y5NGUuLjFmOTUzNDkxYTY0MDlmYjc4NGRjZjdi NmNlODJiYTlmNjhkMjljMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMTQyLDYgKzE0Miw3IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIG1zZy50b3RhbFJl cGVhdENvdW50ID0gY291bnQ7CiAgICAgICAgICAgICAgICAgICAgIG1zZy5fdXBkYXRlUmVwZWF0 Q291bnQoKTsKICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5faW5jcmVtZW50RXJyb3JXYXJu aW5nQ291bnQobXNnKTsKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZS5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LkV2ZW50cy5NZXNzYWdlQWRkZWQs IG1zZyk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgdmFy IG1zZ0NvcHkgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKG1zZy5zb3VyY2UsIG1z Zy50eXBlLCBtc2cubGV2ZWwsIG1zZy5saW5lLCBtc2cudXJsLCBjb3VudCAtIHByZXZSZXBlYXRD b3VudCwgbXNnLl9tZXNzYWdlVGV4dCwgbXNnLl9wYXJhbWV0ZXJzLCBtc2cuX3N0YWNrVHJhY2Us IG1zZy5fcmVxdWVzdElkKTsKICAgICAgICAgICAgICAgICAgICAgbXNnQ29weS50b3RhbFJlcGVh dENvdW50ID0gY291bnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcwppbmRleCAzNDBiYzc2N2RkYjhhNTQzOTY4OGNmMTI4ODZmMDUzM2Zi YmUwMTFhLi4xNjc2NDM1ZTk5MTE5N2VhNjVjYWU3OTdkMTNjNDM0ZTA5ZDkxODBlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAg LTgyLDcgKzgyLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAg ICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRF bGVtZW50KTsKIAogICAgICAgICB0aGlzLl9lbnN1cmVDb250ZW50TG9hZGVkKCk7Ci0gICAgICAg IAorCiAgICAgICAgIHRoaXMucmVzdG9yZVNjcm9sbFBvc2l0aW9ucygpOwogCiAgICAgICAgIC8v IFJlc2l6ZSBhZnRlciBzZXR0aW5nIHRoZSBpbml0aWFsIHNjcm9sbCBwb3NpdGlvbnMgdG8gYXZv aWQgdW5uZWNlc3NhcnkgcmVuZGVyaW5nIHdvcmsuCkBAIC00NDcsMjEgKzQ0Nyw2IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByYW5nZXM7 CiAgICAgfSwKIAotICAgIF9pbmNyZW1lbnRNZXNzYWdlUmVwZWF0Q291bnQ6IGZ1bmN0aW9uKG1z ZywgcmVwZWF0RGVsdGEpCi0gICAgewotICAgICAgICBpZiAoIW1zZy5fcmVzb3VyY2VNZXNzYWdl TGluZUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKCFtc2cuX3Jl c291cmNlTWVzc2FnZVJlcGVhdENvdW50RWxlbWVudCkgewotICAgICAgICAgICAgdmFyIHJlcGVh dGVkRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgICAg IG1zZy5fcmVzb3VyY2VNZXNzYWdlTGluZUVsZW1lbnQuYXBwZW5kQ2hpbGQocmVwZWF0ZWRFbGVt ZW50KTsKLSAgICAgICAgICAgIG1zZy5fcmVzb3VyY2VNZXNzYWdlUmVwZWF0Q291bnRFbGVtZW50 ID0gcmVwZWF0ZWRFbGVtZW50OwotICAgICAgICB9Ci0KLSAgICAgICAgbXNnLnJlcGVhdENvdW50 ICs9IHJlcGVhdERlbHRhOwotICAgICAgICBtc2cuX3Jlc291cmNlTWVzc2FnZVJlcGVhdENvdW50 RWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiIChyZXBlYXRlZCAl ZCB0aW1lcykiLCBtc2cucmVwZWF0Q291bnQpOwotICAgIH0sCi0KICAgICBzZXRFeGVjdXRpb25M aW5lOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBza2lwUmV2ZWFsTGluZSkKICAgICB7CiAgICAgICAg IHRoaXMuX2V4ZWN1dGlvbkxpbmVOdW1iZXIgPSBsaW5lTnVtYmVyOwpAQCAtNTM1LDEzICs1MjAs MTUgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQog CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcm93TWVzc2FnZXMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgIGlmIChyb3dNZXNzYWdlc1tpXS5pc0VxdWFsKG1zZykpIHsKLSAgICAgICAg ICAgICAgICB0aGlzLl9pbmNyZW1lbnRNZXNzYWdlUmVwZWF0Q291bnQocm93TWVzc2FnZXNbaV0s IG1zZy5yZXBlYXREZWx0YSk7CisgICAgICAgICAgICBpZiAocm93TWVzc2FnZXNbaV0uY29uc29s ZU1lc3NhZ2UuaXNFcXVhbChtc2cpKSB7CisgICAgICAgICAgICAgICAgcm93TWVzc2FnZXNbaV0u cmVwZWF0Q291bnQgPSBtc2cudG90YWxSZXBlYXRDb3VudDsKKyAgICAgICAgICAgICAgICB0aGlz Ll91cGRhdGVNZXNzYWdlUmVwZWF0Q291bnQocm93TWVzc2FnZXNbaV0pOwogICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHJvd01lc3Nh Z2VzLnB1c2gobXNnKTsKKyAgICAgICAgdmFyIHJvd01lc3NhZ2UgPSB7IGNvbnNvbGVNZXNzYWdl OiBtc2cgfTsKKyAgICAgICAgcm93TWVzc2FnZXMucHVzaChyb3dNZXNzYWdlKTsKIAogICAgICAg ICB2YXIgaW1hZ2VVUkw7CiAgICAgICAgIHN3aXRjaCAobXNnLmxldmVsKSB7CkBAIC01NjYsNyAr NTUzLDIzIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IG1lc3NhZ2VMaW5lRWxlbWVudC5hcHBlbmRDaGlsZChpbWFnZSk7CiAgICAgICAgIG1lc3NhZ2VM aW5lRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtc2cubWVzc2Fn ZSkpOwogCi0gICAgICAgIG1zZy5fcmVzb3VyY2VNZXNzYWdlTGluZUVsZW1lbnQgPSBtZXNzYWdl TGluZUVsZW1lbnQ7CisgICAgICAgIHJvd01lc3NhZ2UuZWxlbWVudCA9IG1lc3NhZ2VMaW5lRWxl bWVudDsKKyAgICAgICAgcm93TWVzc2FnZS5yZXBlYXRDb3VudCA9IG1zZy50b3RhbFJlcGVhdENv dW50OworICAgICAgICB0aGlzLl91cGRhdGVNZXNzYWdlUmVwZWF0Q291bnQocm93TWVzc2FnZSk7 CisgICAgfSwKKworICAgIF91cGRhdGVNZXNzYWdlUmVwZWF0Q291bnQ6IGZ1bmN0aW9uKHJvd01l c3NhZ2UpCisgICAgeworICAgICAgICBpZiAocm93TWVzc2FnZS5yZXBlYXRDb3VudCA8IDIpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKCFyb3dNZXNzYWdlLnJlcGVhdENvdW50 RWxlbWVudCkgeworICAgICAgICAgICAgdmFyIHJlcGVhdENvdW50RWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICAgICAgICAgIHJvd01lc3NhZ2UuZWxlbWVudC5h cHBlbmRDaGlsZChyZXBlYXRDb3VudEVsZW1lbnQpOworICAgICAgICAgICAgcm93TWVzc2FnZS5y ZXBlYXRDb3VudEVsZW1lbnQgPSByZXBlYXRDb3VudEVsZW1lbnQ7CisgICAgICAgIH0KKworICAg ICAgICByb3dNZXNzYWdlLnJlcGVhdENvdW50RWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiIChyZXBlYXRlZCAlZCB0aW1lcykiLCByb3dNZXNzYWdlLnJlcGVhdENv dW50KTsKICAgICB9LAogCiAgICAgYWRkQnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwg cmVzb2x2ZWQsIGNvbmRpdGlvbmFsLCBlbmFibGVkKQo=