61040 2011-05-18 04:52:29 -0700 Web Inspector: initial showing of heap snapshot doesn't provide any feedback on waiting time 2011-05-23 00:52:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo mnaganov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 405646 0 loislo 2011-05-18 04:52:29 -0700 there are 4 stages of making detailed heap snapshot. 1) snapshoting 2) loading... 3) parsing... 4) a stage between parsing and the moment when snapshot items appear in the list. it'd be nice to have a text for the fourth stage and a kind of progress indicator for all the stages. 407111 1 94224 mnaganov 2011-05-20 08:34:20 -0700 Created attachment 94224 patch 407131 2 94224 yurys 2011-05-20 08:55:30 -0700 Comment on attachment 94224 patch View in context: https://bugs.webkit.org/attachment.cgi?id=94224&action=review > Source/WebCore/inspector/front-end/PleaseWaitMessage.js:93 > + if (action) The action will not be called if the message is already visible. r- for this. 407266 3 94258 mnaganov 2011-05-20 12:19:45 -0700 Created attachment 94258 comment addressed 407267 4 mnaganov 2011-05-20 12:20:10 -0700 (In reply to comment #2) > (From update of attachment 94224 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94224&action=review > > > Source/WebCore/inspector/front-end/PleaseWaitMessage.js:93 > > + if (action) > > The action will not be called if the message is already visible. r- for this. Really good catch! Fixed. 407789 5 94258 yurys 2011-05-23 00:21:41 -0700 Comment on attachment 94258 comment addressed View in context: https://bugs.webkit.org/attachment.cgi?id=94258&action=review > Source/WebCore/inspector/front-end/PleaseWaitMessage.js:90 > + listenObject.addEventListener(listenEvent, WebInspector.PleaseWaitMessage.prototype.unlistenAndHide.bind(instance, listenObject, listenEvent), instance); Why no use a shorter notation: instance.unlistenAndHide.bind(instance, listenObject, listenEvent)? Also, you don't need to pass instance as the third parameter since you pass it in bind. 407790 6 94258 mnaganov 2011-05-23 00:46:40 -0700 Comment on attachment 94258 comment addressed View in context: https://bugs.webkit.org/attachment.cgi?id=94258&action=review >> Source/WebCore/inspector/front-end/PleaseWaitMessage.js:90 >> + listenObject.addEventListener(listenEvent, WebInspector.PleaseWaitMessage.prototype.unlistenAndHide.bind(instance, listenObject, listenEvent), instance); > > Why no use a shorter notation: instance.unlistenAndHide.bind(instance, listenObject, listenEvent)? Also, you don't need to pass instance as the third parameter since you pass it in bind. Fixed. The third parameter is used by Object.addEventListener / removeEventListener pair of functions to identify the listener, as they can't extract the event handler from the closure passed. 407793 7 mnaganov 2011-05-23 00:52:14 -0700 Manually committed http://trac.webkit.org/changeset/87056 2011-05-23 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Yury Semikhatsky. Web Inspector: [Chromium] Show "Please wait" message during initial heap snapshot processing. https://bugs.webkit.org/show_bug.cgi?id=61040 * inspector/front-end/DetailedHeapshotView.js: (WebInspector.HeapSnapshotSortableDataGrid.prototype.sortingChanged.sort): (WebInspector.HeapSnapshotSortableDataGrid.prototype.sortingChanged): (WebInspector.DetailedHeapshotView.profileCallback): (WebInspector.DetailedHeapshotView.setDataSource): (WebInspector.DetailedHeapshotView): (WebInspector.DetailedHeapshotView.prototype._changeBase.baseProfileLoaded): (WebInspector.DetailedHeapshotView.prototype._changeBase.setDataSource): (WebInspector.DetailedHeapshotView.prototype._changeBase): (WebInspector.DetailedHeapshotView.prototype._changeView.setDataSource): (WebInspector.DetailedHeapshotView.prototype._changeView): * inspector/front-end/PleaseWaitMessage.js: (WebInspector.PleaseWaitMessage.prototype.showAndWaitFor): 94224 2011-05-20 08:34:20 -0700 2011-05-20 12:19:45 -0700 patch patch-61040 text/plain 5392 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3OWNlYjE3Li4zZmM5YjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDUtMjAgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbQ2hyb21pdW1dIFNob3cgIlBsZWFzZSB3YWl0IiBtZXNzYWdlIGR1cmluZyBpbml0 aWFsCisgICAgICAgIGhlYXAgc25hcHNob3QgcHJvY2Vzc2luZy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMDQwCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLnNvcnRpbmdDaGFuZ2Vk LnNvcnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdy aWQucHJvdG90eXBlLnNvcnRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRh aWxlZEhlYXBzaG90Vmlldy5wcm9maWxlQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRldGFpbGVkSGVhcHNob3RWaWV3LnNldERhdGFTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRldGFpbGVkSGVhcHNob3RWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxl ZEhlYXBzaG90Vmlldy5wcm90b3R5cGUuX2NoYW5nZUJhc2UuYmFzZVByb2ZpbGVMb2FkZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZS5fY2hh bmdlQmFzZS5zZXREYXRhU291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhl YXBzaG90Vmlldy5wcm90b3R5cGUuX2NoYW5nZUJhc2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZS5fY2hhbmdlVmlldy5zZXREYXRhU291cmNl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUu X2NoYW5nZVZpZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUGxlYXNlV2FpdE1l c3NhZ2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90 eXBlLnNob3dBbmRXYWl0Rm9yKToKKwogMjAxMS0wNS0yMCAgVG9uaXMgVGlpZ2kgIDx0b25pc3Rp aWdpQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBz aG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRI ZWFwc2hvdFZpZXcuanMKaW5kZXggZTdkNTVkYi4uMzljNTk2OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3 LmpzCkBAIC03NCwxMiArNzQsMTEgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxl RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAg ICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUu c2hvd0FuZFdhaXRGb3IodGhpcy5lbGVtZW50LCB0aGlzLCAic29ydGluZyBjb21wbGV0ZSIpOwor ICAgICAgICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90eXBlLnNob3dBbmRX YWl0Rm9yKHRoaXMuZWxlbWVudCwgdGhpcywgInNvcnRpbmcgY29tcGxldGUiLCBzb3J0LmJpbmQo dGhpcykpOwogICAgICAgICBmdW5jdGlvbiBzb3J0KCkKICAgICAgICAgewogICAgICAgICAgICAg dGhpcy5fcGVyZm9ybVNvcnRpbmcoU29ydEJ5VHdvRmllbGRzKTsKICAgICAgICAgfQotICAgICAg ICBzZXRUaW1lb3V0KHNvcnQuYmluZCh0aGlzKSwgMCk7CiAgICAgfSwKIAogICAgIF9wZXJmb3Jt U29ydGluZzogZnVuY3Rpb24oc29ydEZ1bmN0aW9uKQpAQCAtNjA1LDYgKzYwNCwxMSBAQCBXZWJJ bnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihwYXJlbnQsIHByb2ZpbGUp CiAgICAgICAgICAgICB0aGlzLmJhc2VTZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXggPSBwcm9m aWxlSW5kZXggLSAxOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlzLmJhc2VTZWxlY3RF bGVtZW50LnNlbGVjdGVkSW5kZXggPSBwcm9maWxlSW5kZXg7CisgICAgICAgIFdlYkluc3BlY3Rv ci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50 Vmlldy5lbGVtZW50LCB0aGlzLmRhdGFHcmlkLCAic29ydGluZyBjb21wbGV0ZSIsIHNldERhdGFT b3VyY2UuYmluZCh0aGlzKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc2V0RGF0YVNvdXJjZSgp CisgICAgewogICAgICAgICB0aGlzLmRhdGFHcmlkLnNldERhdGFTb3VyY2UodGhpcywgdGhpcy5w cm9maWxlV3JhcHBlcik7IAogICAgICAgICB0aGlzLl91cGRhdGVQZXJjZW50QnV0dG9uKCk7CiAg ICAgfQpAQCAtODM5LDcgKzg0MywxMSBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZp ZXcucHJvdG90eXBlID0gewogICAgICAgICB7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fYmFz ZVByb2ZpbGVXcmFwcGVyOwogICAgICAgICAgICAgdGhpcy5iYXNlUHJvZmlsZS5fbGFzdFNob3du ID0gRGF0ZS5ub3coKTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2Fn ZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50Vmlldy5lbGVtZW50LCB0aGlz LmRpZmZEYXRhR3JpZCwgInNvcnRpbmcgY29tcGxldGUiKTsKKyAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJy ZW50Vmlldy5lbGVtZW50LCB0aGlzLmRpZmZEYXRhR3JpZCwgInNvcnRpbmcgY29tcGxldGUiLCBz ZXREYXRhU291cmNlLmJpbmQodGhpcykpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24g c2V0RGF0YVNvdXJjZSgpCisgICAgICAgIHsKICAgICAgICAgICAgIHRoaXMuZGlmZkRhdGFHcmlk LnNldEJhc2VEYXRhU291cmNlKHRoaXMuYmFzZVByb2ZpbGVXcmFwcGVyKTsKICAgICAgICAgfQog CkBAIC05NTksMTIgKzk2NywxNiBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcu cHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgdGhpcy5iYXNlU2VsZWN0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAg ICAgICAgIGlmICghdGhpcy5kYXRhR3JpZC5zbmFwc2hvdFZpZXcpIHsKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90eXBlLnNob3dBbmRXYWl0Rm9y KHRoaXMuY3VycmVudFZpZXcuZWxlbWVudCwgdGhpcy5kYXRhR3JpZCwgInNvcnRpbmcgY29tcGxl dGUiKTsKLSAgICAgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLnNldERhdGFTb3VyY2UodGhpcywg dGhpcy5wcm9maWxlV3JhcHBlcik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIXRo aXMuZGF0YUdyaWQuc25hcHNob3RWaWV3KQorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Q bGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50Vmll dy5lbGVtZW50LCB0aGlzLmRhdGFHcmlkLCAic29ydGluZyBjb21wbGV0ZSIsIHNldERhdGFTb3Vy Y2UuYmluZCh0aGlzKSk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBzZXREYXRhU291 cmNlKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5zZXREYXRhU291cmNl KHRoaXMsIHRoaXMucHJvZmlsZVdyYXBwZXIpOwogICAgICAgICB9CiAKKwogICAgICAgICBpZiAo IXRoaXMuY3VycmVudFF1ZXJ5IHx8ICF0aGlzLl9zZWFyY2hGaW5pc2hlZENhbGxiYWNrIHx8ICF0 aGlzLl9zZWFyY2hSZXN1bHRzKQogICAgICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BsZWFzZVdhaXRNZXNzYWdlLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QbGVhc2VXYWl0TWVzc2FnZS5qcwpp bmRleCA4NGNkYTE5Li40MDNiMjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1BsZWFzZVdhaXRNZXNzYWdlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUGxlYXNlV2FpdE1lc3NhZ2UuanMKQEAgLTgxLDcgKzgxLDcgQEAg V2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxl bWVudC5hcHBlbmRDaGlsZChtZXNzYWdlKTsKICAgICB9LAogCi0gICAgc2hvd0FuZFdhaXRGb3I6 IGZ1bmN0aW9uKGVsZW1lbnQsIGxpc3Rlbk9iamVjdCwgbGlzdGVuRXZlbnQpCisgICAgc2hvd0Fu ZFdhaXRGb3I6IGZ1bmN0aW9uKGVsZW1lbnQsIGxpc3Rlbk9iamVjdCwgbGlzdGVuRXZlbnQsIGFj dGlvbikKICAgICB7CiAgICAgICAgIHZhciBpbnN0YW5jZSA9IFdlYkluc3BlY3Rvci5QbGVhc2VX YWl0TWVzc2FnZS5wcm90b3R5cGUuaW5zdGFuY2U7CiAgICAgICAgIHZhciBtZXNzYWdlID0gaW5z dGFuY2UuZWxlbWVudDsKQEAgLTkwLDYgKzkwLDggQEAgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRN ZXNzYWdlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBsaXN0ZW5PYmplY3QuYWRkRXZlbnRMaXN0 ZW5lcihsaXN0ZW5FdmVudCwgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnByb3RvdHlw ZS51bmxpc3RlbkFuZEhpZGUuYmluZChpbnN0YW5jZSwgbGlzdGVuT2JqZWN0LCBsaXN0ZW5FdmVu dCksIGluc3RhbmNlKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnBy b3RvdHlwZS5zaG93KGVsZW1lbnQpOworICAgICAgICBpZiAoYWN0aW9uKQorICAgICAgICAgICAg c2V0VGltZW91dChhY3Rpb24sIDApOwogICAgIH0sCiAKICAgICB1bmxpc3RlbkFuZEhpZGU6IGZ1 bmN0aW9uKGxpc3Rlbk9iamVjdCwgbGlzdGVuRXZlbnQpCg== 94258 2011-05-20 12:19:45 -0700 2011-05-23 00:46:40 -0700 comment addressed patch-61040 text/plain 5746 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3OWNlYjE3Li4zZmM5YjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDUtMjAgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbQ2hyb21pdW1dIFNob3cgIlBsZWFzZSB3YWl0IiBtZXNzYWdlIGR1cmluZyBpbml0 aWFsCisgICAgICAgIGhlYXAgc25hcHNob3QgcHJvY2Vzc2luZy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMDQwCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLnNvcnRpbmdDaGFuZ2Vk LnNvcnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdy aWQucHJvdG90eXBlLnNvcnRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRh aWxlZEhlYXBzaG90Vmlldy5wcm9maWxlQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRldGFpbGVkSGVhcHNob3RWaWV3LnNldERhdGFTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRldGFpbGVkSGVhcHNob3RWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxl ZEhlYXBzaG90Vmlldy5wcm90b3R5cGUuX2NoYW5nZUJhc2UuYmFzZVByb2ZpbGVMb2FkZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZS5fY2hh bmdlQmFzZS5zZXREYXRhU291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhl YXBzaG90Vmlldy5wcm90b3R5cGUuX2NoYW5nZUJhc2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZS5fY2hhbmdlVmlldy5zZXREYXRhU291cmNl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUu X2NoYW5nZVZpZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUGxlYXNlV2FpdE1l c3NhZ2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90 eXBlLnNob3dBbmRXYWl0Rm9yKToKKwogMjAxMS0wNS0yMCAgVG9uaXMgVGlpZ2kgIDx0b25pc3Rp aWdpQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBz aG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRI ZWFwc2hvdFZpZXcuanMKaW5kZXggZTdkNTVkYi4uMzljNTk2OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3 LmpzCkBAIC03NCwxMiArNzQsMTEgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxl RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAg ICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUu c2hvd0FuZFdhaXRGb3IodGhpcy5lbGVtZW50LCB0aGlzLCAic29ydGluZyBjb21wbGV0ZSIpOwor ICAgICAgICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90eXBlLnNob3dBbmRX YWl0Rm9yKHRoaXMuZWxlbWVudCwgdGhpcywgInNvcnRpbmcgY29tcGxldGUiLCBzb3J0LmJpbmQo dGhpcykpOwogICAgICAgICBmdW5jdGlvbiBzb3J0KCkKICAgICAgICAgewogICAgICAgICAgICAg dGhpcy5fcGVyZm9ybVNvcnRpbmcoU29ydEJ5VHdvRmllbGRzKTsKICAgICAgICAgfQotICAgICAg ICBzZXRUaW1lb3V0KHNvcnQuYmluZCh0aGlzKSwgMCk7CiAgICAgfSwKIAogICAgIF9wZXJmb3Jt U29ydGluZzogZnVuY3Rpb24oc29ydEZ1bmN0aW9uKQpAQCAtNjA1LDYgKzYwNCwxMSBAQCBXZWJJ bnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihwYXJlbnQsIHByb2ZpbGUp CiAgICAgICAgICAgICB0aGlzLmJhc2VTZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXggPSBwcm9m aWxlSW5kZXggLSAxOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlzLmJhc2VTZWxlY3RF bGVtZW50LnNlbGVjdGVkSW5kZXggPSBwcm9maWxlSW5kZXg7CisgICAgICAgIFdlYkluc3BlY3Rv ci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50 Vmlldy5lbGVtZW50LCB0aGlzLmRhdGFHcmlkLCAic29ydGluZyBjb21wbGV0ZSIsIHNldERhdGFT b3VyY2UuYmluZCh0aGlzKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc2V0RGF0YVNvdXJjZSgp CisgICAgewogICAgICAgICB0aGlzLmRhdGFHcmlkLnNldERhdGFTb3VyY2UodGhpcywgdGhpcy5w cm9maWxlV3JhcHBlcik7IAogICAgICAgICB0aGlzLl91cGRhdGVQZXJjZW50QnV0dG9uKCk7CiAg ICAgfQpAQCAtODM5LDcgKzg0MywxMSBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZp ZXcucHJvdG90eXBlID0gewogICAgICAgICB7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fYmFz ZVByb2ZpbGVXcmFwcGVyOwogICAgICAgICAgICAgdGhpcy5iYXNlUHJvZmlsZS5fbGFzdFNob3du ID0gRGF0ZS5ub3coKTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2Fn ZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50Vmlldy5lbGVtZW50LCB0aGlz LmRpZmZEYXRhR3JpZCwgInNvcnRpbmcgY29tcGxldGUiKTsKKyAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJy ZW50Vmlldy5lbGVtZW50LCB0aGlzLmRpZmZEYXRhR3JpZCwgInNvcnRpbmcgY29tcGxldGUiLCBz ZXREYXRhU291cmNlLmJpbmQodGhpcykpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24g c2V0RGF0YVNvdXJjZSgpCisgICAgICAgIHsKICAgICAgICAgICAgIHRoaXMuZGlmZkRhdGFHcmlk LnNldEJhc2VEYXRhU291cmNlKHRoaXMuYmFzZVByb2ZpbGVXcmFwcGVyKTsKICAgICAgICAgfQog CkBAIC05NTksMTIgKzk2NywxNiBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcu cHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgdGhpcy5iYXNlU2VsZWN0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAg ICAgICAgIGlmICghdGhpcy5kYXRhR3JpZC5zbmFwc2hvdFZpZXcpIHsKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90eXBlLnNob3dBbmRXYWl0Rm9y KHRoaXMuY3VycmVudFZpZXcuZWxlbWVudCwgdGhpcy5kYXRhR3JpZCwgInNvcnRpbmcgY29tcGxl dGUiKTsKLSAgICAgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLnNldERhdGFTb3VyY2UodGhpcywg dGhpcy5wcm9maWxlV3JhcHBlcik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIXRo aXMuZGF0YUdyaWQuc25hcHNob3RWaWV3KQorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Q bGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0FuZFdhaXRGb3IodGhpcy5jdXJyZW50Vmll dy5lbGVtZW50LCB0aGlzLmRhdGFHcmlkLCAic29ydGluZyBjb21wbGV0ZSIsIHNldERhdGFTb3Vy Y2UuYmluZCh0aGlzKSk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBzZXREYXRhU291 cmNlKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5zZXREYXRhU291cmNl KHRoaXMsIHRoaXMucHJvZmlsZVdyYXBwZXIpOwogICAgICAgICB9CiAKKwogICAgICAgICBpZiAo IXRoaXMuY3VycmVudFF1ZXJ5IHx8ICF0aGlzLl9zZWFyY2hGaW5pc2hlZENhbGxiYWNrIHx8ICF0 aGlzLl9zZWFyY2hSZXN1bHRzKQogICAgICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BsZWFzZVdhaXRNZXNzYWdlLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QbGVhc2VXYWl0TWVzc2FnZS5qcwpp bmRleCA4NGNkYTE5Li5jNGUyMzAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1BsZWFzZVdhaXRNZXNzYWdlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUGxlYXNlV2FpdE1lc3NhZ2UuanMKQEAgLTgxLDE1ICs4MSwxNyBA QCBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJvdG90eXBlID0gewogICAgICAgICBl bGVtZW50LmFwcGVuZENoaWxkKG1lc3NhZ2UpOwogICAgIH0sCiAKLSAgICBzaG93QW5kV2FpdEZv cjogZnVuY3Rpb24oZWxlbWVudCwgbGlzdGVuT2JqZWN0LCBsaXN0ZW5FdmVudCkKKyAgICBzaG93 QW5kV2FpdEZvcjogZnVuY3Rpb24oZWxlbWVudCwgbGlzdGVuT2JqZWN0LCBsaXN0ZW5FdmVudCwg YWN0aW9uKQogICAgIHsKICAgICAgICAgdmFyIGluc3RhbmNlID0gV2ViSW5zcGVjdG9yLlBsZWFz ZVdhaXRNZXNzYWdlLnByb3RvdHlwZS5pbnN0YW5jZTsKICAgICAgICAgdmFyIG1lc3NhZ2UgPSBp bnN0YW5jZS5lbGVtZW50OwotICAgICAgICBpZiAobWVzc2FnZS5wYXJlbnROb2RlID09PSBlbGVt ZW50KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGxpc3Rlbk9iamVjdC5hZGRFdmVu dExpc3RlbmVyKGxpc3RlbkV2ZW50LCBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2UucHJv dG90eXBlLnVubGlzdGVuQW5kSGlkZS5iaW5kKGluc3RhbmNlLCBsaXN0ZW5PYmplY3QsIGxpc3Rl bkV2ZW50KSwgaW5zdGFuY2UpOwotICAgICAgICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3Nh Z2UucHJvdG90eXBlLnNob3coZWxlbWVudCk7CisgICAgICAgIGlmIChtZXNzYWdlLnBhcmVudE5v ZGUgIT09IGVsZW1lbnQpIHsKKyAgICAgICAgICAgIC8vIElmIG5vdCBhbHJlYWR5IHNob3duIGZv ciB0aGlzIGVsZW1lbnQuCisgICAgICAgICAgICBsaXN0ZW5PYmplY3QuYWRkRXZlbnRMaXN0ZW5l cihsaXN0ZW5FdmVudCwgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnByb3RvdHlwZS51 bmxpc3RlbkFuZEhpZGUuYmluZChpbnN0YW5jZSwgbGlzdGVuT2JqZWN0LCBsaXN0ZW5FdmVudCks IGluc3RhbmNlKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5w cm90b3R5cGUuc2hvdyhlbGVtZW50KTsKKyAgICAgICAgfQorICAgICAgICBpZiAoYWN0aW9uKQor ICAgICAgICAgICAgc2V0VGltZW91dChhY3Rpb24sIDApOwogICAgIH0sCiAKICAgICB1bmxpc3Rl bkFuZEhpZGU6IGZ1bmN0aW9uKGxpc3Rlbk9iamVjdCwgbGlzdGVuRXZlbnQpCg==