59592 2011-04-27 02:54:18 -0700 Web Inspector: [Chromium] Implement retaining path following 2011-04-28 08:56:40 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mnaganov mnaganov abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 393464 0 mnaganov 2011-04-27 02:54:18 -0700 When retained paths are displayed, it would be convenient to be able to follow the path in the "Containment" view to look for object neighborhood. 393465 1 91259 mnaganov 2011-04-27 02:57:23 -0700 Created attachment 91259 patch 394426 2 mnaganov 2011-04-28 08:00:20 -0700 Manually committed http://trac.webkit.org/changeset/85183 2011-04-28 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Yury Semikhatsky. WebInspector: [Chromium] Implement retaining paths following in detailed heap snapshots. https://bugs.webkit.org/show_bug.cgi?id=59592 * inspector/front-end/DetailedHeapshotGridNodes.js: (WebInspector.HeapSnapshotGridNode.prototype._populate): (WebInspector.HeapSnapshotGridNode.prototype.populateChildren.childrenRetrieved): (WebInspector.HeapSnapshotGridNode.prototype.populateChildren.callSerialize): (WebInspector.HeapSnapshotGridNode.prototype.populateChildren): * inspector/front-end/DetailedHeapshotView.js: (WebInspector.HeapSnapshotContainmentDataGrid.prototype._defaultPopulateCount.100.expandRoute.nextStep.else.afterExpand): (WebInspector.HeapSnapshotContainmentDataGrid.prototype._defaultPopulateCount.100.expandRoute): (WebInspector.HeapSnapshotRetainingPathsList.prototype.showNext.pathFound): (WebInspector.DetailedHeapshotView.prototype._mouseClickInRetainmentGrid.expandRoute): (WebInspector.DetailedHeapshotView.prototype._mouseClickInRetainmentGrid): (WebInspector.DetailedHeapshotView.prototype.changeView.sortingComplete): (WebInspector.DetailedHeapshotView.prototype.changeView): * inspector/front-end/HeapSnapshot.js: (WebInspector.HeapSnapshotPathFinder.prototype.findNext): (WebInspector.HeapSnapshotPathFinder.prototype._nextEdgeIter): (WebInspector.HeapSnapshotPathFinder.prototype._buildNextPath): (WebInspector.HeapSnapshotPathFinder.prototype._pathToString): (WebInspector.HeapSnapshotPathFinder.prototype._pathToRoute): * inspector/front-end/heapProfiler.css: (div.retaining-paths-view td.path-column div:hover): 2011-04-28 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Yury Semikhatsky. WebInspector: [Chromium] Implement retaining paths following in detailed heap snapshots. https://bugs.webkit.org/show_bug.cgi?id=59592 * inspector/profiler/detailed-heapshots-test.js: (initialize_DetailedHeapshotTest): 394454 3 webkit.review.bot 2011-04-28 08:56:40 -0700 http://trac.webkit.org/changeset/85183 might have broken Qt Linux Release The following tests are not passing: http/tests/inspector/resource-tree/resource-tree-frame-add.html http/tests/inspector/resource-tree/resource-tree-frame-navigate.html http/tests/inspector/resource-tree/resource-tree-reload.html 91259 2011-04-27 02:57:23 -0700 2011-04-28 07:37:42 -0700 patch patch-59592 text/plain 12983 mnaganov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxMmU0OWRiLi45ZDI5ZTAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQt MjcgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJJbnNwZWN0b3I6IFtDaHJv bWl1bV0gSW1wbGVtZW50IHJldGFpbmluZyBwYXRocyBmb2xsb3dpbmcgaW4gZGV0YWlsZWQgaGVh cCBzbmFwc2hvdHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01OTU5MgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2RldGFpbGVkLWhlYXBz aG90cy10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9EZXRhaWxlZEhlYXBzaG90VGVzdCk6 CisKIDIwMTEtMDQtMjYgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgZXhwZWN0YXRpb25zIGNoYW5nZS4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9kZXRhaWxlZC1oZWFwc2hvdHMtdGVzdC5qcyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9kZXRhaWxlZC1oZWFwc2hvdHMtdGVzdC5qcwpp bmRleCAxZjBiMThmYy4uNTJhYTA1ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3Byb2ZpbGVyL2RldGFpbGVkLWhlYXBzaG90cy10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wcm9maWxlci9kZXRhaWxlZC1oZWFwc2hvdHMtdGVzdC5qcwpAQCAtMzU0LDI1ICsz NTQsNyBAQCBJbnNwZWN0b3JUZXN0LnN3aXRjaFRvVmlldyA9IGZ1bmN0aW9uKHRpdGxlLCBjYWxs YmFjaykKIHsKICAgICBjYWxsYmFjayA9IEluc3BlY3RvclRlc3Quc2FmZVdyYXAoY2FsbGJhY2sp OwogICAgIHZhciB2aWV3ID0gV2ViSW5zcGVjdG9yLnBhbmVscy5wcm9maWxlcy52aXNpYmxlVmll dzsKLSAgICB2YXIgaW5kZXggPSAtMTsKLSAgICBmb3IgKHZhciBpID0gMDsgaSA8IHZpZXcudmll d3MubGVuZ3RoOyArK2kpCi0gICAgICAgIGlmICh2aWV3LnZpZXdzW2ldLnRpdGxlID09PSB0aXRs ZSkgewotICAgICAgICAgICAgaW5kZXggPSBpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IH0KLSAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscyh0cnVlLCBpbmRleCA+PSAwLCAiVmll dyBub3QgZm91bmQ6ICIgKyB0aXRsZSk7Ci0gICAgaWYgKHZpZXcudmlld3MuY3VycmVudCA9PT0g aW5kZXgpIHsKLSAgICAgICAgc2V0VGltZW91dChjYWxsYmFjaywgMCk7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9Ci0gICAgdmFyIGdyaWQgPSB2aWV3LnZpZXdzW2luZGV4XS5ncmlkOwotICAgIGZ1 bmN0aW9uIHNvcnRpbmdDb21wbGV0ZSgpCi0gICAgewotICAgICAgICBncmlkLnJlbW92ZUV2ZW50 TGlzdGVuZXIoInNvcnRpbmcgY29tcGxldGUiLCBzb3J0aW5nQ29tcGxldGUsIHRoaXMpOwotICAg ICAgICBzZXRUaW1lb3V0KGNhbGxiYWNrLCAwKTsKLSAgICB9Ci0gICAgdmlldy52aWV3c1tpbmRl eF0uZ3JpZC5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5nIGNvbXBsZXRlIiwgc29ydGluZ0NvbXBs ZXRlLCB0aGlzKTsKLSAgICB2aWV3Ll9jaGFuZ2VWaWV3KHt0YXJnZXQ6IHtzZWxlY3RlZEluZGV4 OiBpbmRleH19KTsKKyAgICB2aWV3LmNoYW5nZVZpZXcodGl0bGUsIGNhbGxiYWNrKTsKIH07CiAK IEluc3BlY3RvclRlc3QudGFrZUFuZE9wZW5TbmFwc2hvdCA9IGZ1bmN0aW9uKGdlbmVyYXRvciwg Y2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkxODdlYy4uZWNmNDg2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMyIEBACisyMDExLTA0LTI3ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2ViSW5zcGVjdG9yOiBbQ2hyb21pdW1dIEltcGxlbWVudCByZXRhaW5pbmcgcGF0aHMgZm9s bG93aW5nIGluIGRldGFpbGVkIGhlYXAgc25hcHNob3RzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk1OTIKKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUuX3BvcHVsYXRlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUucG9wdWxhdGVDaGls ZHJlbi5jaGlsZHJlblJldHJpZXZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90R3JpZE5vZGUucHJvdG90eXBlLnBvcHVsYXRlQ2hpbGRyZW4uY2FsbFNlcmlhbGl6ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlLnBvcHVs YXRlQ2hpbGRyZW4pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFw c2hvdFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29udGFpbm1l bnREYXRhR3JpZC5wcm90b3R5cGUuX2RlZmF1bHRQb3B1bGF0ZUNvdW50LjEwMC5leHBhbmRSb3V0 ZS5uZXh0U3RlcC5lbHNlLmFmdGVyRXhwYW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RDb250YWlubWVudERhdGFHcmlkLnByb3RvdHlwZS5fZGVmYXVsdFBvcHVsYXRlQ291 bnQuMTAwLmV4cGFuZFJvdXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RS ZXRhaW5pbmdQYXRoc0xpc3QucHJvdG90eXBlLnNob3dOZXh0LnBhdGhGb3VuZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLl9tb3VzZUNsaWNr SW5SZXRhaW5tZW50R3JpZC5leHBhbmRSb3V0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGV0 YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLl9tb3VzZUNsaWNrSW5SZXRhaW5tZW50R3JpZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLmNo YW5nZVZpZXcuc29ydGluZ0NvbXBsZXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxl ZEhlYXBzaG90Vmlldy5wcm90b3R5cGUuY2hhbmdlVmlldyk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9IZWFwU25hcHNob3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90UGF0aEZpbmRlci5wcm90b3R5cGUuZmluZE5leHQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFBhdGhGaW5kZXIucHJvdG90eXBlLl9uZXh0RWRnZUl0ZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBhdGhGaW5kZXIucHJvdG90eXBlLl9idWls ZE5leHRQYXRoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmluZGVy LnByb3RvdHlwZS5fcGF0aFRvU3RyaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RQYXRoRmluZGVyLnByb3RvdHlwZS5fcGF0aFRvUm91dGUpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaGVhcFByb2ZpbGVyLmNzczoKKyAgICAgICAgKGRpdi5yZXRhaW5pbmct cGF0aHMtdmlldyB0ZC5wYXRoLWNvbHVtbiBkaXY6aG92ZXIpOgorCiAyMDExLTA0LTI2ICBKdXN0 aW4gTm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBL ZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMKaW5kZXggZTQ0ZGYy OC4uNWYyZDRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcwpAQCAtNjEsMTIgKzYx LDEzIEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHsKICAgICAgICAgICAgIHRoaXMucG9wdWxhdGVDaGlsZHJlbigpOwogICAgICAgICB9 Ci0gICAgICAgIFdlYkluc3BlY3Rvci5QbGVhc2VXYWl0TWVzc2FnZS5wcm90b3R5cGUuc2hvd0Fu ZFdhaXRGb3IodGhpcy5kYXRhR3JpZC5lbGVtZW50LCB0aGlzLCAicG9wdWxhdGUgY29tcGxldGUi KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnByb3RvdHlwZS5zaG93 KHRoaXMuZGF0YUdyaWQuZWxlbWVudCk7CiAgICAgICAgIHRoaXMuX3Byb3ZpZGVyLnNvcnRBbmRS ZXdpbmQodGhpcy5jb21wYXJhdG9yKCksIHNvcnRlZC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAg ICAgcG9wdWxhdGVDaGlsZHJlbjogZnVuY3Rpb24ocHJvdmlkZXIsIGhvd01hbnksIGF0SW5kZXgs IGFmdGVyUG9wdWxhdGUsIHN1cHByZXNzTm90aWZ5QWJvdXRDb21wbGV0aW9uKQogICAgIHsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLlBsZWFzZVdhaXRNZXNzYWdlLnByb3RvdHlwZS5zaG93KHRoaXMu ZGF0YUdyaWQuZWxlbWVudCk7CiAgICAgICAgIGlmICghaG93TWFueSAmJiBwcm92aWRlcikgewog ICAgICAgICAgICAgaG93TWFueSA9IHByb3ZpZGVyLmluc3RhbmNlQ291bnQ7CiAgICAgICAgICAg ICBwcm92aWRlci5pbnN0YW5jZUNvdW50ID0gMDsKQEAgLTExMyw4ICsxMTQsMTMgQEAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgc2V0VGltZW91dChub3RpZnkuYmluZCh0aGlzKSwgMCk7CiAg ICAgICAgICAgICB9CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxlYXNlV2FpdE1lc3NhZ2Uu cHJvdG90eXBlLmhpZGUoKTsKICAgICAgICAgfQotICAgICAgICBwcm92aWRlci5zZXJpYWxpemVO ZXh0SXRlbXMoaG93TWFueSwgY2hpbGRyZW5SZXRyaWV2ZWQuYmluZCh0aGlzKSk7CisgICAgICAg IGZ1bmN0aW9uIGNhbGxTZXJpYWxpemUoKQorICAgICAgICB7CisgICAgICAgICAgICBwcm92aWRl ci5zZXJpYWxpemVOZXh0SXRlbXMoaG93TWFueSwgY2hpbGRyZW5SZXRyaWV2ZWQuYmluZCh0aGlz KSk7CisgICAgICAgIH0KKyAgICAgICAgc2V0VGltZW91dChjYWxsU2VyaWFsaXplLmJpbmQodGhp cyksIDApOwogICAgIH0sCiAKICAgICBfc2F2ZUNoaWxkcmVuOiBmdW5jdGlvbigpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RW aWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBz aG90Vmlldy5qcwppbmRleCAyY2UwMzNhLi5iOGVlZDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMK QEAgLTEzMSw2ICsxMzEsNDMgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnRhaW5tZW50 RGF0YUdyaWQgPSBmdW5jdGlvbigpCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29udGFpbm1l bnREYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgX2RlZmF1bHRQb3B1bGF0ZUNvdW50OiAxMDAs CiAKKyAgICBleHBhbmRSb3V0ZTogZnVuY3Rpb24ocm91dGUpCisgICAgeworICAgICAgICBmdW5j dGlvbiBuZXh0U3RlcChwYXJlbnQsIGhvcEluZGV4KQorICAgICAgICB7CisgICAgICAgICAgICBp ZiAoaG9wSW5kZXggPj0gcm91dGUubGVuZ3RoKSB7CisgICAgICAgICAgICAgICAgcGFyZW50LmVs ZW1lbnQuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCh0cnVlKTsKKyAgICAgICAgICAgICAgICBwYXJl bnQuc2VsZWN0KCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgdmFyIG5vZGVJbmRleCA9IHJvdXRlW2hvcEluZGV4XTsKKyAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwLCBsID0gcGFyZW50LmNoaWxkcmVuLmxlbmd0aDsgaSA8IGw7ICsraSkgewor ICAgICAgICAgICAgICAgIHZhciBjaGlsZCA9IHBhcmVudC5jaGlsZHJlbltpXTsKKyAgICAgICAg ICAgICAgICBpZiAoY2hpbGQuc25hcHNob3ROb2RlSW5kZXggPT09IG5vZGVJbmRleCkgeworICAg ICAgICAgICAgICAgICAgICBpZiAoY2hpbGQuZXhwYW5kZWQpCisgICAgICAgICAgICAgICAgICAg ICAgICBuZXh0U3RlcChjaGlsZCwgaG9wSW5kZXggKyAxKTsKKyAgICAgICAgICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBhZnRlckV4cGFuZCgpCisg ICAgICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hp bGQucmVtb3ZlRXZlbnRMaXN0ZW5lcigicG9wdWxhdGUgY29tcGxldGUiLCBhZnRlckV4cGFuZCwg bnVsbCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGxhc3RDaGlsZCA9IGNoaWxk LmNoaWxkcmVuW2NoaWxkLmNoaWxkcmVuLmxlbmd0aCAtIDFdOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmICghbGFzdENoaWxkLnNob3dBbGwpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5leHRTdGVwKGNoaWxkLCBob3BJbmRleCArIDEpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGls ZC5hZGRFdmVudExpc3RlbmVyKCJwb3B1bGF0ZSBjb21wbGV0ZSIsIGFmdGVyRXhwYW5kLCBudWxs KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdENoaWxkLnNob3dBbGwuY2xp Y2soKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC5hZGRFdmVudExpc3RlbmVyKCJw b3B1bGF0ZSBjb21wbGV0ZSIsIGFmdGVyRXhwYW5kLCBudWxsKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNoaWxkLmV4cGFuZCgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgICAgICBuZXh0U3RlcCh0aGlzLCAwKTsKKyAgICB9LAorCiAgICAgc2V0RGF0YVNv dXJjZTogZnVuY3Rpb24oc25hcHNob3RWaWV3LCBzbmFwc2hvdCkKICAgICB7CiAgICAgICAgIHRo aXMuc25hcHNob3RWaWV3ID0gc25hcHNob3RWaWV3OwpAQCAtMzc3LDcgKzQxNCw5IEBAIFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RSZXRhaW5pbmdQYXRoc0xpc3QucHJvdG90eXBlID0gewogICAg ICAgICAgICAgfSBlbHNlIGlmIChyZXN1bHQgIT09IGZhbHNlKSB7CiAgICAgICAgICAgICAgICAg aWYgKHRoaXMuX3ByZWZpeCkKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LnBhdGggPSB0aGlz Ll9wcmVmaXggKyByZXN1bHQucGF0aDsKLSAgICAgICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxk KG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKHJlc3VsdCwgZmFsc2UpKTsKKyAgICAgICAg ICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKHJlc3VsdCwg ZmFsc2UpOworICAgICAgICAgICAgICAgIG5vZGUucm91dGUgPSByZXN1bHQucm91dGU7CisgICAg ICAgICAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChub2RlKTsKICAgICAgICAgICAgICAgICArK3Ro aXMuX2NvdW50ZXI7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzZXRUaW1lb3V0KHN0YXJ0 U2VhcmNoaW5nLmJpbmQodGhpcyksIDApOwpAQCAtNDk0LDYgKzUzMyw3IEBAIFdlYkluc3BlY3Rv ci5EZXRhaWxlZEhlYXBzaG90VmlldyA9IGZ1bmN0aW9uKHBhcmVudCwgcHJvZmlsZSkKICAgICBy ZXRhaW5pbmdQYXRoc1RpdGxlRGl2LmFwcGVuZENoaWxkKHRoaXMucmV0YWluaW5nUGF0aHNSb290 KTsKICAgICByZXRhaW5tZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHJldGFpbmluZ1BhdGhz VGl0bGVEaXYpOwogICAgIHRoaXMucmV0YWlubWVudERhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RSZXRhaW5pbmdQYXRoc0xpc3QoKTsKKyAgICB0aGlzLnJldGFpbm1lbnRE YXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGlj a0luUmV0YWlubWVudEdyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgcmV0YWlubWVudFZpZXcu ZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnJldGFpbm1lbnREYXRhR3JpZC5lbGVtZW50KTsKICAg ICByZXRhaW5tZW50Vmlldy52aXNpYmxlID0gdHJ1ZTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQocmV0YWlubWVudFZpZXcuZWxlbWVudCk7CkBAIC04MzMsNiArODczLDQ1IEBAIFdlYklu c3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu cmV0YWlubWVudERhdGFHcmlkLnNldERhdGFTb3VyY2UodGhpcywgbm9kZUl0ZW0uaXNEZWxldGVk Tm9kZSA/IG5vZGVJdGVtLmRhdGFHcmlkLmJhc2VTbmFwc2hvdCA6IG5vZGVJdGVtLmRhdGFHcmlk LnNuYXBzaG90LCBub2RlSXRlbS5zbmFwc2hvdE5vZGVJbmRleCwgbm9kZUl0ZW0uaXNEZWxldGVk Tm9kZSA/IHRoaXMuYmFzZVNlbGVjdEVsZW1lbnQuY2hpbGROb2Rlc1t0aGlzLmJhc2VTZWxlY3RF bGVtZW50LnNlbGVjdGVkSW5kZXhdLmxhYmVsICsgIiB8ICIgOiAiIik7CiAgICAgfSwKIAorICAg IF9tb3VzZUNsaWNrSW5SZXRhaW5tZW50R3JpZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAg ICAgICB2YXIgY2VsbCA9IGV2ZW50LnRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5vZGVO YW1lKCJ0ZCIpOworICAgICAgICBpZiAoIWNlbGwgfHwgKCFjZWxsLmhhc1N0eWxlQ2xhc3MoInBh dGgtY29sdW1uIikpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgcm93ID0gZXZl bnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWUoInRyIik7CisgICAgICAg IHZhciBub2RlSXRlbSA9IHJvdy5fZGF0YUdyaWROb2RlOworICAgICAgICBpZiAoIW5vZGVJdGVt KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmdW5jdGlvbiBleHBhbmRSb3V0ZSgpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuZGF0YUdyaWQuZXhwYW5kUm91dGUobm9kZUl0ZW0u cm91dGUpOworICAgICAgICB9CisgICAgICAgIHRoaXMuY2hhbmdlVmlldygiQ29udGFpbm1lbnQi LCBleHBhbmRSb3V0ZS5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgY2hhbmdlVmlldzogZnVu Y3Rpb24odmlld1RpdGxlLCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciB2aWV3SW5kZXgg PSBudWxsOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMudmlld3MubGVuZ3RoOyAr K2kpCisgICAgICAgICAgICBpZiAodGhpcy52aWV3c1tpXS50aXRsZSA9PT0gdmlld1RpdGxlKSB7 CisgICAgICAgICAgICAgICAgdmlld0luZGV4ID0gaTsKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KKyAgICAgICAgaWYgKHRoaXMudmlld3MuY3VycmVudCA9PT0gdmlld0lu ZGV4KSB7CisgICAgICAgICAgICBzZXRUaW1lb3V0KGNhbGxiYWNrLCAwKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB2YXIgZ3JpZCA9IHRoaXMudmlld3Nbdmlld0lu ZGV4XS5ncmlkOworICAgICAgICBmdW5jdGlvbiBzb3J0aW5nQ29tcGxldGUoKQorICAgICAgICB7 CisgICAgICAgICAgICBncmlkLnJlbW92ZUV2ZW50TGlzdGVuZXIoInNvcnRpbmcgY29tcGxldGUi LCBzb3J0aW5nQ29tcGxldGUsIHRoaXMpOworICAgICAgICAgICAgc2V0VGltZW91dChjYWxsYmFj aywgMCk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy52aWV3c1t2aWV3SW5kZXhdLmdyaWQuYWRk RXZlbnRMaXN0ZW5lcigic29ydGluZyBjb21wbGV0ZSIsIHNvcnRpbmdDb21wbGV0ZSwgdGhpcyk7 CisgICAgICAgIHRoaXMudmlld1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRleCA9IHZpZXdJbmRl eDsKKyAgICAgICAgdGhpcy5fY2hhbmdlVmlldyh7dGFyZ2V0OiB7c2VsZWN0ZWRJbmRleDogdmll d0luZGV4fX0pOyAgICAgIAorICAgIH0sCisKICAgICBfY2hhbmdlVmlldzogZnVuY3Rpb24oZXZl bnQpCiAgICAgewogICAgICAgICBpZiAoIWV2ZW50IHx8ICF0aGlzLl9wcm9maWxlVWlkKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3Qu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwpp bmRleCAyNzdmZGE5Li5jN2EzOGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwpAQCAtMTA3MSw3ICsxMDcxLDcgQEAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFBhdGhGaW5kZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICh0aGlz Ll9pc1BhdGhGb3VuZCgpKQotICAgICAgICAgICAgICAgIHJldHVybiB7cGF0aDp0aGlzLl9wYXRo VG9TdHJpbmcodGhpcy5fY3VycmVudFBhdGgpLCBsZW46dGhpcy5fY3VycmVudFBhdGgubGVuZ3Ro fTsKKyAgICAgICAgICAgICAgICByZXR1cm4ge3BhdGg6dGhpcy5fcGF0aFRvU3RyaW5nKHRoaXMu X2N1cnJlbnRQYXRoKSwgcm91dGU6dGhpcy5fcGF0aFRvUm91dGUodGhpcy5fY3VycmVudFBhdGgp LCBsZW46dGhpcy5fY3VycmVudFBhdGgubGVuZ3RofTsKICAgICAgICAgfQogCiAgICAgICAgIHJl dHVybiBmYWxzZTsKQEAgLTExNDUsNyArMTE0NSw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RQYXRoRmluZGVyLnByb3RvdHlwZSA9IHsKICAgICBfbmV4dEVkZ2VJdGVyOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB2YXIgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsKLSAgICAgICAg d2hpbGUgKHRoaXMuX3NraXBFZGdlKGl0ZXIuaXRlbSkgJiYgaXRlci5oYXNOZXh0KCkpCisgICAg ICAgIHdoaWxlIChpdGVyLmhhc05leHQoKSAmJiB0aGlzLl9za2lwRWRnZShpdGVyLml0ZW0pKQog ICAgICAgICAgICAgaXRlci5uZXh0KCk7CiAgICAgICAgIHJldHVybiBpdGVyOwogICAgIH0sCkBA IC0xMTU2LDYgKzExNTYsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZpbmRlci5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsK ICAgICAgICAgICAgIHdoaWxlICh0cnVlKSB7CiAgICAgICAgICAgICAgICAgaXRlci5uZXh0KCk7 CisgICAgICAgICAgICAgICAgaXRlciA9IHRoaXMuX25leHRFZGdlSXRlcigpOwogICAgICAgICAg ICAgICAgIGlmIChpdGVyLmhhc05leHQoKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKQEAgLTEyMTEsNiArMTIxMiwxOCBA QCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZpbmRlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHNQYXRoLnB1c2godGhpcy5fbm9kZVRvU3RyaW5nKHBhdGhbcGF0aC5sZW5ndGggLSAxXS5p dGVtLm5vZGUpKTsKICAgICAgICAgc1BhdGgucmV2ZXJzZSgpOwogICAgICAgICByZXR1cm4gc1Bh dGguam9pbigiIik7CisgICAgfSwKKworICAgIF9wYXRoVG9Sb3V0ZTogZnVuY3Rpb24ocGF0aCkK KyAgICB7CisgICAgICAgIGlmICghcGF0aCkKKyAgICAgICAgICAgcmV0dXJuIFtdOworICAgICAg ICB2YXIgcm91dGUgPSBbXTsKKyAgICAgICAgcm91dGUucHVzaCh0aGlzLl90YXJnZXROb2RlSW5k ZXgpOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBhdGgubGVuZ3RoOyArK2kpCisgICAg ICAgICAgICByb3V0ZS5wdXNoKHBhdGhbaV0uaXRlbS5ub2RlSW5kZXgpOworICAgICAgICByb3V0 ZS5yZXZlcnNlKCk7CisgICAgICAgIHJldHVybiByb3V0ZTsKICAgICB9CiB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxlci5jc3Mg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxlci5jc3MKaW5k ZXggY2VlYWZjYS4uMTliMGZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9oZWFwUHJvZmlsZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaGVhcFByb2ZpbGVyLmNzcwpAQCAtMjU4LDMgKzI1OCw4IEBACiB0YWJsZS5o ZWFwc2hvdC1oZWxwIHsKICAgICBib3JkZXItc3BhY2luZzogMTJweCAycHg7CiB9CisKK2Rpdi5y ZXRhaW5pbmctcGF0aHMtdmlldyB0ZC5wYXRoLWNvbHVtbiBkaXY6aG92ZXIgeworICAgIHRleHQt ZGVjb3JhdGlvbjogdW5kZXJsaW5lOworICAgIGNvbG9yOiBibHVlOworfQo=