218126 2020-10-23 08:59:43 -0700 Web Inspector: Promote experimental "Show independent Styles sidebar" setting to "Elements" settings tab and enable by default 2021-01-08 13:10:52 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1701024 0 pangle 2020-10-23 08:59:43 -0700 Add/modify sidebar layout control to support states beyond just Shown/Hidden to provide control over the appearance of multiple sidebars (when enabled). A couple considerations here include: - What happens when multiple sidebars can't be shown, which can change as the window is resized. - It should be easy to just click to toggle between the two states the user wants (probably the current state and previous state). - There should be minimal/no difference in the presentation of the control when multiple sidebars are or aren't available. 1703075 1 webkit-bug-importer 2020-10-30 09:00:43 -0700 <rdar://problem/70879134> 1718092 2 417214 pangle 2021-01-07 14:39:26 -0800 Created attachment 417214 Patch v1.0 1718096 3 417214 hi 2021-01-07 15:04:47 -0800 Comment on attachment 417214 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=417214&action=review r=me > Source/WebInspectorUI/UserInterface/Base/Setting.js:197 > + enableIndependentStylesPanel: new WI.Setting("independent-styles-panel", true), FYI if you wanted to be very "accurate" then you'd probably want to replace the `true` with `WI.Setting.migrateValue("experimental-independent-styles-panel") ?? true`, as that would preserve the old value and remove it from `localStorage`. Not necessary to do since this was experimental, but something to keep in mind as you modify any saved data :) NIT: while you're at it, can you add "Elements" and "Details" in there somewhere so it's a bit more clear what it's referring to? e.g. "enableElementsTabIndependentStylesDetailsSidebarPanel" :P > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:288 > + elementsSettingsView.addSetting(WI.UIString("Styles Sidebar:", "Styles Sidebar: @ Settings Elements Tab", "Category label for Styles sidebar settings."), WI.settings.enableIndependentStylesPanel, WI.UIString("Show independent Styles sidebar", "Show independent Styles sidebar @ Settings Elements Tab", "Settings tab checkbox label for whether the independent styles sidebar should be shown")); It seems a bit repetitive to have "Styles Sidebar" in both the label and the checkbox text. How about having the label be something more generic like "Details Sidebars" so that we could maybe use it for other things in the future too (e.g. if we instead wanted to allow the Computed panel to be independent then we could make these into radio buttons)? Also, we refer to these as "panes" in our documentation <https://webkit.org/web-inspector/web-inspector-settings/#elements> so please use that instead of "tab" :) 1718347 4 417278 pangle 2021-01-08 11:00:01 -0800 Created attachment 417278 Patch v1.1 - Review Notes 1718418 5 ews-feeder 2021-01-08 13:10:50 -0800 Committed r271319: <https://trac.webkit.org/changeset/271319> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417278. 417214 2021-01-07 14:39:26 -0800 2021-01-08 10:59:59 -0800 Patch v1.0 bug-218126-20210107173925.patch text/plain 7784 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk NDExOTkxODFiYjc2ZjllMjllZTg2MDU0ZDRlMjg4YTY4MmQ5MTU5Li5iOTBmYmNiODc3YmE4Zjg1 ZDUwMWVmYzM4NzkyZjIxOTgwMDUyOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wMS0wNyAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvbW90ZSBleHBlcmltZW50YWwgIlNob3cgaW5k ZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIiIHNldHRpbmcgdG8gIkVsZW1lbnRzIiBzZXR0aW5ncyB0 YWIgYW5kIGVuYWJsZSBieSBkZWZhdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTgxMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAg LSBSZW1vdmUgZXhwZXJpbWVudGFsIG5hbWluZyBmcm9tIHNldHRpbmcgYW5kIGVuYWJsZSBieSBk ZWZhdWx0LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNT aWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5SdWxlc1N0eWxlRGV0YWlsc1NpZGViYXJQYW5l bC5wcm90b3R5cGUuZ2V0IGFsbG93RXhjbHVzaXZlUHJlc2VudGF0aW9uKToKKyAgICAgICAgKFdJ LlJ1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1Rh YkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRWxlbWVudHNTZXR0aW5nc1ZpZXcpOgorICAg ICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUV4cGVyaW1l bnRhbFNldHRpbmdzVmlldyk6CisgICAgICAgIC0gTW92ZSBzZXR0aW5nIHRvICJFbGVtZW50cyIg c3ViLXRhYi4KKwogMjAyMC0xMi0xMCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2hvdyBjdXJyZW50IHByb3BlcnRpZXMgZm9yIGZv bnQgaW4gbmV3IEVsZW1lbnRzIHNpZGViYXIgRm9udCBwYW5lbApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKaW5kZXggYzJkZWZmMTFlZGFhNzhiNjI4ODY0NjUwOWMxZTEyOGIxOWYyNTkw Yy4uMDQ1NThmMzk0MTU3ZDgxNTZlOWFhYWRmMzJiZDA3NzE4NjA1ZTIxMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0xMjk2LDcgKzEyOTYsOCBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJTaG93IGFsbCByZXNvdXJjZXMiXSA9ICJTaG93IGFsbCByZXNvdXJjZXMiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIl0gPSAiU2hvdyBjb21wb3NpdGlu ZyBib3JkZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgZnVsbCBjZXJ0aWZpY2F0ZSJdID0g IlNob3cgZnVsbCBjZXJ0aWZpY2F0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGhpZGRlbiB0 YWJzIl0gPSAiU2hvdyBoaWRkZW4gdGFicyI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGluZGVw ZW5kZW50IFN0eWxlcyBzaWRlYmFyIl0gPSAiU2hvdyBpbmRlcGVuZGVudCBTdHlsZXMgc2lkZWJh ciI7CisvKiBTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRoZXIgdGhlIGluZGVw ZW5kZW50IHN0eWxlcyBzaWRlYmFyIHNob3VsZCBiZSBzaG93biAqLworbG9jYWxpemVkU3RyaW5n c1siU2hvdyBpbmRlcGVuZGVudCBTdHlsZXMgc2lkZWJhciBAIFNldHRpbmdzIEVsZW1lbnRzIFRh YiJdID0gIlNob3cgaW5kZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIiOwogbG9jYWxpemVkU3RyaW5n c1siU2hvdyBqdW1wIHRvIGVmZmVjdGl2ZSBwcm9wZXJ0eSBidXR0b24iXSA9ICJTaG93IGp1bXAg dG8gZWZmZWN0aXZlIHByb3BlcnR5IGJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGp1 bXAgdG8gdmFyaWFibGUgZGVjbGFyYXRpb24gYnV0dG9uIl0gPSAiU2hvdyBqdW1wIHRvIHZhcmlh YmxlIGRlY2xhcmF0aW9uIGJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IG9ubHkgZm9y IHNlbGVjdGVkIG5vZGUiXSA9ICJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiOwpAQCAtMTM5 NSw2ICsxMzk2LDggQEAgbG9jYWxpemVkU3RyaW5nc1siU3R5bGUgcnVsZSJdID0gIlN0eWxlIHJ1 bGUiOwogbG9jYWxpemVkU3RyaW5nc1siU3R5bGVzIl0gPSAiU3R5bGVzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlN0eWxlcyBJbnZhbGlkYXRlZCJdID0gIlN0eWxlcyBJbnZhbGlkYXRlZCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTdHlsZXMgUmVjYWxjdWxhdGVkIl0gPSAiU3R5bGVzIFJlY2FsY3VsYXRl ZCI7CisvKiBDYXRlZ29yeSBsYWJlbCBmb3IgU3R5bGVzIHNpZGViYXIgc2V0dGluZ3MuICovCits b2NhbGl6ZWRTdHJpbmdzWyJTdHlsZXMgU2lkZWJhcjogQCBTZXR0aW5ncyBFbGVtZW50cyBUYWIi XSA9ICJTdHlsZXMgU2lkZWJhcjoiOwogbG9jYWxpemVkU3RyaW5nc1siU3R5bGVzIFx1MjAxNCBD b21wdXRlZCJdID0gIlN0eWxlcyBcdTIwMTQgQ29tcHV0ZWQiOwogbG9jYWxpemVkU3RyaW5nc1si U3R5bGVzIFx1MjAxNCBSdWxlcyJdID0gIlN0eWxlcyBcdTIwMTQgUnVsZXMiOwogbG9jYWxpemVk U3RyaW5nc1siU3R5bGVzOiJdID0gIlN0eWxlczoiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDI0NDhhYWJjNjI1NDQy ZDgwNzVlMjA4MzRkZmZjY2U1NDBkZDRlMzQuLjIyMTliNzlmZmE2YTA3M2FjOWFjZTdkNDYxZDI1 OTUxOWQwNTcwZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTE5NCw2ICsxOTQsNyBAQCBXSS5zZXR0aW5ncyA9IHsK ICAgICBjcHVUaW1lbGluZVRocmVhZERldGFpbHNFeHBhbmRlZDogbmV3IFdJLlNldHRpbmcoImNw dS10aW1lbGluZS10aHJlYWQtZGV0YWlscy1leHBhbmRlZCIsIGZhbHNlKSwKICAgICBlbXVsYXRl SW5Vc2VyR2VzdHVyZTogbmV3IFdJLlNldHRpbmcoImVtdWxhdGUtaW4tdXNlci1nZXN0dXJlIiwg ZmFsc2UpLAogICAgIGVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXI6IG5ldyBXSS5TZXR0aW5nKCJl bmFibGUtY29udHJvbC1mbG93LXByb2ZpbGVyIiwgZmFsc2UpLAorICAgIGVuYWJsZUluZGVwZW5k ZW50U3R5bGVzUGFuZWw6IG5ldyBXSS5TZXR0aW5nKCJpbmRlcGVuZGVudC1zdHlsZXMtcGFuZWwi LCB0cnVlKSwKICAgICBlbmFibGVMaW5lV3JhcHBpbmc6IG5ldyBXSS5TZXR0aW5nKCJlbmFibGUt bGluZS13cmFwcGluZyIsIHRydWUpLAogICAgIGZyb250ZW5kQXBwZWFyYW5jZTogbmV3IFdJLlNl dHRpbmcoImZyb250ZW5kLWFwcGVhcmFuY2UiLCAic3lzdGVtIiksCiAgICAgZ3JvdXBNZWRpYVJl cXVlc3RzQnlET01Ob2RlOiBuZXcgV0kuU2V0dGluZygiZ3JvdXAtbWVkaWEtcmVxdWVzdHMtYnkt ZG9tLW5vZGUiLCBXSS5TZXR0aW5nLm1pZ3JhdGVWYWx1ZSgiZ3JvdXAtYnktZG9tLW5vZGUiKSB8 fCBmYWxzZSksCkBAIC0yMjIsNyArMjIzLDYgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgZXhwZXJp bWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFs LWVuYWJsZS1wcmV2aWV3LWZlYXR1cmVzIiwgdHJ1ZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxl U3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLXN0eWxl cy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVTdHls ZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFs LXN0eWxlcy1qdW1wLXRvLXZhcmlhYmxlLWRlY2xhcmF0aW9uIiwgZmFsc2UpLAotICAgIGV4cGVy aW1lbnRhbEVuYWJsZUluZGVwZW5kZW50U3R5bGVzUGFuZWw6IG5ldyBXSS5TZXR0aW5nKCJleHBl cmltZW50YWwtaW5kZXBlbmRlbnQtc3R5bGVzLXBhbmVsIiwgZmFsc2UpLAogICAgIGV4cGVyaW1l bnRhbEVuYWJsZUZvbnREZXRhaWxzUGFuZWw6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwt Zm9udC1kZXRhaWxzLXBhbmVsIiwgZmFsc2UpLAogCiAgICAgLy8gUHJvdG9jb2wKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVE ZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggNWMxMmJhNmU3 NzRjODMwNDlmMGFiNzNmMTUyZDNmYTU3ODZjNmU2OC4uNTQ4OTcxZWJjNzYzNzg0ZmNiY2U2OWJl ZTc1MzM0NzcyODM3OTY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNT aWRlYmFyUGFuZWwuanMKQEAgLTM0LDYgKzM0LDYgQEAgV0kuUnVsZXNTdHlsZURldGFpbHNTaWRl YmFyUGFuZWwgPSBjbGFzcyBSdWxlc1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFcK IAogICAgIGdldCBhbGxvd0V4Y2x1c2l2ZVByZXNlbnRhdGlvbigpCiAgICAgewotICAgICAgICBy ZXR1cm4gV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlSW5kZXBlbmRlbnRTdHlsZXNQYW5l bC52YWx1ZTsKKyAgICAgICAgcmV0dXJuIFdJLnNldHRpbmdzLmVuYWJsZUluZGVwZW5kZW50U3R5 bGVzUGFuZWwudmFsdWU7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRW aWV3LmpzCmluZGV4IDc0ZjVjNmI4NTJhY2JlZWRiNWI3ZDBhM2I3MjFiZjk3NDc2YTQwZWMuLjE1 ODYyMTk4OWY1YTk3MWViMDAxZjNlODA4MTQ5MDJkZTBiMjdiMDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjg1LDYgKzI4NSw5IEBAIFdJLlNldHRpbmdzVGFi Q29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFi Q29udGVudFZpCiAgICAgICAgICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXBhcmF0b3Io KTsKICAgICAgICAgfQogCisgICAgICAgIGVsZW1lbnRzU2V0dGluZ3NWaWV3LmFkZFNldHRpbmco V0kuVUlTdHJpbmcoIlN0eWxlcyBTaWRlYmFyOiIsICJTdHlsZXMgU2lkZWJhcjogQCBTZXR0aW5n cyBFbGVtZW50cyBUYWIiLCAiQ2F0ZWdvcnkgbGFiZWwgZm9yIFN0eWxlcyBzaWRlYmFyIHNldHRp bmdzLiIpLCBXSS5zZXR0aW5ncy5lbmFibGVJbmRlcGVuZGVudFN0eWxlc1BhbmVsLCBXSS5VSVN0 cmluZygiU2hvdyBpbmRlcGVuZGVudCBTdHlsZXMgc2lkZWJhciIsICJTaG93IGluZGVwZW5kZW50 IFN0eWxlcyBzaWRlYmFyIEAgU2V0dGluZ3MgRWxlbWVudHMgVGFiIiwgIlNldHRpbmdzIHRhYiBj aGVja2JveCBsYWJlbCBmb3Igd2hldGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIg c2hvdWxkIGJlIHNob3duIikpOworICAgICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXBh cmF0b3IoKTsKKwogICAgICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJ U3RyaW5nKCJDU1MgQ2hhbmdlczoiKSwgV0kuc2V0dGluZ3MuY3NzQ2hhbmdlc1Blck5vZGUsIFdJ LlVJU3RyaW5nKCJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiKSk7CiAKICAgICAgICAgdGhp cy5fY3JlYXRlUmVmZXJlbmNlTGluayhlbGVtZW50c1NldHRpbmdzVmlldyk7CkBAIC00MDAsNyAr NDAzLDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgfQogCiAgICAgICAgIGxl dCBlbGVtZW50c0dyb3VwID0gZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJ U3RyaW5nKCJFbGVtZW50cyBUYWI6IiwgIkVsZW1lbnRzIFRhYjogQCBFeHBlcmltZW50YWwgU2V0 dGluZ3MiLCAiQ2F0ZWdvcnkgbGFiZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyBwZXJ0YWlu aW5nIHRvIHRoZSBFbGVtZW50cyB0YWIiKSk7Ci0gICAgICAgIGVsZW1lbnRzR3JvdXAuYWRkU2V0 dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVJbmRlcGVuZGVudFN0eWxlc1BhbmVs LCBXSS5VSVN0cmluZygiU2hvdyBpbmRlcGVuZGVudCBTdHlsZXMgc2lkZWJhciIpKTsKICAgICAg ICAgZWxlbWVudHNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJs ZUZvbnREZXRhaWxzUGFuZWwsIFdJLlVJU3RyaW5nKCJTaG93IEZvbnQgZGV0YWlscyBzaWRlYmFy IHBhbmVsIikpOwogICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9y KCk7CiAKQEAgLTQyNyw3ICs0MjksNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xh c3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAg ICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxl c0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgbGlzdGVu Rm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUluZGVwZW5kZW50U3R5bGVz UGFuZWwpOwogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFs RW5hYmxlRm9udERldGFpbHNQYW5lbCk7CiAKICAgICAgICAgdGhpcy5fY3JlYXRlUmVmZXJlbmNl TGluayhleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOwo= 417278 2021-01-08 11:00:01 -0800 2021-01-08 13:10:51 -0800 Patch v1.1 - Review Notes bug-218126-20210108140000.patch text/plain 7997 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk NDExOTkxODFiYjc2ZjllMjllZTg2MDU0ZDRlMjg4YTY4MmQ5MTU5Li5jOTAxMmU5ZGZiNmFlYmEx OTVkNGU4YzdiMThhMzY4MTNjOWI1NGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wMS0wNyAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvbW90ZSBleHBlcmltZW50YWwgIlNob3cgaW5k ZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIiIHNldHRpbmcgdG8gIkVsZW1lbnRzIiBzZXR0aW5ncyBw YW5lIGFuZCBlbmFibGUgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE4MTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91 c3NvLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAt IFJlbW92ZSBleHBlcmltZW50YWwgbmFtaW5nIGZyb20gc2V0dGluZyBhbmQgZW5hYmxlIGJ5IGRl ZmF1bHQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1Np ZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlJ1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVs LnByb3RvdHlwZS5nZXQgYWxsb3dFeGNsdXNpdmVQcmVzZW50YXRpb24pOgorICAgICAgICAoV0ku UnVsZXNTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFi Q29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVFbGVtZW50c1NldHRpbmdzVmlldyk6CisgICAg ICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVu dGFsU2V0dGluZ3NWaWV3KToKKyAgICAgICAgLSBNb3ZlIHNldHRpbmcgdG8gIkVsZW1lbnRzIiBz ZXR0aW5ncyBwYW5lLgorCiAyMDIwLTEyLTEwICBQYXRyaWNrIEFuZ2xlICA8cGFuZ2xlQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTaG93IGN1cnJlbnQgcHJvcGVydGllcyBm b3IgZm9udCBpbiBuZXcgRWxlbWVudHMgc2lkZWJhciBGb250IHBhbmVsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwppbmRleCBjMmRlZmYxMWVkYWE3OGI2Mjg4NjQ2NTA5YzFlMTI4YjE5 ZjI1OTBjLi40YTI4NGI3ODNlZTdjNjMwMzIyNTczOWQxYzM2OGFlMTE0MDRkMWI3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTQ0MCw2ICs0NDAsOCBAQCBsb2NhbGl6ZWRT dHJpbmdzWyJEZXRhY2hlZCJdID0gIkRldGFjaGVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRldGFp bHMiXSA9ICJEZXRhaWxzIjsKIC8qIExhYmVsIGZvciB0aGUgZGV0YWlscyBzaWRlYmFyLiAqLwog bG9jYWxpemVkU3RyaW5nc1siRGV0YWlscyBAIFNpZGViYXIiXSA9ICJEZXRhaWxzIjsKKy8qIENh dGVnb3J5IGxhYmVsIGZvciBkZXRhaWwgc2lkZWJhciBzZXR0aW5ncy4gKi8KK2xvY2FsaXplZFN0 cmluZ3NbIkRldGFpbHMgU2lkZWJhcnM6IEAgU2V0dGluZ3MgRWxlbWVudHMgUGFuZSJdID0gIkRl dGFpbHMgU2lkZWJhcnM6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkRldmljZSAlZCJdID0gIkRldmlj ZSAlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZXZpY2UgU2V0dGluZ3MiXSA9ICJEZXZpY2UgU2V0 dGluZ3MiOwogbG9jYWxpemVkU3RyaW5nc1siRGlhZ25vc2VzIGNvbW1vbiBhY2Nlc3NpYmlsaXR5 IHByb2JsZW1zIGFmZmVjdGluZyBzY3JlZW4gcmVhZGVycyBhbmQgb3RoZXIgYXNzaXN0aXZlIHRl Y2hub2xvZ3kuIl0gPSAiRGlhZ25vc2VzIGNvbW1vbiBhY2Nlc3NpYmlsaXR5IHByb2JsZW1zIGFm ZmVjdGluZyBzY3JlZW4gcmVhZGVycyBhbmQgb3RoZXIgYXNzaXN0aXZlIHRlY2hub2xvZ3kuIjsK QEAgLTEyOTYsNyArMTI5OCw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgYWxsIHJlc291cmNl cyJdID0gIlNob3cgYWxsIHJlc291cmNlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGNvbXBv c2l0aW5nIGJvcmRlcnMiXSA9ICJTaG93IGNvbXBvc2l0aW5nIGJvcmRlcnMiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBmdWxsIGNlcnRpZmljYXRlIl0gPSAiU2hvdyBmdWxsIGNlcnRpZmljYXRl IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgaGlkZGVuIHRhYnMiXSA9ICJTaG93IGhpZGRlbiB0 YWJzIjsKLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgaW5kZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIi XSA9ICJTaG93IGluZGVwZW5kZW50IFN0eWxlcyBzaWRlYmFyIjsKKy8qIFNldHRpbmdzIHRhYiBj aGVja2JveCBsYWJlbCBmb3Igd2hldGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIg c2hvdWxkIGJlIHNob3duICovCitsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGluZGVwZW5kZW50IFN0 eWxlcyBzaWRlYmFyIEAgU2V0dGluZ3MgRWxlbWVudHMgUGFuZSJdID0gIlNob3cgaW5kZXBlbmRl bnQgU3R5bGVzIHNpZGViYXIiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBqdW1wIHRvIGVmZmVj dGl2ZSBwcm9wZXJ0eSBidXR0b24iXSA9ICJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHByb3BlcnR5 IGJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGp1bXAgdG8gdmFyaWFibGUgZGVjbGFy YXRpb24gYnV0dG9uIl0gPSAiU2hvdyBqdW1wIHRvIHZhcmlhYmxlIGRlY2xhcmF0aW9uIGJ1dHRv biI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiXSA9ICJT aG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDI0NDhhYWJjNjI1NDQyZDgw NzVlMjA4MzRkZmZjY2U1NDBkZDRlMzQuLjUxY2FjN2U0YjYzNjcyYzZkZmFmMTlkNjM4ZDAyMDgx MzMyYThiNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NldHRpbmcuanMKQEAgLTE5NCw2ICsxOTQsNyBAQCBXSS5zZXR0aW5ncyA9IHsKICAg ICBjcHVUaW1lbGluZVRocmVhZERldGFpbHNFeHBhbmRlZDogbmV3IFdJLlNldHRpbmcoImNwdS10 aW1lbGluZS10aHJlYWQtZGV0YWlscy1leHBhbmRlZCIsIGZhbHNlKSwKICAgICBlbXVsYXRlSW5V c2VyR2VzdHVyZTogbmV3IFdJLlNldHRpbmcoImVtdWxhdGUtaW4tdXNlci1nZXN0dXJlIiwgZmFs c2UpLAogICAgIGVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXI6IG5ldyBXSS5TZXR0aW5nKCJlbmFi bGUtY29udHJvbC1mbG93LXByb2ZpbGVyIiwgZmFsc2UpLAorICAgIGVuYWJsZUVsZW1lbnRzVGFi SW5kZXBlbmRlbnRTdHlsZXNEZXRhaWxzU2lkZWJhclBhbmVsOiBuZXcgV0kuU2V0dGluZygiZWxl bWVudHMtdGFiLWluZGVwZW5kZW50LXN0eWxlcy1kZXRhaWxzLXBhbmVsIiwgdHJ1ZSksCiAgICAg ZW5hYmxlTGluZVdyYXBwaW5nOiBuZXcgV0kuU2V0dGluZygiZW5hYmxlLWxpbmUtd3JhcHBpbmci LCB0cnVlKSwKICAgICBmcm9udGVuZEFwcGVhcmFuY2U6IG5ldyBXSS5TZXR0aW5nKCJmcm9udGVu ZC1hcHBlYXJhbmNlIiwgInN5c3RlbSIpLAogICAgIGdyb3VwTWVkaWFSZXF1ZXN0c0J5RE9NTm9k ZTogbmV3IFdJLlNldHRpbmcoImdyb3VwLW1lZGlhLXJlcXVlc3RzLWJ5LWRvbS1ub2RlIiwgV0ku U2V0dGluZy5taWdyYXRlVmFsdWUoImdyb3VwLWJ5LWRvbS1ub2RlIikgfHwgZmFsc2UpLApAQCAt MjIyLDcgKzIyMyw2IEBAIFdJLnNldHRpbmdzID0gewogICAgIGV4cGVyaW1lbnRhbEVuYWJsZVBy ZXZpZXdGZWF0dXJlczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtcHJldmll dy1mZWF0dXJlcyIsIHRydWUpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb0Vm ZmVjdGl2ZTogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1zdHlsZXMtanVtcC10by1lZmZl Y3RpdmUiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFi bGVEZWNsYXJhdGlvbjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1zdHlsZXMtanVtcC10 by12YXJpYWJsZS1kZWNsYXJhdGlvbiIsIGZhbHNlKSwKLSAgICBleHBlcmltZW50YWxFbmFibGVJ bmRlcGVuZGVudFN0eWxlc1BhbmVsOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWluZGVw ZW5kZW50LXN0eWxlcy1wYW5lbCIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVGb250 RGV0YWlsc1BhbmVsOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWZvbnQtZGV0YWlscy1w YW5lbCIsIGZhbHNlKSwKIAogICAgIC8vIFByb3RvY29sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1NpZGViYXJQ YW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVz U3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDVjMTJiYTZlNzc0YzgzMDQ5ZjBhYjcz ZjE1MmQzZmE1Nzg2YzZlNjguLmFjNWRmOTU2MzZhZjc2ZjQwYzc1MGM1ZDQ4ZjVhYzBhMGFmZTZl MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1J1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpz CkBAIC0zNCw2ICszNCw2IEBAIFdJLlJ1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xh c3MgUnVsZXNTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAKICAgICBnZXQgYWxs b3dFeGNsdXNpdmVQcmVzZW50YXRpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFdJLnNldHRp bmdzLmV4cGVyaW1lbnRhbEVuYWJsZUluZGVwZW5kZW50U3R5bGVzUGFuZWwudmFsdWU7CisgICAg ICAgIHJldHVybiBXSS5zZXR0aW5ncy5lbmFibGVFbGVtZW50c1RhYkluZGVwZW5kZW50U3R5bGVz RGV0YWlsc1NpZGViYXJQYW5lbC52YWx1ZTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdz VGFiQ29udGVudFZpZXcuanMKaW5kZXggNzRmNWM2Yjg1MmFjYmVlZGI1YjdkMGEzYjcyMWJmOTc0 NzZhNDBlYy4uMWI0MmRjNWZlOTY0YzYyMjFiYjZiZmI4Njc5NmY4MmY2ZjI1MDFmYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NU YWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0yODUsNiArMjg1LDkgQEAgV0ku U2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGVsZW1lbnRzU2V0dGluZ3NWaWV3LmFk ZFNlcGFyYXRvcigpOwogICAgICAgICB9CiAKKyAgICAgICAgZWxlbWVudHNTZXR0aW5nc1ZpZXcu YWRkU2V0dGluZyhXSS5VSVN0cmluZygiRGV0YWlscyBTaWRlYmFyczoiLCAiRGV0YWlscyBTaWRl YmFyczogQCBTZXR0aW5ncyBFbGVtZW50cyBQYW5lIiwgIkNhdGVnb3J5IGxhYmVsIGZvciBkZXRh aWwgc2lkZWJhciBzZXR0aW5ncy4iKSwgV0kuc2V0dGluZ3MuZW5hYmxlRWxlbWVudHNUYWJJbmRl cGVuZGVudFN0eWxlc0RldGFpbHNTaWRlYmFyUGFuZWwsIFdJLlVJU3RyaW5nKCJTaG93IGluZGVw ZW5kZW50IFN0eWxlcyBzaWRlYmFyIiwgIlNob3cgaW5kZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIg QCBTZXR0aW5ncyBFbGVtZW50cyBQYW5lIiwgIlNldHRpbmdzIHRhYiBjaGVja2JveCBsYWJlbCBm b3Igd2hldGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIgc2hvdWxkIGJlIHNob3du IikpOworICAgICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKKwogICAg ICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJDU1MgQ2hh bmdlczoiKSwgV0kuc2V0dGluZ3MuY3NzQ2hhbmdlc1Blck5vZGUsIFdJLlVJU3RyaW5nKCJTaG93 IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiKSk7CiAKICAgICAgICAgdGhpcy5fY3JlYXRlUmVmZXJl bmNlTGluayhlbGVtZW50c1NldHRpbmdzVmlldyk7CkBAIC00MDAsNyArNDAzLDYgQEAgV0kuU2V0 dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgfQogCiAgICAgICAgIGxldCBlbGVtZW50c0dyb3Vw ID0gZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJFbGVtZW50 cyBUYWI6IiwgIkVsZW1lbnRzIFRhYjogQCBFeHBlcmltZW50YWwgU2V0dGluZ3MiLCAiQ2F0ZWdv cnkgbGFiZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyBwZXJ0YWluaW5nIHRvIHRoZSBFbGVt ZW50cyB0YWIiKSk7Ci0gICAgICAgIGVsZW1lbnRzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5n cy5leHBlcmltZW50YWxFbmFibGVJbmRlcGVuZGVudFN0eWxlc1BhbmVsLCBXSS5VSVN0cmluZygi U2hvdyBpbmRlcGVuZGVudCBTdHlsZXMgc2lkZWJhciIpKTsKICAgICAgICAgZWxlbWVudHNHcm91 cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUZvbnREZXRhaWxzUGFu ZWwsIFdJLlVJU3RyaW5nKCJTaG93IEZvbnQgZGV0YWlscyBzaWRlYmFyIHBhbmVsIikpOwogICAg ICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7CiAKQEAgLTQyNyw3 ICs0MjksNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJD b250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICAgICAgbGlzdGVuRm9y Q2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb1ZhcmlhYmxl RGVjbGFyYXRpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNl dHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUluZGVwZW5kZW50U3R5bGVzUGFuZWwpOwogICAgICAg ICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlRm9udERldGFp bHNQYW5lbCk7CiAKICAgICAgICAgdGhpcy5fY3JlYXRlUmVmZXJlbmNlTGluayhleHBlcmltZW50 YWxTZXR0aW5nc1ZpZXcpOwo=