193696 2019-01-22 16:06:55 -0800 Web Inspector: Network Waterfall column should redraw when adding/removing new columns 2019-01-25 18:21:27 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1497058 0 joepeck 2019-01-22 16:06:55 -0800 Network Waterfall column should redraw when adding/removing new columns Steps to Reproduce: 1. Inspect this page 2. Reload to have waterfall column 3. Hide "Domain" columns => Waterfall column graphs do not extend to edges as expected 4. Show another column => Waterfall column graphs do not extend to edges as expected Note: - Resizing the window causes graphs to update correctly, so should showing/hiding columns 1497059 1 webkit-bug-importer 2019-01-22 16:07:28 -0800 <rdar://problem/47464149> 1497061 2 359797 joepeck 2019-01-22 16:09:18 -0800 Created attachment 359797 [PATCH] Proposed Fix This has been a pet peeve of mine for a long time. 1497079 3 359797 hi 2019-01-22 16:24:24 -0800 Comment on attachment 359797 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=359797&action=review r=me > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:1073 > + needsReloadOnResize: true, And this is a perfect example of why I love optional objects in constructors 😍 > Source/WebInspectorUI/UserInterface/Views/Table.js:494 > + // Now populate columns that may be sensitive to resizes. Could you extract this logic into a separate function so that it can be called (instead of copied) by `hideColumn`? > Source/WebInspectorUI/UserInterface/Views/Table.js:498 > + this.reloadVisibleColumnCells(visibleColumn); Is it necessary to do all this work as soon as a new column is added, or can we leverage the layout system to wait until we need to actually display it (this also applies to the `this._delegate.tablePopulateCell` loop)? 1497094 4 359797 joepeck 2019-01-22 16:41:40 -0800 Comment on attachment 359797 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=359797&action=review >> Source/WebInspectorUI/UserInterface/Views/Table.js:494 >> + // Now populate columns that may be sensitive to resizes. > > Could you extract this logic into a separate function so that it can be called (instead of copied) by `hideColumn`? Turns out the logic can be slightly different given this excludes a single column. >> Source/WebInspectorUI/UserInterface/Views/Table.js:498 >> + this.reloadVisibleColumnCells(visibleColumn); > > Is it necessary to do all this work as soon as a new column is added, or can we leverage the layout system to wait until we need to actually display it (this also applies to the `this._delegate.tablePopulateCell` loop)? I gave it a quick attempt and it didn't work. I'm not exactly sure why, but one benefit of this approach is that it does the minimum amount of work on show/hide. I'm going to keep as is to avoid going down a rabbit hole. > Source/WebInspectorUI/UserInterface/Views/Table.js:557 > + if (visibleColumn !== column) { This loop doesn't need this check since `column` was just removed. 1497096 5 359808 joepeck 2019-01-22 16:45:51 -0800 Created attachment 359808 [PATCH] For Landing 1497422 6 359808 commit-queue 2019-01-23 10:47:02 -0800 Comment on attachment 359808 [PATCH] For Landing Clearing flags on attachment: 359808 Committed r240347: <https://trac.webkit.org/changeset/240347> 359797 2019-01-22 16:09:18 -0800 2019-01-25 16:45:39 -0800 [PATCH] Proposed Fix reload-resize-1.patch text/plain 5630 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGYwYzc0YmNiZjg2Li45YmJkOTZlYTE5OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMjIgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBOZXR3b3JrIFdhdGVyZmFsbCBjb2x1bW4gc2hvdWxkIHJlZHJhdyB3aGVuIGFkZGluZy9yZW1v dmluZyBuZXcgY29sdW1ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkzNjk2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzQ2NDE0OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVGFibGVDb2x1bW4uanM6CisgICAgICAgIChXSS5UYWJsZUNvbHVtbi5wcm90b3R5 cGUuZ2V0IG5lZWRzUmVsb2FkT25SZXNpemUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVD b250ZW50Vmlldy5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgIE1hcmsgdGhlIHdh dGVyZmFsbCBjb2x1bW4gYXMgc2Vuc2l0aXZlIHRvIGFueSByZXNpemVzLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UYWJsZS5qczoKKyAgICAgICAgKFdJLlRhYmxlLnByb3RvdHlw ZS5zaG93Q29sdW1uKToKKyAgICAgICAgKFdJLlRhYmxlLnByb3RvdHlwZS5oaWRlQ29sdW1uKToK KyAgICAgICAgVXBkYXRlIGNvbHVtbiB3aWR0aHMgYW5kIHJlbG9hZCBhbnkgY29sdW1ucyB0aGF0 IG1heSBiZSBzZW5zaXRpdmUgdG8gcmVzaXplcy4KKwogMjAxOS0wMS0yMiAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5ldHdv cmsgVGFibGUgYXBwZWFycyBicm9rZW4gYWZ0ZXIgZmlsdGVyIC0gcm93cyBsb29rIGNvbGxhcHNl ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCA1N2VjOGFmM2Yx MC4uZDVjYWZkNmIzY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3Lmpz CkBAIC0xMDcwLDYgKzEwNzAsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNz IE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICB0 aGlzLl93YXRlcmZhbGxDb2x1bW4gPSBuZXcgV0kuVGFibGVDb2x1bW4oIndhdGVyZmFsbCIsIFdJ LlVJU3RyaW5nKCJXYXRlcmZhbGwiKSwgewogICAgICAgICAgICAgbWluV2lkdGg6IDIzMCwKICAg ICAgICAgICAgIGhlYWRlclZpZXc6IHRoaXMuX3dhdGVyZmFsbFRpbWVsaW5lUnVsZXIsCisgICAg ICAgICAgICBuZWVkc1JlbG9hZE9uUmVzaXplOiB0cnVlLAogICAgICAgICB9KTsKIAogICAgICAg ICB0aGlzLl9uYW1lQ29sdW1uLmFkZEV2ZW50TGlzdGVuZXIoV0kuVGFibGVDb2x1bW4uRXZlbnQu V2lkdGhEaWRDaGFuZ2UsIHRoaXMuX3RhYmxlTmFtZUNvbHVtbkRpZENoYW5nZVdpZHRoLCB0aGlz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RhYmxlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFi bGUuanMKaW5kZXggMzUyMDI0NzdjNDAuLjhjNmJlMGEyNmNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJsZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJsZS5qcwpAQCAtNDgzLDEyICs0 ODMsMjEgQEAgV0kuVGFibGUgPSBjbGFzcyBUYWJsZSBleHRlbmRzIFdJLlZpZXcKICAgICAgICAg fQogCiAgICAgICAgIC8vIFJlLWxheW91dCBhbGwgY29sdW1ucyB0byBtYWtlIHNwYWNlLgorICAg ICAgICB0aGlzLl93aWR0aEdlbmVyYXRpb24rKzsKICAgICAgICAgdGhpcy5fY29sdW1uV2lkdGhz ID0gbnVsbDsKICAgICAgICAgdGhpcy5fcmVzaXplQ29sdW1uc0FuZEZpbGxlcigpOwogCiAgICAg ICAgIC8vIE5vdyBwb3B1bGF0ZSBvbmx5IHRoZSBuZXcgY2VsbHMgZm9yIHRoaXMgY29sdW1uLgog ICAgICAgICBmb3IgKGxldCBjZWxsIG9mIGNlbGxzVG9Qb3B1bGF0ZSkKICAgICAgICAgICAgIHRo aXMuX2RlbGVnYXRlLnRhYmxlUG9wdWxhdGVDZWxsKHRoaXMsIGNlbGwsIGNvbHVtbiwgY2VsbC5w YXJlbnRFbGVtZW50Ll9faW5kZXgpOworCisgICAgICAgIC8vIE5vdyBwb3B1bGF0ZSBjb2x1bW5z IHRoYXQgbWF5IGJlIHNlbnNpdGl2ZSB0byByZXNpemVzLgorICAgICAgICBmb3IgKGxldCB2aXNp YmxlQ29sdW1uIG9mIHRoaXMuX3Zpc2libGVDb2x1bW5zKSB7CisgICAgICAgICAgICBpZiAodmlz aWJsZUNvbHVtbiAhPT0gY29sdW1uKSB7CisgICAgICAgICAgICAgICAgaWYgKHZpc2libGVDb2x1 bW4ubmVlZHNSZWxvYWRPblJlc2l6ZSkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5yZWxvYWRW aXNpYmxlQ29sdW1uQ2VsbHModmlzaWJsZUNvbHVtbik7CisgICAgICAgICAgICB9CisgICAgICAg IH0KICAgICB9CiAKICAgICBoaWRlQ29sdW1uKGNvbHVtbikKQEAgLTUzMywxNCArNTQyLDIzIEBA IFdJLlRhYmxlID0gY2xhc3MgVGFibGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIGlmICghdGhp cy5fY29sdW1uV2lkdGhzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX2Nv bHVtbldpZHRocy5zcGxpY2UoY29sdW1uSW5kZXgsIDEpOwotCiAgICAgICAgIGZvciAobGV0IHJv dyBvZiB0aGlzLl9saXN0RWxlbWVudC5jaGlsZHJlbikgewogICAgICAgICAgICAgaWYgKHJvdyAh PT0gdGhpcy5fZmlsbGVyUm93KQogICAgICAgICAgICAgICAgIHJvdy5yZW1vdmVDaGlsZChyb3cu Y2hpbGRyZW5bY29sdW1uSW5kZXhdKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMubmVlZHNM YXlvdXQoKTsKKyAgICAgICAgLy8gUmUtbGF5b3V0IGFsbCBjb2x1bW5zIHRvIG1ha2Ugc3BhY2Uu CisgICAgICAgIHRoaXMuX3dpZHRoR2VuZXJhdGlvbisrOworICAgICAgICB0aGlzLl9jb2x1bW5X aWR0aHMgPSBudWxsOworICAgICAgICB0aGlzLl9yZXNpemVDb2x1bW5zQW5kRmlsbGVyKCk7CisK KyAgICAgICAgLy8gTm93IHBvcHVsYXRlIGNvbHVtbnMgdGhhdCBtYXkgYmUgc2Vuc2l0aXZlIHRv IHJlc2l6ZXMuCisgICAgICAgIGZvciAobGV0IHZpc2libGVDb2x1bW4gb2YgdGhpcy5fdmlzaWJs ZUNvbHVtbnMpIHsKKyAgICAgICAgICAgIGlmICh2aXNpYmxlQ29sdW1uICE9PSBjb2x1bW4pIHsK KyAgICAgICAgICAgICAgICBpZiAodmlzaWJsZUNvbHVtbi5uZWVkc1JlbG9hZE9uUmVzaXplKQor ICAgICAgICAgICAgICAgICAgICB0aGlzLnJlbG9hZFZpc2libGVDb2x1bW5DZWxscyh2aXNpYmxl Q29sdW1uKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIAogICAgIHJlc3RvcmVT Y3JvbGxQb3NpdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UYWJsZUNvbHVtbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RhYmxlQ29sdW1uLmpzCmluZGV4IDQwOGMyZjZhYTFlLi4zODVhM2Ni ZWYwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGFibGVDb2x1bW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGFibGVDb2x1bW4uanMKQEAgLTI1LDcgKzI1LDcgQEAKIAogV0kuVGFibGVDb2x1 bW4gPSBjbGFzcyBUYWJsZUNvbHVtbiBleHRlbmRzIFdJLk9iamVjdAogewotICAgIGNvbnN0cnVj dG9yKGlkZW50aWZpZXIsIG5hbWUsIHtpbml0aWFsV2lkdGgsIG1pbldpZHRoLCBtYXhXaWR0aCwg aGlkZGVuLCBzb3J0YWJsZSwgaGlkZWFibGUsIGFsaWduLCByZXNpemVUeXBlLCBoZWFkZXJWaWV3 fSA9IHt9KQorICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIG5hbWUsIHtpbml0aWFsV2lkdGgs IG1pbldpZHRoLCBtYXhXaWR0aCwgaGlkZGVuLCBzb3J0YWJsZSwgaGlkZWFibGUsIGFsaWduLCBy ZXNpemVUeXBlLCBoZWFkZXJWaWV3LCBuZWVkc1JlbG9hZE9uUmVzaXplfSA9IHt9KQogICAgIHsK ICAgICAgICAgc3VwZXIoKTsKIApAQCAtNDksNiArNDksNyBAQCBXSS5UYWJsZUNvbHVtbiA9IGNs YXNzIFRhYmxlQ29sdW1uIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX2FsaWduID0g YWxpZ24gfHwgbnVsbDsKICAgICAgICAgdGhpcy5fcmVzaXplVHlwZSA9IHJlc2l6ZVR5cGUgfHwg VGFibGVDb2x1bW4uUmVzaXplVHlwZS5BdXRvOwogICAgICAgICB0aGlzLl9oZWFkZXJWaWV3ID0g aGVhZGVyVmlldyB8fCBudWxsOworICAgICAgICB0aGlzLl9uZWVkc1JlbG9hZE9uUmVzaXplID0g bmVlZHNSZWxvYWRPblJlc2l6ZSB8fCBmYWxzZTsKIAogICAgICAgICBjb25zb2xlLmFzc2VydCgh dGhpcy5fbWluV2lkdGggfHwgIXRoaXMuX21heFdpZHRoIHx8IHRoaXMuX21pbldpZHRoIDw9IHRo aXMuX21heFdpZHRoLCAiSW52YWxpZCBtaW4vbWF4IiwgdGhpcy5fbWluV2lkdGgsIHRoaXMuX21h eFdpZHRoKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoaXNOYU4odGhpcy5fd2lkdGgpIHx8ICF0 aGlzLl9taW5XaWR0aCB8fCAodGhpcy5fd2lkdGggPj0gdGhpcy5fbWluV2lkdGgpLCAiSW5pdGlh bCB3aWR0aCBpcyBsZXNzIHRoYW4gbWluIiwgdGhpcy5fd2lkdGgsIHRoaXMuX21pbldpZHRoKTsK QEAgLTY3LDYgKzY4LDcgQEAgV0kuVGFibGVDb2x1bW4gPSBjbGFzcyBUYWJsZUNvbHVtbiBleHRl bmRzIFdJLk9iamVjdAogICAgIGdldCBoaWRlYWJsZSgpIHsgcmV0dXJuIHRoaXMuX2hpZGVhYmxl OyB9CiAgICAgZ2V0IGFsaWduKCkgeyByZXR1cm4gdGhpcy5fYWxpZ247IH0KICAgICBnZXQgaGVh ZGVyVmlldygpIHsgcmV0dXJuIHRoaXMuX2hlYWRlclZpZXc7IH0KKyAgICBnZXQgbmVlZHNSZWxv YWRPblJlc2l6ZSgpIHsgcmV0dXJuIHRoaXMuX25lZWRzUmVsb2FkT25SZXNpemU7IH0KIAogICAg IGdldCBsb2NrZWQoKSB7IHJldHVybiB0aGlzLl9yZXNpemVUeXBlID09PSBUYWJsZUNvbHVtbi5S ZXNpemVUeXBlLkxvY2tlZDsgfQogICAgIGdldCBmbGV4aWJsZSgpIHsgcmV0dXJuIHRoaXMuX3Jl c2l6ZVR5cGUgPT09IFRhYmxlQ29sdW1uLlJlc2l6ZVR5cGUuQXV0bzsgfQo= 359808 2019-01-22 16:45:51 -0800 2019-01-23 10:47:02 -0800 [PATCH] For Landing for-landing-1.patch text/plain 5560 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGYwYzc0YmNiZjg2Li4yOWJkZDY1ZWE2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMjIgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBOZXR3b3JrIFdhdGVyZmFsbCBjb2x1bW4gc2hvdWxkIHJlZHJhdyB3aGVuIGFkZGluZy9yZW1v dmluZyBuZXcgY29sdW1ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkzNjk2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzQ2NDE0OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1RhYmxlQ29sdW1uLmpzOgorICAgICAgICAoV0kuVGFibGVDb2x1bW4ucHJvdG90eXBl LmdldCBuZWVkc1JlbG9hZE9uUmVzaXplKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29u dGVudFZpZXcucHJvdG90eXBlLmluaXRpYWxMYXlvdXQpOgorICAgICAgICBNYXJrIHRoZSB3YXRl cmZhbGwgY29sdW1uIGFzIHNlbnNpdGl2ZSB0byBhbnkgcmVzaXplcy4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvVGFibGUuanM6CisgICAgICAgIChXSS5UYWJsZS5wcm90b3R5cGUu c2hvd0NvbHVtbik6CisgICAgICAgIChXSS5UYWJsZS5wcm90b3R5cGUuaGlkZUNvbHVtbik6Cisg ICAgICAgIFVwZGF0ZSBjb2x1bW4gd2lkdGhzIGFuZCByZWxvYWQgYW55IGNvbHVtbnMgdGhhdCBt YXkgYmUgc2Vuc2l0aXZlIHRvIHJlc2l6ZXMuCisKIDIwMTktMDEtMjIgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3Jr IFRhYmxlIGFwcGVhcnMgYnJva2VuIGFmdGVyIGZpbHRlciAtIHJvd3MgbG9vayBjb2xsYXBzZWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKaW5kZXggNTdlYzhhZjNmMTAu LmQ1Y2FmZDZiM2NiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwpA QCAtMTA3MCw2ICsxMDcwLDcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBO ZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgdGhp cy5fd2F0ZXJmYWxsQ29sdW1uID0gbmV3IFdJLlRhYmxlQ29sdW1uKCJ3YXRlcmZhbGwiLCBXSS5V SVN0cmluZygiV2F0ZXJmYWxsIiksIHsKICAgICAgICAgICAgIG1pbldpZHRoOiAyMzAsCiAgICAg ICAgICAgICBoZWFkZXJWaWV3OiB0aGlzLl93YXRlcmZhbGxUaW1lbGluZVJ1bGVyLAorICAgICAg ICAgICAgbmVlZHNSZWxvYWRPblJlc2l6ZTogdHJ1ZSwKICAgICAgICAgfSk7CiAKICAgICAgICAg dGhpcy5fbmFtZUNvbHVtbi5hZGRFdmVudExpc3RlbmVyKFdJLlRhYmxlQ29sdW1uLkV2ZW50Lldp ZHRoRGlkQ2hhbmdlLCB0aGlzLl90YWJsZU5hbWVDb2x1bW5EaWRDaGFuZ2VXaWR0aCwgdGhpcyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U YWJsZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYmxl LmpzCmluZGV4IDM1MjAyNDc3YzQwLi4wZjdjOTliYWFkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFibGUuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFibGUuanMKQEAgLTQ4MywxMiArNDgz LDIxIEBAIFdJLlRhYmxlID0gY2xhc3MgVGFibGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIH0K IAogICAgICAgICAvLyBSZS1sYXlvdXQgYWxsIGNvbHVtbnMgdG8gbWFrZSBzcGFjZS4KKyAgICAg ICAgdGhpcy5fd2lkdGhHZW5lcmF0aW9uKys7CiAgICAgICAgIHRoaXMuX2NvbHVtbldpZHRocyA9 IG51bGw7CiAgICAgICAgIHRoaXMuX3Jlc2l6ZUNvbHVtbnNBbmRGaWxsZXIoKTsKIAogICAgICAg ICAvLyBOb3cgcG9wdWxhdGUgb25seSB0aGUgbmV3IGNlbGxzIGZvciB0aGlzIGNvbHVtbi4KICAg ICAgICAgZm9yIChsZXQgY2VsbCBvZiBjZWxsc1RvUG9wdWxhdGUpCiAgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS50YWJsZVBvcHVsYXRlQ2VsbCh0aGlzLCBjZWxsLCBjb2x1bW4sIGNlbGwucGFy ZW50RWxlbWVudC5fX2luZGV4KTsKKworICAgICAgICAvLyBOb3cgcG9wdWxhdGUgY29sdW1ucyB0 aGF0IG1heSBiZSBzZW5zaXRpdmUgdG8gcmVzaXplcy4KKyAgICAgICAgZm9yIChsZXQgdmlzaWJs ZUNvbHVtbiBvZiB0aGlzLl92aXNpYmxlQ29sdW1ucykgeworICAgICAgICAgICAgaWYgKHZpc2li bGVDb2x1bW4gIT09IGNvbHVtbikgeworICAgICAgICAgICAgICAgIGlmICh2aXNpYmxlQ29sdW1u Lm5lZWRzUmVsb2FkT25SZXNpemUpCisgICAgICAgICAgICAgICAgICAgIHRoaXMucmVsb2FkVmlz aWJsZUNvbHVtbkNlbGxzKHZpc2libGVDb2x1bW4pOworICAgICAgICAgICAgfQorICAgICAgICB9 CiAgICAgfQogCiAgICAgaGlkZUNvbHVtbihjb2x1bW4pCkBAIC01MzMsMTQgKzU0MiwyMSBAQCBX SS5UYWJsZSA9IGNsYXNzIFRhYmxlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICBpZiAoIXRoaXMu X2NvbHVtbldpZHRocykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl9jb2x1 bW5XaWR0aHMuc3BsaWNlKGNvbHVtbkluZGV4LCAxKTsKLQogICAgICAgICBmb3IgKGxldCByb3cg b2YgdGhpcy5fbGlzdEVsZW1lbnQuY2hpbGRyZW4pIHsKICAgICAgICAgICAgIGlmIChyb3cgIT09 IHRoaXMuX2ZpbGxlclJvdykKICAgICAgICAgICAgICAgICByb3cucmVtb3ZlQ2hpbGQocm93LmNo aWxkcmVuW2NvbHVtbkluZGV4XSk7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLm5lZWRzTGF5 b3V0KCk7CisgICAgICAgIC8vIFJlLWxheW91dCBhbGwgY29sdW1ucyB0byBtYWtlIHNwYWNlLgor ICAgICAgICB0aGlzLl93aWR0aEdlbmVyYXRpb24rKzsKKyAgICAgICAgdGhpcy5fY29sdW1uV2lk dGhzID0gbnVsbDsKKyAgICAgICAgdGhpcy5fcmVzaXplQ29sdW1uc0FuZEZpbGxlcigpOworCisg ICAgICAgIC8vIE5vdyBwb3B1bGF0ZSBjb2x1bW5zIHRoYXQgbWF5IGJlIHNlbnNpdGl2ZSB0byBy ZXNpemVzLgorICAgICAgICBmb3IgKGxldCB2aXNpYmxlQ29sdW1uIG9mIHRoaXMuX3Zpc2libGVD b2x1bW5zKSB7CisgICAgICAgICAgICBpZiAodmlzaWJsZUNvbHVtbi5uZWVkc1JlbG9hZE9uUmVz aXplKQorICAgICAgICAgICAgICAgIHRoaXMucmVsb2FkVmlzaWJsZUNvbHVtbkNlbGxzKHZpc2li bGVDb2x1bW4pOworICAgICAgICB9CiAgICAgfQogCiAgICAgcmVzdG9yZVNjcm9sbFBvc2l0aW9u KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RhYmxlQ29sdW1uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGFibGVDb2x1bW4uanMKaW5kZXggNDA4YzJmNmFhMWUuLjM4NWEzY2JlZjA2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJsZUNvbHVt bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJs ZUNvbHVtbi5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXSS5UYWJsZUNvbHVtbiA9IGNsYXNzIFRh YmxlQ29sdW1uIGV4dGVuZHMgV0kuT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3IoaWRlbnRpZmll ciwgbmFtZSwge2luaXRpYWxXaWR0aCwgbWluV2lkdGgsIG1heFdpZHRoLCBoaWRkZW4sIHNvcnRh YmxlLCBoaWRlYWJsZSwgYWxpZ24sIHJlc2l6ZVR5cGUsIGhlYWRlclZpZXd9ID0ge30pCisgICAg Y29uc3RydWN0b3IoaWRlbnRpZmllciwgbmFtZSwge2luaXRpYWxXaWR0aCwgbWluV2lkdGgsIG1h eFdpZHRoLCBoaWRkZW4sIHNvcnRhYmxlLCBoaWRlYWJsZSwgYWxpZ24sIHJlc2l6ZVR5cGUsIGhl YWRlclZpZXcsIG5lZWRzUmVsb2FkT25SZXNpemV9ID0ge30pCiAgICAgewogICAgICAgICBzdXBl cigpOwogCkBAIC00OSw2ICs0OSw3IEBAIFdJLlRhYmxlQ29sdW1uID0gY2xhc3MgVGFibGVDb2x1 bW4gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fYWxpZ24gPSBhbGlnbiB8fCBudWxs OwogICAgICAgICB0aGlzLl9yZXNpemVUeXBlID0gcmVzaXplVHlwZSB8fCBUYWJsZUNvbHVtbi5S ZXNpemVUeXBlLkF1dG87CiAgICAgICAgIHRoaXMuX2hlYWRlclZpZXcgPSBoZWFkZXJWaWV3IHx8 IG51bGw7CisgICAgICAgIHRoaXMuX25lZWRzUmVsb2FkT25SZXNpemUgPSBuZWVkc1JlbG9hZE9u UmVzaXplIHx8IGZhbHNlOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9taW5XaWR0 aCB8fCAhdGhpcy5fbWF4V2lkdGggfHwgdGhpcy5fbWluV2lkdGggPD0gdGhpcy5fbWF4V2lkdGgs ICJJbnZhbGlkIG1pbi9tYXgiLCB0aGlzLl9taW5XaWR0aCwgdGhpcy5fbWF4V2lkdGgpOwogICAg ICAgICBjb25zb2xlLmFzc2VydChpc05hTih0aGlzLl93aWR0aCkgfHwgIXRoaXMuX21pbldpZHRo IHx8ICh0aGlzLl93aWR0aCA+PSB0aGlzLl9taW5XaWR0aCksICJJbml0aWFsIHdpZHRoIGlzIGxl c3MgdGhhbiBtaW4iLCB0aGlzLl93aWR0aCwgdGhpcy5fbWluV2lkdGgpOwpAQCAtNjcsNiArNjgs NyBAQCBXSS5UYWJsZUNvbHVtbiA9IGNsYXNzIFRhYmxlQ29sdW1uIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgZ2V0IGhpZGVhYmxlKCkgeyByZXR1cm4gdGhpcy5faGlkZWFibGU7IH0KICAgICBnZXQg YWxpZ24oKSB7IHJldHVybiB0aGlzLl9hbGlnbjsgfQogICAgIGdldCBoZWFkZXJWaWV3KCkgeyBy ZXR1cm4gdGhpcy5faGVhZGVyVmlldzsgfQorICAgIGdldCBuZWVkc1JlbG9hZE9uUmVzaXplKCkg eyByZXR1cm4gdGhpcy5fbmVlZHNSZWxvYWRPblJlc2l6ZTsgfQogCiAgICAgZ2V0IGxvY2tlZCgp IHsgcmV0dXJuIHRoaXMuX3Jlc2l6ZVR5cGUgPT09IFRhYmxlQ29sdW1uLlJlc2l6ZVR5cGUuTG9j a2VkOyB9CiAgICAgZ2V0IGZsZXhpYmxlKCkgeyByZXR1cm4gdGhpcy5fcmVzaXplVHlwZSA9PT0g VGFibGVDb2x1bW4uUmVzaXplVHlwZS5BdXRvOyB9Cg==