179273 2017-11-03 16:16:03 -0700 Web Inspector: Two little Layers tab fixes 2017-11-15 12:13:59 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174176 1 ross.kirsling ross.kirsling commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1368225 0 ross.kirsling 2017-11-03 16:16:03 -0700 Web Inspector: Two little Layers tab fixes 1368232 1 325986 ross.kirsling 2017-11-03 16:28:15 -0700 Created attachment 325986 Patch 1368240 2 ross.kirsling 2017-11-03 16:33:14 -0700 As explained in the ChangeLog: 1. Although we want to avoid refiring a selected event when updating the data grid programmatically, we still do want a popover to appear. 2. It seems that when WI is opened with the Layers tab showing first, the initial fetch of layer data doesn't occur right away. We could simply have _layersChangedWhileHidden start out true (and rename it to _layersAreStale perhaps), but this is a good opportunity to ditch that hack anyway. Now that we're properly tracking layer mutations, it's not such a big deal to hard update on every shown(), and detach the event listener in between. 1368256 3 325991 ross.kirsling 2017-11-03 17:06:17 -0700 Created attachment 325991 Patch 1368829 4 325991 hi 2017-11-06 16:23:08 -0800 Comment on attachment 325991 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=325991&action=review r=me > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:75 > + } else if (this._dataGrid.selectedNode) > this._dataGrid.selectedNode.deselect(suppressEvent); Should you dismiss the popover in the case that it is being shown and we have no new node to select? 1368831 5 ross.kirsling 2017-11-06 16:33:09 -0800 (In reply to Devin Rousso from comment #4) > > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:75 > > + } else if (this._dataGrid.selectedNode) > > this._dataGrid.selectedNode.deselect(suppressEvent); > > Should you dismiss the popover in the case that it is being shown and we > have no new node to select? Popover dismissal happens automatically by clicking anywhere. :D 1368841 6 325991 commit-queue 2017-11-06 16:52:50 -0800 Comment on attachment 325991 Patch Clearing flags on attachment: 325991 Committed r224520: <https://trac.webkit.org/changeset/224520> 1368842 7 commit-queue 2017-11-06 16:52:51 -0800 All reviewed patches have been landed. Closing bug. 1368915 8 joepeck 2017-11-06 20:16:06 -0800 (In reply to Ross Kirsling from comment #0) > Web Inspector: Two little Layers tab fixes This is a poor bug title. I'm sure a more descriptive title would be possible. 1368916 9 ross.kirsling 2017-11-06 20:41:17 -0800 (In reply to Joseph Pecoraro from comment #8) > (In reply to Ross Kirsling from comment #0) > > Web Inspector: Two little Layers tab fixes > > This is a poor bug title. I'm sure a more descriptive title would be > possible. I debated splitting it into two (I'm sure being Friday EOD influenced my decision), but given that I didn't do so, I think it's about as coherent as the title can get? The two changes are in separate view classes and have no impact on each other, but they are both small fixes for the Layers tab. 1368917 10 joepeck 2017-11-06 20:48:22 -0800 (In reply to Ross Kirsling from comment #9) > (In reply to Joseph Pecoraro from comment #8) > > (In reply to Ross Kirsling from comment #0) > > > Web Inspector: Two little Layers tab fixes > > > > This is a poor bug title. I'm sure a more descriptive title would be > > possible. > > I debated splitting it into two (I'm sure being Friday EOD influenced my > decision), but given that I didn't do so, I think it's about as coherent as > the title can get? The two changes are in separate view classes and have no > impact on each other, but they are both small fixes for the Layers tab. It is always better to describe the user impact. Even if that ends up being a performance/memory improvement without any visible change. 1368919 11 ross.kirsling 2017-11-06 21:15:49 -0800 (In reply to Joseph Pecoraro from comment #10) > It is always better to describe the user impact. Even if that ends up being > a performance/memory improvement without any visible change. Absolutely, and these are both user-facing fixes. But each one is rather long to describe in itself, and as they have no overlap, there's no way to combine them without a conjunction. "Web Inspector: [Layers] Show popover even when data grid selected event is suppressed and ensure initial fetch of layer data is never skipped" is a very long title. When I was considering splitting up the mouse UX patch into less-controversial and more-controversial parts, I had asked in channel whether a "three fixes"-type patch is something acceptable to do, and I received a positive answer. I didn't end up doing that then, but I did do so here, as a sort of cleanup task. I'd be happy to keep unrelated changes split up in the future, but I don't see how I could've possibly named this one better. :P 1369060 12 ross.kirsling 2017-11-07 10:37:49 -0800 (In reply to Ross Kirsling from comment #11) > I'd be happy to keep unrelated changes split up in the future, but I don't > see how I could've possibly named this one better. :P Having slept on it, I suppose "Web Inspector: [Layers] Fixes for popover and data retrieval" would've worked. Bugzilla makes life tricky, haha. 1369062 13 joepeck 2017-11-07 10:41:01 -0800 (In reply to Ross Kirsling from comment #12) > (In reply to Ross Kirsling from comment #11) > > I'd be happy to keep unrelated changes split up in the future, but I don't > > see how I could've possibly named this one better. :P > > Having slept on it, I suppose "Web Inspector: [Layers] Fixes for popover and > data retrieval" would've worked. Bugzilla makes life tricky, haha. That is much better. But it sounds like you got bad advice from the channel. If you are indeed fixing two distinct and separate issues, it would be better to file two bugs and put up two patches. This way, if one of the changes regresses something and needs to be rolled out, it can be rolled out without affecting the other change. Likewise bisecting revisions for regressions can be more fine grained. Reviewing can be easier. There are many benefits to small patches. 1372110 14 webkit-bug-importer 2017-11-15 12:13:59 -0800 <rdar://problem/35567171> 325986 2017-11-03 16:28:15 -0700 2017-11-03 17:06:17 -0700 Patch fixes.patch text/plain 4590 ross.kirsling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJlZDFkNWE3NWY2Li42MzRlNWFmYjFmYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMTEtMDMgIFJvc3Mg S2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFR3byBsaXR0bGUgTGF5ZXJzIHRhYiBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MjczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWls c1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuc2VsZWN0Tm9kZUJ5TGF5ZXJJZCk6CisgICAgICAgIEV2ZW4gd2hlbiB3ZSBzdXBw cmVzcyByZWZpcmUgb2YgdGhlIHNlbGVjdGVkIGV2ZW50LCB3ZSBzdGlsbCB3YW50IGEgcG9wb3Zl ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuTGF5ZXJz M0RDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICAoV0kuTGF5ZXJzM0RDb250 ZW50Vmlldy5wcm90b3R5cGUuaGlkZGVuKToKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZp ZXcucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnBy b3RvdHlwZS5fbGF5ZXJUcmVlRGlkQ2hhbmdlKToKKyAgICAgICAgT3BlbmluZyBXSSBkaXJlY3Rs eSB0byB0aGUgTGF5ZXJzIHRhYiB3YXNuJ3QgZmV0Y2hpbmcgbGF5ZXJzIHJpZ2h0IGF3YXkuIExl dCdzIGZldGNoIG9uIGV2ZXJ5IHNob3duKCkgYW5kCisgICAgICAgIHBydW5lIHRoZSBoYWNreSBs b2dpYyB3ZSB3ZXJlIHByZXZpb3VzbHkgdXNpbmcgLS0gaXQncyBvdmVya2lsbCBhbnl3YXksIG5v dyB0aGF0IHdlJ3JlIHRyYWNraW5nIG11dGF0aW9ucy4KKwogMjAxNy0xMS0wMyAgUm9zcyBLaXJz bGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog TW92ZSBTaG93IENvbXBvc2l0aW5nIEJvcmRlcnMvUGFpbnQgRmxhc2hpbmcgYnV0dG9ucyBmcm9t IEVsZW1lbnRzIHRhYiB0byBMYXllcnMgdGFiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRl YmFyUGFuZWwuanMKaW5kZXggOGY3NWUwNzdhYjAuLjE4YjZiNGMwYmNkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRl YmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC02OCw5ICs2OCwxMCBAQCBXSS5MYXll ckRldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBMYXllckRldGFpbHNTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS5EZXRhaWxzUwogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNvbnN0IHN1 cHByZXNzRXZlbnQgPSB0cnVlOwotICAgICAgICBpZiAobm9kZSkKKyAgICAgICAgaWYgKG5vZGUp IHsKICAgICAgICAgICAgIG5vZGUucmV2ZWFsQW5kU2VsZWN0KHN1cHByZXNzRXZlbnQpOwotICAg ICAgICBlbHNlIGlmICh0aGlzLl9kYXRhR3JpZC5zZWxlY3RlZE5vZGUpCisgICAgICAgICAgICB0 aGlzLl9zaG93UG9wb3ZlckZvclNlbGVjdGVkTm9kZSgpOworICAgICAgICB9IGVsc2UgaWYgKHRo aXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZSkKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNl bGVjdGVkTm9kZS5kZXNlbGVjdChzdXBwcmVzc0V2ZW50KTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyczNEQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXll cnMzRENvbnRlbnRWaWV3LmpzCmluZGV4IDlkYWU0ZWYwMjAwLi5kMDgxYzkwNmIyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCkBAIC00MiwxMiArNDIsOSBAQCBXSS5MYXllcnMz RENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5h Y3RpdmF0ZWQgPSBQYWdlQWdlbnQuc2V0U2hvd1BhaW50UmVjdHMgJiYgV0kuc2hvd1BhaW50UmVj dHNTZXR0aW5nLnZhbHVlOwogICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdh dGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0 eVByaW9yaXR5LkxvdzsKIAotICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLmFkZEV2ZW50TGlz dGVuZXIoV0kuTGF5ZXJUcmVlTWFuYWdlci5FdmVudC5MYXllclRyZWVEaWRDaGFuZ2UsIHRoaXMu X2xheWVyVHJlZURpZENoYW5nZSwgdGhpcyk7Ci0KICAgICAgICAgdGhpcy5fbGF5ZXJzID0gW107 CiAgICAgICAgIHRoaXMuX2xheWVyR3JvdXBzQnlJZCA9IG5ldyBNYXA7CiAgICAgICAgIHRoaXMu X3NlbGVjdGVkTGF5ZXJHcm91cCA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2xheWVyc0NoYW5nZWRX aGlsZUhpZGRlbiA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX3JlbmRlcmVyID0gbnVsbDsKICAg ICAgICAgdGhpcy5fY2FtZXJhID0gbnVsbDsKQEAgLTc4LDE4ICs3NSwxNiBAQCBXSS5MYXllcnMz RENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAKICAgICAgICAgdGhpcy5fdXBkYXRlQ29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uU3Rh dGUoKTsKIAotICAgICAgICBpZiAodGhpcy5fbGF5ZXJzQ2hhbmdlZFdoaWxlSGlkZGVuKSB7Ci0g ICAgICAgICAgICB0aGlzLl9sYXllcnNDaGFuZ2VkV2hpbGVIaWRkZW4gPSBmYWxzZTsKLQotICAg ICAgICAgICAgdGhpcy51cGRhdGVMYXlvdXQoKTsKLSAgICAgICAgfQotCisgICAgICAgIHRoaXMu dXBkYXRlTGF5b3V0KCk7CiAgICAgICAgIGlmICh0aGlzLmRpZEluaXRpYWxMYXlvdXQpCiAgICAg ICAgICAgICB0aGlzLl9hbmltYXRlKCk7CisKKyAgICAgICAgV0kubGF5ZXJUcmVlTWFuYWdlci5h ZGRFdmVudExpc3RlbmVyKFdJLkxheWVyVHJlZU1hbmFnZXIuRXZlbnQuTGF5ZXJUcmVlRGlkQ2hh bmdlLCB0aGlzLl9sYXllclRyZWVEaWRDaGFuZ2UsIHRoaXMpOwogICAgIH0KIAogICAgIGhpZGRl bigpCiAgICAgeworICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVu ZXIoV0kuTGF5ZXJUcmVlTWFuYWdlci5FdmVudC5MYXllclRyZWVEaWRDaGFuZ2UsIHRoaXMuX2xh eWVyVHJlZURpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3N0b3BBbmltYXRpb24oKTsK IAogICAgICAgICBzdXBlci5oaWRkZW4oKTsKQEAgLTk4LDcgKzkzLDYgQEAgV0kuTGF5ZXJzM0RD b250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmlldwogICAgIGNsb3NlZCgpCiAgICAgewogICAgICAgICBXSS5zaG93UGFpbnRSZWN0c1NldHRp bmcucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3No b3dQYWludFJlY3RzU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwotICAgICAgICBXSS5sYXllclRyZWVN YW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuTGF5ZXJUcmVlTWFuYWdlci5FdmVudC5MYXll clRyZWVEaWRDaGFuZ2UsIHRoaXMuX2xheWVyVHJlZURpZENoYW5nZSwgdGhpcyk7CiAKICAgICAg ICAgc3VwZXIuY2xvc2VkKCk7CiAgICAgfQpAQCAtMTc1LDExICsxNjksNiBAQCBXSS5MYXllcnMz RENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAKICAgICBfbGF5ZXJUcmVlRGlkQ2hhbmdlKGV2ZW50KQogICAgIHsKLSAgICAgICAg aWYgKCF0aGlzLnZpc2libGUpIHsKLSAgICAgICAgICAgIHRoaXMuX2xheWVyc0NoYW5nZWRXaGls ZUhpZGRlbiA9IHRydWU7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAgICAg ICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQog 325991 2017-11-03 17:06:17 -0700 2017-11-06 16:52:50 -0800 Patch fixes.patch text/plain 4599 ross.kirsling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJlZDFkNWE3NWY2Li42MzRlNWFmYjFmYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMTEtMDMgIFJvc3Mg S2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFR3byBsaXR0bGUgTGF5ZXJzIHRhYiBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MjczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWls c1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuc2VsZWN0Tm9kZUJ5TGF5ZXJJZCk6CisgICAgICAgIEV2ZW4gd2hlbiB3ZSBzdXBw cmVzcyByZWZpcmUgb2YgdGhlIHNlbGVjdGVkIGV2ZW50LCB3ZSBzdGlsbCB3YW50IGEgcG9wb3Zl ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuTGF5ZXJz M0RDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICAoV0kuTGF5ZXJzM0RDb250 ZW50Vmlldy5wcm90b3R5cGUuaGlkZGVuKToKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZp ZXcucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnBy b3RvdHlwZS5fbGF5ZXJUcmVlRGlkQ2hhbmdlKToKKyAgICAgICAgT3BlbmluZyBXSSBkaXJlY3Rs eSB0byB0aGUgTGF5ZXJzIHRhYiB3YXNuJ3QgZmV0Y2hpbmcgbGF5ZXJzIHJpZ2h0IGF3YXkuIExl dCdzIGZldGNoIG9uIGV2ZXJ5IHNob3duKCkgYW5kCisgICAgICAgIHBydW5lIHRoZSBoYWNreSBs b2dpYyB3ZSB3ZXJlIHByZXZpb3VzbHkgdXNpbmcgLS0gaXQncyBvdmVya2lsbCBhbnl3YXksIG5v dyB0aGF0IHdlJ3JlIHRyYWNraW5nIG11dGF0aW9ucy4KKwogMjAxNy0xMS0wMyAgUm9zcyBLaXJz bGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog TW92ZSBTaG93IENvbXBvc2l0aW5nIEJvcmRlcnMvUGFpbnQgRmxhc2hpbmcgYnV0dG9ucyBmcm9t IEVsZW1lbnRzIHRhYiB0byBMYXllcnMgdGFiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRl YmFyUGFuZWwuanMKaW5kZXggOGY3NWUwNzdhYjAuLjE4YjZiNGMwYmNkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFpbHNTaWRl YmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC02OCw5ICs2OCwxMCBAQCBXSS5MYXll ckRldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBMYXllckRldGFpbHNTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS5EZXRhaWxzUwogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNvbnN0IHN1 cHByZXNzRXZlbnQgPSB0cnVlOwotICAgICAgICBpZiAobm9kZSkKKyAgICAgICAgaWYgKG5vZGUp IHsKICAgICAgICAgICAgIG5vZGUucmV2ZWFsQW5kU2VsZWN0KHN1cHByZXNzRXZlbnQpOwotICAg ICAgICBlbHNlIGlmICh0aGlzLl9kYXRhR3JpZC5zZWxlY3RlZE5vZGUpCisgICAgICAgICAgICB0 aGlzLl9zaG93UG9wb3ZlckZvclNlbGVjdGVkTm9kZSgpOworICAgICAgICB9IGVsc2UgaWYgKHRo aXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZSkKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNl bGVjdGVkTm9kZS5kZXNlbGVjdChzdXBwcmVzc0V2ZW50KTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyczNEQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXll cnMzRENvbnRlbnRWaWV3LmpzCmluZGV4IDlkYWU0ZWYwMjAwLi41ZmI3MzkwZTA0NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCkBAIC00MiwxMiArNDIsOSBAQCBXSS5MYXllcnMz RENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5h Y3RpdmF0ZWQgPSBQYWdlQWdlbnQuc2V0U2hvd1BhaW50UmVjdHMgJiYgV0kuc2hvd1BhaW50UmVj dHNTZXR0aW5nLnZhbHVlOwogICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdh dGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0 eVByaW9yaXR5LkxvdzsKIAotICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLmFkZEV2ZW50TGlz dGVuZXIoV0kuTGF5ZXJUcmVlTWFuYWdlci5FdmVudC5MYXllclRyZWVEaWRDaGFuZ2UsIHRoaXMu X2xheWVyVHJlZURpZENoYW5nZSwgdGhpcyk7Ci0KICAgICAgICAgdGhpcy5fbGF5ZXJzID0gW107 CiAgICAgICAgIHRoaXMuX2xheWVyR3JvdXBzQnlJZCA9IG5ldyBNYXA7CiAgICAgICAgIHRoaXMu X3NlbGVjdGVkTGF5ZXJHcm91cCA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2xheWVyc0NoYW5nZWRX aGlsZUhpZGRlbiA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX3JlbmRlcmVyID0gbnVsbDsKICAg ICAgICAgdGhpcy5fY2FtZXJhID0gbnVsbDsKQEAgLTc4LDE4ICs3NSwxNiBAQCBXSS5MYXllcnMz RENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAKICAgICAgICAgdGhpcy5fdXBkYXRlQ29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uU3Rh dGUoKTsKIAotICAgICAgICBpZiAodGhpcy5fbGF5ZXJzQ2hhbmdlZFdoaWxlSGlkZGVuKSB7Ci0g ICAgICAgICAgICB0aGlzLl9sYXllcnNDaGFuZ2VkV2hpbGVIaWRkZW4gPSBmYWxzZTsKLQotICAg ICAgICAgICAgdGhpcy51cGRhdGVMYXlvdXQoKTsKLSAgICAgICAgfQotCisgICAgICAgIHRoaXMu dXBkYXRlTGF5b3V0KCk7CisgICAgICAgIFdJLmxheWVyVHJlZU1hbmFnZXIuYWRkRXZlbnRMaXN0 ZW5lcihXSS5MYXllclRyZWVNYW5hZ2VyLkV2ZW50LkxheWVyVHJlZURpZENoYW5nZSwgdGhpcy5f bGF5ZXJUcmVlRGlkQ2hhbmdlLCB0aGlzKTsKKyAgICAgICAgCiAgICAgICAgIGlmICh0aGlzLmRp ZEluaXRpYWxMYXlvdXQpCiAgICAgICAgICAgICB0aGlzLl9hbmltYXRlKCk7CiAgICAgfQogCiAg ICAgaGlkZGVuKCkKICAgICB7CisgICAgICAgIFdJLmxheWVyVHJlZU1hbmFnZXIucmVtb3ZlRXZl bnRMaXN0ZW5lcihXSS5MYXllclRyZWVNYW5hZ2VyLkV2ZW50LkxheWVyVHJlZURpZENoYW5nZSwg dGhpcy5fbGF5ZXJUcmVlRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgdGhpcy5fc3RvcEFuaW1h dGlvbigpOwogCiAgICAgICAgIHN1cGVyLmhpZGRlbigpOwpAQCAtOTgsNyArOTMsNiBAQCBXSS5M YXllcnMzRENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRWaWV3CiAgICAgY2xvc2VkKCkKICAgICB7CiAgICAgICAgIFdJLnNob3dQYWludFJl Y3RzU2V0dGluZy5yZW1vdmVFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwg dGhpcy5fc2hvd1BhaW50UmVjdHNTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7Ci0gICAgICAgIFdJLmxh eWVyVHJlZU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5MYXllclRyZWVNYW5hZ2VyLkV2 ZW50LkxheWVyVHJlZURpZENoYW5nZSwgdGhpcy5fbGF5ZXJUcmVlRGlkQ2hhbmdlLCB0aGlzKTsK IAogICAgICAgICBzdXBlci5jbG9zZWQoKTsKICAgICB9CkBAIC0xNzUsMTEgKzE2OSw2IEBAIFdJ LkxheWVyczNEQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnMzRENvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29udGVudFZpZXcKIAogICAgIF9sYXllclRyZWVEaWRDaGFuZ2UoZXZlbnQpCiAgICAgewot ICAgICAgICBpZiAoIXRoaXMudmlzaWJsZSkgewotICAgICAgICAgICAgdGhpcy5fbGF5ZXJzQ2hh bmdlZFdoaWxlSGlkZGVuID0gdHJ1ZTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot CiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CiAK