203377 2019-10-24 11:23:38 -0700 Web Inspector: CONSOLE ERROR Shown panel style-rules must be visible 2019-10-31 10:19:13 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 yurys yurys commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1583429 0 yurys 2019-10-24 11:23:38 -0700 The following error is printed to the console when opening Web Inspector: resource:///org/webkit/inspector/UserInterface/Views/GeneralStyleDetailsSidebarPanel.js:66:23: CONSOLE ERROR Shown panel style-rules must be visible. false 1583431 1 yurys 2019-10-24 11:28:48 -0700 shown@resource:///org/webkit/inspector/UserInterface/Views/GeneralStyleDetailsSidebarPanel.js:66:131 selectedSidebarPanel@resource:///org/webkit/inspector/UserInterface/Views/Sidebar.js:139:45 showDetailsSidebarPanels@resource:///org/webkit/inspector/UserInterface/Views/ContentBrowserTabContentView.js:200:38 _contentBrowserCurrentRepresentedObjectsDidChange@resource:///org/webkit/inspector/UserInterface/Views/ContentBrowserTabContentView.js:331:38 dispatch@resource:///org/webkit/inspector/UserInterface/Base/Object.js:165:30 dispatchEventToListeners@resource:///org/webkit/inspector/UserInterface/Base/Object.js:172:17 resource:///org/webkit/inspector/UserInterface/Views/ContentBrowser.js:96:42 _execute@resource:///org/webkit/inspector/UserInterface/Base/Debouncer.js:132:29 resource:///org/webkit/inspector/UserInterface/Base/Debouncer.js:75:26 1583555 2 381847 yurys 2019-10-24 15:29:48 -0700 Created attachment 381847 Patch 1585501 3 381847 hi 2019-10-30 14:10:07 -0700 Comment on attachment 381847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381847&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:212 > - if (!WI.detailsSidebar.sidebarPanels.length) > + if (!currentSidebarPanels.length) This change shouldn't actually modify any logic. `currentSidebarPanels` should be a reference to the same array instance as `WI.detailsSidebar.sidebarPanels`. As such, please revert this. > Source/WebInspectorUI/UserInterface/Views/Sidebar.js:139 > + if (!this.collapsed) { This part looks fine, but I'd like to test it myself before I say yes/no. 1585532 4 381847 yurys 2019-10-30 14:52:12 -0700 Comment on attachment 381847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381847&action=review >> Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:212 >> + if (!currentSidebarPanels.length) > > This change shouldn't actually modify any logic. `currentSidebarPanels` should be a reference to the same array instance as `WI.detailsSidebar.sidebarPanels`. As such, please revert this. Yes, it doesn't change any logic. Its a leftover from me try to fix the logic in this method first. A mix of currentSidebarPanels.length and WI.detailsSidebar.sidebarPanels.length in this method is somewhat confusing that's why I updated that for consistency. So let me know if you'd still prefer to revert it. >> Source/WebInspectorUI/UserInterface/Views/Sidebar.js:139 >> + if (!this.collapsed) { > > This part looks fine, but I'd like to test it myself before I say yes/no. SG. 1585785 5 381847 hi 2019-10-30 22:31:37 -0700 Comment on attachment 381847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381847&action=review r=me, I think this is fine. I tried moving around between various tabs and changing state when certain panels weren't visible and it didn't seem to cause any regressions. >>> Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:212 >>> + if (!currentSidebarPanels.length) >> >> This change shouldn't actually modify any logic. `currentSidebarPanels` should be a reference to the same array instance as `WI.detailsSidebar.sidebarPanels`. As such, please revert this. > > Yes, it doesn't change any logic. Its a leftover from me try to fix the logic in this method first. A mix of currentSidebarPanels.length and WI.detailsSidebar.sidebarPanels.length in this method is somewhat confusing that's why I updated that for consistency. So let me know if you'd still prefer to revert it. I think I'd prefer it as it was (and even to have the other cases of `currentSidebarPanels` be removed/renamed), as there's no immediate indication that `currentSidebarPanels` is ever modified. Since we're calling a bunch of `add*`/`remove*` methods on `WI.detailsSidebar`, it makes more sense that we'd check it there. Plus, using `currentSidebarPanels` because it's the same object is an implementation detail that could theoretically change in the future, and we'd never know about it causing issues here with the change. >>> Source/WebInspectorUI/UserInterface/Views/Sidebar.js:139 >>> + if (!this.collapsed) { >> >> This part looks fine, but I'd like to test it myself before I say yes/no. > > SG. Should we also be doing this for the `hidden()` call above? 1585939 6 382467 yurys 2019-10-31 09:34:54 -0700 Created attachment 382467 Patch for landing 1585940 7 381847 yurys 2019-10-31 09:35:29 -0700 Comment on attachment 381847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381847&action=review >>>> Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:212 >>>> + if (!currentSidebarPanels.length) >>> >>> This change shouldn't actually modify any logic. `currentSidebarPanels` should be a reference to the same array instance as `WI.detailsSidebar.sidebarPanels`. As such, please revert this. >> >> Yes, it doesn't change any logic. Its a leftover from me try to fix the logic in this method first. A mix of currentSidebarPanels.length and WI.detailsSidebar.sidebarPanels.length in this method is somewhat confusing that's why I updated that for consistency. So let me know if you'd still prefer to revert it. > > I think I'd prefer it as it was (and even to have the other cases of `currentSidebarPanels` be removed/renamed), as there's no immediate indication that `currentSidebarPanels` is ever modified. Since we're calling a bunch of `add*`/`remove*` methods on `WI.detailsSidebar`, it makes more sense that we'd check it there. Plus, using `currentSidebarPanels` because it's the same object is an implementation detail that could theoretically change in the future, and we'd never know about it causing issues here with the change. Agreed. Updated the code to not use currentSidebarPanels at all and access WI.detailsSidebar.sidebarPanels directly instead. >>>> Source/WebInspectorUI/UserInterface/Views/Sidebar.js:139 >>>> + if (!this.collapsed) { >>> >>> This part looks fine, but I'd like to test it myself before I say yes/no. >> >> SG. > > Should we also be doing this for the `hidden()` call above? I considered that but it could lead to a situation when hidden() is not called at all if the Sidebar is collapsed and _selectedSidebarPanel changes. 1585953 8 382467 commit-queue 2019-10-31 10:18:26 -0700 Comment on attachment 382467 Patch for landing Clearing flags on attachment: 382467 Committed r251853: <https://trac.webkit.org/changeset/251853> 1585954 9 commit-queue 2019-10-31 10:18:28 -0700 All reviewed patches have been landed. Closing bug. 1585957 10 webkit-bug-importer 2019-10-31 10:19:13 -0700 <rdar://problem/56785760> 381847 2019-10-24 15:29:48 -0700 2019-10-31 09:34:52 -0700 Patch bug-203377-20191024152947.patch text/plain 3401 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 MzhmYTc5ZTJmNDJhYWM1MTNkYmIzOTRmOTY1MTA1MjBmYjM2NzY5Li4zZjQ1NmI0YzE3YWMwYTli MTBiYTQwNWUzM2E2ZmU0MWI1ZmU5OGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0xMC0yNCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDT05TT0xFIEVSUk9SIFNob3duIHBhbmVs IHN0eWxlLXJ1bGVzIG11c3QgYmUgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRml4IGFzc2VydGlvbiBmYWlsdXJlIHdoZW4gb3BlbmluZyBl bGVtZW50cyBwYW5lbCB3aXRoIGhpZGRlbiBkZXRhaWxzIHNpZGViYXIuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXSS5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93RGV0YWls c1NpZGViYXJQYW5lbHMpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5q czoKKyAgICAgICAgKFdJLlNpZGViYXIucHJvdG90eXBlLnNldCBzZWxlY3RlZFNpZGViYXJQYW5l bCk6IE9ubHkgY2FsbCBzaG93bigpIGlmIHRoZSBTaWRlYmFyCisgICAgICAgIGlzIG5vdCBjb2xs YXBzZWQuIEl0IHdpbGwgYW55d2F5IGJlIGNhbGxlZCB3aGVuIHRoZSBTaWRlYmFyIGlzIGV4cGFu ZGVkLgorCiAyMDE5LTEwLTI0ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFzc2VydGlvbiBmYWlsdXJlIGF0IEdlbmVyYWxT dHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanM6MzQ6MjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDNlYzlhNzJlODM3OTc4NTQyZjUzMDdkZTZi YWI5MDY1MTk1MmVmZWIuLjQ0NjAzZjk3OTExODJiNDA2ZGYzMGZkZWVlMGM2MTBiN2JiOTU3ZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwpAQCAt MjA5LDcgKzIwOSw3IEBAIFdJLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBD b250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuCiAgICAgICAgIGlmICghV0ku ZGV0YWlsc1NpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwgJiYgY3VycmVudFNpZGViYXJQYW5l bHMubGVuZ3RoKQogICAgICAgICAgICAgV0kuZGV0YWlsc1NpZGViYXIuc2VsZWN0ZWRTaWRlYmFy UGFuZWwgPSBjdXJyZW50U2lkZWJhclBhbmVsc1swXTsKIAotICAgICAgICBpZiAoIVdJLmRldGFp bHNTaWRlYmFyLnNpZGViYXJQYW5lbHMubGVuZ3RoKQorICAgICAgICBpZiAoIWN1cnJlbnRTaWRl YmFyUGFuZWxzLmxlbmd0aCkKICAgICAgICAgICAgIFdJLmRldGFpbHNTaWRlYmFyLmNvbGxhcHNl ZCA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKHdhc1NpZGViYXJFbXB0eSkKICAgICAgICAgICAg IFdJLmRldGFpbHNTaWRlYmFyLmNvbGxhcHNlZCA9IHRoaXMuZGV0YWlsc1NpZGViYXJDb2xsYXBz ZWRTZXR0aW5nLnZhbHVlOwpAQCAtMjIwLDcgKzIyMCw3IEBAIFdJLkNvbnRlbnRCcm93c2VyVGFi Q29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuCiAgICAgICAgIGlmICghdGhpcy5kZXRhaWxzU2lkZWJhclBhbmVscy5sZW5ndGgpCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fc2hvd0RldGFpbHNTaWRlYmFySXRlbS5l bmFibGVkID0gV0kuZGV0YWlsc1NpZGViYXIuc2lkZWJhclBhbmVscy5sZW5ndGg7CisgICAgICAg IHRoaXMuX3Nob3dEZXRhaWxzU2lkZWJhckl0ZW0uZW5hYmxlZCA9IGN1cnJlbnRTaWRlYmFyUGFu ZWxzLmxlbmd0aDsKICAgICB9CiAKICAgICBzaG93UmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50 ZWRPYmplY3QsIGNvb2tpZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzCmluZGV4IDk5MDJkNjNiYjk5NmVkYWY5MDk0NGIzZGUw ODhkNmUzOTA0NjFlMWMuLjEwYTEzMTlmNTQ0MDRjYmI2NzZmZTIwZWQ4MzI5ZjNlMzU2NThlNTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Np ZGViYXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2lkZWJhci5qcwpAQCAtMTM2LDggKzEzNiwxMCBAQCBXSS5TaWRlYmFyID0gY2xhc3MgU2lkZWJh ciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkU2lkZWJhclBhbmVs KSB7CiAgICAgICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fc2VsZWN0ZWRTaWRlYmFyUGFu ZWwpOwogICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTaWRlYmFyUGFuZWwuc2VsZWN0ZWQgPSB0 cnVlOwotICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTaWRlYmFyUGFuZWwuc2hvd24oKTsKLSAg ICAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2lkZWJhclBhbmVsLnZpc2liaWxpdHlEaWRDaGFuZ2Uo KTsKKyAgICAgICAgICAgIGlmICghdGhpcy5jb2xsYXBzZWQpIHsKKyAgICAgICAgICAgICAgICB0 aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbC5zaG93bigpOworICAgICAgICAgICAgICAgIHRoaXMu X3NlbGVjdGVkU2lkZWJhclBhbmVsLnZpc2liaWxpdHlEaWRDaGFuZ2UoKTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJ LlNpZGViYXIuRXZlbnQuU2lkZWJhclBhbmVsU2VsZWN0ZWQpOwo= 382467 2019-10-31 09:34:54 -0700 2019-10-31 10:18:26 -0700 Patch for landing bug-203377-20191031093453.patch text/plain 4195 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl MWNhYWY3NjViYzc2ZTZiZWJlNGVkZjQyZjIyNzU1Y2FjYTAwZjU4Li5iNzc3NjljODkwYzFhNTMw YmFlMDc3MjhhNjA1OGMyYjY3ZDRmYWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0xMC0yNCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDT05TT0xFIEVSUk9SIFNob3duIHBhbmVs IHN0eWxlLXJ1bGVzIG11c3QgYmUgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4g Um91c3NvLgorCisgICAgICAgIEZpeCBhc3NlcnRpb24gZmFpbHVyZSB3aGVuIG9wZW5pbmcgZWxl bWVudHMgcGFuZWwgd2l0aCBoaWRkZW4gZGV0YWlscyBzaWRlYmFyLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV0kuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd0RldGFpbHNT aWRlYmFyUGFuZWxzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanM6 CisgICAgICAgIChXSS5TaWRlYmFyLnByb3RvdHlwZS5zZXQgc2VsZWN0ZWRTaWRlYmFyUGFuZWwp OiBPbmx5IGNhbGwgc2hvd24oKSBpZiB0aGUgU2lkZWJhcgorICAgICAgICBpcyBub3QgY29sbGFw c2VkLiBJdCB3aWxsIGFueXdheSBiZSBjYWxsZWQgd2hlbiB0aGUgU2lkZWJhciBpcyBleHBhbmRl ZC4KKwogMjAxOS0xMC0zMCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiB0cmFjayBXSS5TY3JpcHQgdW5pcXVlIGRpc3BsYXkg bmFtZSBudW1iZXJzIHBlciBQYWdlIHRhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93 c2VyVGFiQ29udGVudFZpZXcuanMKaW5kZXggM2VjOWE3MmU4Mzc5Nzg1NDJmNTMwN2RlNmJhYjkw NjUxOTUyZWZlYi4uYjZiYTA1NTA2YjVhMWU4MTkzMmJjZTdmNDI4MTI4OGFmMTY4MDBmMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVu dEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC0xNzMs OCArMTczLDcgQEAgV0kuQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIENvbnRl bnRCcm93c2VyVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS4KICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICB2YXIgY3VycmVudFJlcHJlc2VudGVkT2JqZWN0cyA9IHRoaXMuX2NvbnRlbnRC cm93c2VyLmN1cnJlbnRSZXByZXNlbnRlZE9iamVjdHM7Ci0gICAgICAgIHZhciBjdXJyZW50U2lk ZWJhclBhbmVscyA9IFdJLmRldGFpbHNTaWRlYmFyLnNpZGViYXJQYW5lbHM7Ci0gICAgICAgIHZh ciB3YXNTaWRlYmFyRW1wdHkgPSAhY3VycmVudFNpZGViYXJQYW5lbHMubGVuZ3RoOworICAgICAg ICB2YXIgd2FzU2lkZWJhckVtcHR5ID0gIVdJLmRldGFpbHNTaWRlYmFyLnNpZGViYXJQYW5lbHMu bGVuZ3RoOwogCiAgICAgICAgIC8vIElnbm9yZSBhbnkgY2hhbmdlcyB0byB0aGUgc2VsZWN0ZWQg c2lkZWJhciBwYW5lbCBkdXJpbmcgdGhpcyBmdW5jdGlvbiBzbyBvbmx5IHVzZXIgaW5pdGlhdGVk CiAgICAgICAgIC8vIGNoYW5nZXMgYXJlIHJlY29yZGVkIGluIF9sYXN0U2VsZWN0ZWREZXRhaWxz U2lkZWJhclBhbmVsU2V0dGluZy4KQEAgLTE4Niw3ICsxODUsNyBAQCBXSS5Db250ZW50QnJvd3Nl clRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBleHRl bmRzIFdJLgogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuZGV0YWlsc1NpZGViYXJQ YW5lbHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBzaWRlYmFyUGFuZWwgPSB0aGlz LmRldGFpbHNTaWRlYmFyUGFuZWxzW2ldOwogICAgICAgICAgICAgaWYgKHNpZGViYXJQYW5lbC5p bnNwZWN0KGN1cnJlbnRSZXByZXNlbnRlZE9iamVjdHMpKSB7Ci0gICAgICAgICAgICAgICAgaWYg KGN1cnJlbnRTaWRlYmFyUGFuZWxzLmluY2x1ZGVzKHNpZGViYXJQYW5lbCkpIHsKKyAgICAgICAg ICAgICAgICBpZiAoV0kuZGV0YWlsc1NpZGViYXIuc2lkZWJhclBhbmVscy5pbmNsdWRlcyhzaWRl YmFyUGFuZWwpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIEFscmVhZHkgc2hvd2luZyB0aGUg cGFuZWwuCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0K QEAgLTIwNiw4ICsyMDUsOCBAQCBXSS5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0gY2xh c3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLgogICAgICAgICAgICAg fQogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFXSS5kZXRhaWxzU2lkZWJhci5zZWxlY3RlZFNp ZGViYXJQYW5lbCAmJiBjdXJyZW50U2lkZWJhclBhbmVscy5sZW5ndGgpCi0gICAgICAgICAgICBX SS5kZXRhaWxzU2lkZWJhci5zZWxlY3RlZFNpZGViYXJQYW5lbCA9IGN1cnJlbnRTaWRlYmFyUGFu ZWxzWzBdOworICAgICAgICBpZiAoIVdJLmRldGFpbHNTaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBh bmVsICYmIFdJLmRldGFpbHNTaWRlYmFyLnNpZGViYXJQYW5lbHMubGVuZ3RoKQorICAgICAgICAg ICAgV0kuZGV0YWlsc1NpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwgPSBXSS5kZXRhaWxzU2lk ZWJhci5zaWRlYmFyUGFuZWxzWzBdOwogCiAgICAgICAgIGlmICghV0kuZGV0YWlsc1NpZGViYXIu c2lkZWJhclBhbmVscy5sZW5ndGgpCiAgICAgICAgICAgICBXSS5kZXRhaWxzU2lkZWJhci5jb2xs YXBzZWQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2lkZWJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NpZGViYXIuanMKaW5kZXggOTkwMmQ2M2JiOTk2ZWRhZjkwOTQ0YjNkZTA4OGQ2 ZTM5MDQ2MWUxYy4uMTBhMTMxOWY1NDQwNGNiYjY3NmZlMjBlZDgzMjlmM2UzNTY1OGU1MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJh ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRl YmFyLmpzCkBAIC0xMzYsOCArMTM2LDEwIEBAIFdJLlNpZGViYXIgPSBjbGFzcyBTaWRlYmFyIGV4 dGVuZHMgV0kuVmlldwogICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRTaWRlYmFyUGFuZWwpIHsK ICAgICAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbCk7 CiAgICAgICAgICAgICB0aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbC5zZWxlY3RlZCA9IHRydWU7 Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbC5zaG93bigpOwotICAgICAg ICAgICAgdGhpcy5fc2VsZWN0ZWRTaWRlYmFyUGFuZWwudmlzaWJpbGl0eURpZENoYW5nZSgpOwor ICAgICAgICAgICAgaWYgKCF0aGlzLmNvbGxhcHNlZCkgeworICAgICAgICAgICAgICAgIHRoaXMu X3NlbGVjdGVkU2lkZWJhclBhbmVsLnNob3duKCk7CisgICAgICAgICAgICAgICAgdGhpcy5fc2Vs ZWN0ZWRTaWRlYmFyUGFuZWwudmlzaWJpbGl0eURpZENoYW5nZSgpOworICAgICAgICAgICAgfQog ICAgICAgICB9CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2lk ZWJhci5FdmVudC5TaWRlYmFyUGFuZWxTZWxlY3RlZCk7Cg==