215387 2020-08-11 12:15:13 -0700 REGRESSION (r265224): Web Inspector: LOCALIZED STRING NOT FOUND next to the Image checkbox in the Sources prefs panel 2020-08-14 10:22:46 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev pangle bburg ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1679493 0 nvasilyev 2020-08-11 12:15:13 -0700 Broke in Bug 215101 - Web Inspector: "Show transparency grid" string needs to be disambiguated for localization 1679494 1 406401 nvasilyev 2020-08-11 12:16:53 -0700 Created attachment 406401 Patch 1679495 2 nvasilyev 2020-08-11 12:18:40 -0700 I ran Tools/Scripts/update-webkit-localizable-strings to generate this patch. 1679499 3 webkit-bug-importer 2020-08-11 12:28:56 -0700 <rdar://problem/66855263> 1679504 4 bburg 2020-08-11 12:38:27 -0700 I don't understand how this fix could be correct. The original patch was supposed to create two localizable strings. Now there's only one. 1679509 5 nvasilyev 2020-08-11 12:46:40 -0700 How did you generate Localizations/en.lproj/localizedStrings.js in your patch? 1679513 6 nvasilyev 2020-08-11 12:52:52 -0700 When two parameters are passed to WI.UIString, they are "string" and "comment" (not a key!): ``` WI.UIString = function(string, key, comment) { "use strict"; if (WI.dontLocalizeUserInterface) return string; // UIString(string, comment) if (arguments.length === 2) { ``` It seems to me you want to specify two different keys. One way to do that would be to specify the 3rd parameter. Brian, do you want to take this bug? 1679525 7 bburg 2020-08-11 13:23:49 -0700 (In reply to Nikita Vasilyev from comment #6) > When two parameters are passed to WI.UIString, they are "string" and > "comment" (not a key!): > > ``` > WI.UIString = function(string, key, comment) > { > "use strict"; > > if (WI.dontLocalizeUserInterface) > return string; > > // UIString(string, comment) > if (arguments.length === 2) { > ``` > > It seems to me you want to specify two different keys. One way to do that > would be to specify the 3rd parameter. > > Brian, do you want to take this bug? Ugh, I hate positional parameters. I'll fix this today. 1679611 8 406427 pangle 2020-08-11 15:38:55 -0700 Created attachment 406427 Patch 1679612 9 406427 nvasilyev 2020-08-11 15:47:22 -0700 Comment on attachment 406427 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406427&action=review > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:1153 > -localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; > +/* Show transparency grid */ > localizedStrings["Show transparency grid (settings label)"] = "Show transparency grid"; > +/* Show transparency grid */ > +localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; We don't copy the same text as a comment. While this fixes the bug, that's not a good practice. The comments provide localizers with some context. Check out other comments in this file to get a better idea of an appropriate comment. 1679618 10 406427 hi 2020-08-11 15:56:29 -0700 Comment on attachment 406427 Patch What you have is fine (nice first bug!), butto echo @Brian Burg (In reply to Brian Burg from comment #7) > Ugh, I hate positional parameters. I'll fix this today. I feel like a better long-term solution to this would be to just eliminate the `(string, comment)` variant and instead always require a `key` if a `comment` is needed (a `key` can sometimes be enough of a comment anyways, such as bug). That way, bugs like this can be avoided :) If you want to do that, we'd need to change: - `Source/Tools/Scripts/extract-localizable-js-strings` to not use the 2nd argument as the `comment` when only 2 arguments are provided - `WI.UIString` to not swap the `comment` and `key` when only 2 arguments are provided - existing callers of `WI.UIString` (this can be done quickly just by looking at `Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js`) This logic was added in r245827, so I'd recommend looking at that to see how it used to be before :) 1679622 11 406429 pangle 2020-08-11 16:07:44 -0700 Created attachment 406429 Patch 1679623 12 bburg 2020-08-11 16:07:53 -0700 (In reply to Devin Rousso from comment #10) > Comment on attachment 406427 [details] > Patch > > What you have is fine (nice first bug!), butto echo @Brian Burg > > (In reply to Brian Burg from comment #7) > > Ugh, I hate positional parameters. I'll fix this today. > > I feel like a better long-term solution to this would be to just eliminate > the `(string, comment)` variant and instead always require a `key` if a > `comment` is needed (a `key` can sometimes be enough of a comment anyways, > such as bug). That way, bugs like this can be avoided :) > > If you want to do that, we'd need to change: > - `Source/Tools/Scripts/extract-localizable-js-strings` to not use the 2nd > argument as the `comment` when only 2 arguments are provided > - `WI.UIString` to not swap the `comment` and `key` when only 2 arguments > are provided > - existing callers of `WI.UIString` (this can be done quickly just by > looking at > `Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js`) > > This logic was added in r245827, so I'd recommend looking at that to see how > it used to be before :) Agree, but let's make a separate bug. Here: https://bugs.webkit.org/show_bug.cgi?id=215400 1679626 13 pangle 2020-08-11 16:10:38 -0700 (In reply to Nikita Vasilyev from comment #9) > Comment on attachment 406427 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406427&action=review > > > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:1153 > > -localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; > > +/* Show transparency grid */ > > localizedStrings["Show transparency grid (settings label)"] = "Show transparency grid"; > > +/* Show transparency grid */ > > +localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; > > We don't copy the same text as a comment. While this fixes the bug, that's > not a good practice. > > The comments provide localizers with some context. Check out other comments > in this file to get a better idea of an appropriate comment. Thanks! I've updated the comments in the latest patch to provide better context as to where the strings appear. 1679633 14 406429 nvasilyev 2020-08-11 16:15:38 -0700 Comment on attachment 406429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406429&action=review > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:1153 > -localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; > +/* Settings tab checkbox label for whether the transparency grid is shown by default */ > localizedStrings["Show transparency grid (settings label)"] = "Show transparency grid"; > +/* Tooltip for showing the checkered transparency grid under images and canvases */ > +localizedStrings["Show transparency grid (tooltip)"] = "Show transparency grid"; It seems to me that you edited this file directly. This is an auto-generated file. You shouldn't edit it directly. Run `Tools/Scripts/update-webkit-localizable-strings` script to update it instead. > Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js:50 > + this._showGridButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-grid", WI.UIString("Show transparency grid", "Show transparency grid (tooltip)", "Show transparency grid"), WI.UIString("Hide transparency grid"), "Images/NavigationItemCheckers.svg", 13, 13); The comment should be the 3rd argument here. Instead of "Show transparency grid", it should be "Tooltip for showing ...". Same goes for every string you changed. 1679634 15 406429 hi 2020-08-11 16:18:16 -0700 Comment on attachment 406429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406429&action=review >> Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js:50 >> + this._showGridButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-grid", WI.UIString("Show transparency grid", "Show transparency grid (tooltip)", "Show transparency grid"), WI.UIString("Hide transparency grid"), "Images/NavigationItemCheckers.svg", 13, 13); > > The comment should be the 3rd argument here. Instead of "Show transparency grid", it should be "Tooltip for showing ...". > > Same goes for every string you changed. along these lines, it may be worth creating a `WI.repeatedUIString.showTransparencyGridTooltip` and a `WI.repeatedUIString.showTransparencyGridSetting` to save the trouble of repeating all these strings 1679635 16 nvasilyev 2020-08-11 16:20:41 -0700 (In reply to Devin Rousso from comment #15) > Comment on attachment 406429 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406429&action=review > > >> Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js:50 > >> + this._showGridButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-grid", WI.UIString("Show transparency grid", "Show transparency grid (tooltip)", "Show transparency grid"), WI.UIString("Hide transparency grid"), "Images/NavigationItemCheckers.svg", 13, 13); > > > > The comment should be the 3rd argument here. Instead of "Show transparency grid", it should be "Tooltip for showing ...". > > > > Same goes for every string you changed. > > along these lines, it may be worth creating a > `WI.repeatedUIString.showTransparencyGridTooltip` and a > `WI.repeatedUIString.showTransparencyGridSetting` to save the trouble of > repeating all these strings I was going to summit almost the same comment 😅 1679646 17 pangle 2020-08-11 16:32:24 -0700 (In reply to Devin Rousso from comment #15) > Comment on attachment 406429 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406429&action=review > > >> Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js:50 > >> + this._showGridButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-grid", WI.UIString("Show transparency grid", "Show transparency grid (tooltip)", "Show transparency grid"), WI.UIString("Hide transparency grid"), "Images/NavigationItemCheckers.svg", 13, 13); > > > > The comment should be the 3rd argument here. Instead of "Show transparency grid", it should be "Tooltip for showing ...". > > > > Same goes for every string you changed. > > along these lines, it may be worth creating a > `WI.repeatedUIString.showTransparencyGridTooltip` and a > `WI.repeatedUIString.showTransparencyGridSetting` to save the trouble of > repeating all these strings Is there any value in creating a `WI.repeatedUIString.showTransparencyGridSetting` given it is only used once for the Settings tab? The tooltip certainly makes sense to define once. 1679647 18 hi 2020-08-11 16:40:10 -0700 (In reply to Patrick Angle from comment #17) > Is there any value in creating a > `WI.repeatedUIString.showTransparencyGridSetting` given it is only used once for the Settings tab? The tooltip certainly makes sense to define once. oh yeah if it's only used once then no I wouldn't bother :P 1679659 19 406436 pangle 2020-08-11 16:59:12 -0700 Created attachment 406436 Patch 1679663 20 406436 hi 2020-08-11 17:04:08 -0700 Comment on attachment 406436 Patch r=me, nice work! As a general piece of feedback it's always a good idea to include additional info/context in the ChangeLog so that when looking back at this change in the future there's a concise and clear explanation of what and why. Even something as simple as "Create repeated `WI.UIString ` helper" would be helpful :) 1680312 21 ews-feeder 2020-08-14 10:22:45 -0700 Committed r265675: <https://trac.webkit.org/changeset/265675> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406436. 406401 2020-08-11 12:16:53 -0700 2020-08-11 15:38:53 -0700 Patch patch.txt text/plain 1765 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZiY2RjNjI4YjVhLi40OGZkOGUzMzQ3MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDgtMTEgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAo cjI2NTIyNCk6IFdlYiBJbnNwZWN0b3I6IExPQ0FMSVpFRCBTVFJJTkcgTk9UIEZPVU5EIG5leHQg dG8gdGhlIEltYWdlIGNoZWNrYm94IGluIHRoZSBTb3VyY2VzIHByZWZzIHBhbmVsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUzODcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAyMC0wOC0wNSAgVGltIEhvcnRvbiAg PHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgYWxsIHJlZmVyZW5j ZXMgdG8gbm9uLWV4aXN0ZW50IDEwLjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpp bmRleCA1ZTkzNDViNjJhOC4uNDAxMDlmYWRkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcwpAQCAtMTE0Nyw4ICsxMTQ3LDggQEAgbG9jYWxpemVkU3RyaW5nc1siU2hvdyBwYWdl IHJ1bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMiXSA9ICJTaG93IHBhZ2UgcnVsZXJzIGEKIGxv Y2FsaXplZFN0cmluZ3NbIlNob3cgcnVsZXJzIl0gPSAiU2hvdyBydWxlcnMiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcykiXSA9ICJTaG93IHRoZSBkZXRh aWxzIHNpZGViYXIgKCVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRoZSBuYXZpZ2F0aW9u IHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIjsKLWxv Y2FsaXplZFN0cmluZ3NbIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIl0gPSAiU2hv dyB0cmFuc3BhcmVuY3kgZ3JpZCI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRyYW5zcGFyZW5j eSBncmlkIChzZXR0aW5ncyBsYWJlbCkiXSA9ICJTaG93IHRyYW5zcGFyZW5jeSBncmlkIjsKKy8q IFNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApICovCitsb2NhbGl6ZWRTdHJpbmdzWyJT aG93IHRyYW5zcGFyZW5jeSBncmlkIl0gPSAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IHR5cGUgaW5mb3JtYXRpb24iXSA9ICJTaG93IHR5cGUgaW5mb3Jt YXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdzoiXSA9ICJTaG93OiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaXRlLXNwZWNpZmljIEhhY2tzIl0gPSAiU2l0ZS1zcGVjaWZpYyBIYWNrcyI7Cg== 406427 2020-08-11 15:38:55 -0700 2020-08-11 16:07:42 -0700 Patch bug-215387-20200811183854.patch text/plain 10939 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx Njc3YjE1Zjk4NDU1ZTljZGQyODg0YTMxYmZmNjA2NWM4OGQwOTcwLi5jYWI2MjE5ZDk0MDY1YjBk YmE3MDM1Y2E4MTFlZjNiZTNhNThkNjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0wOC0xMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NTIyNCk6IFdlYiBJbnNwZWN0b3I6IExPQ0FMSVpF RCBTVFJJTkcgTk9UIEZPVU5EIG5leHQgdG8gdGhlIEltYWdlIGNoZWNrYm94IGluIHRoZSBTb3Vy Y2VzIHByZWZzIHBhbmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTUzODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2ODU1MjYzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5DYW52YXNDb250ZW50Vmll dyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc092ZXJ2aWV3Q29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5HcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJl c291cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlU291cmNlc1NldHRpbmdzVmlldyk6CisKIDIwMjAt MDgtMDYgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogTWVkaWEgJiBBbmltYXRpb25zIHRpbWVsaW5lIHNob3VsZG4ndCBzaGlm dCB3aGVuIHNvcnRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDVlOTM0 NWI2MmE4ZmIwZDYyYmE1YTM4YjIyZmNlZDczZGEzMDRhMDkuLmYzYzZmOGE3MGM2ZWVlNjgyNmVi OTRmZDUwN2FjMzdlM2Q1ZDAyM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpA QCAtMTE0Nyw4ICsxMTQ3LDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSBydWxlcnMg YW5kIG5vZGUgYm9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1bGVycyBhCiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHJ1bGVycyJdID0gIlNob3cgcnVsZXJzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0aGUgZGV0YWlscyBzaWRl YmFyICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFy ICglcykiXSA9ICJTaG93IHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSI7Ci1sb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSJdID0gIlNob3cgdHJhbnNw YXJlbmN5IGdyaWQiOworLyogU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAqLwogbG9jYWxpemVkU3Ry aW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAoc2V0dGluZ3MgbGFiZWwpIl0gPSAiU2hvdyB0 cmFuc3BhcmVuY3kgZ3JpZCI7CisvKiBTaG93IHRyYW5zcGFyZW5jeSBncmlkICovCitsb2NhbGl6 ZWRTdHJpbmdzWyJTaG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSJdID0gIlNob3cgdHJh bnNwYXJlbmN5IGdyaWQiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0eXBlIGluZm9ybWF0aW9u Il0gPSAiU2hvdyB0eXBlIGluZm9ybWF0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3c6Il0g PSAiU2hvdzoiOwogbG9jYWxpemVkU3RyaW5nc1siU2l0ZS1zcGVjaWZpYyBIYWNrcyJdID0gIlNp dGUtc3BlY2lmaWMgSGFja3MiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcwppbmRleCAyNDgw NTg3ZWViMjFhZGQ3NjMzOTZkNTg2NjM2Yzc2YzE3OGIwNTM0Li5mY2UwYWNkNjhkNTY2ZmFlYTkx ZjAwMTU4MGMxZjJlMDljY2Y5MDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcwpAQCAt NDcsNyArNDcsNyBAQCBXSS5DYW52YXNDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc0NvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5h dmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2li aWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9u SXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNr ZWQsIHRoaXMuaGFuZGxlUmVmcmVzaEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogCi0gICAgICAgIHRo aXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25O YXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5 IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiKSwgV0kuVUlTdHJpbmco IkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbUNoZWNrZXJz LnN2ZyIsIDEzLCAxMyk7CisgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0 ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0ku VUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3Jp ZCAodG9vbHRpcCkiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIpLCBXSS5VSVN0cmluZygiSGlk ZSB0cmFuc3BhcmVuY3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtQ2hlY2tlcnMuc3Zn IiwgMTMsIDEzKTsKICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5h ZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRo aXMuX3Nob3dHcmlkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlk QnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0 ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25O YXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSAhIVdJLnNldHRpbmdzLnNob3dJbWFnZUdyaWQudmFs dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9HcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcuanMKaW5kZXgg YTg4MTg2MzMzOWU2MmFkN2M3Yjc2NzI3NWQxYzdmNTM5MWEyZGUxYy4uNDQ5ODUzY2Q4NjA2ZTc5 YWExNjFkYjM2MzliNmVhNmU3YzZjNTNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzT3Zl cnZpZXdDb250ZW50Vmlldy5qcwpAQCAtMzksNyArMzksNyBAQCBXSS5HcmFwaGljc092ZXJ2aWV3 Q29udGVudFZpZXcgPSBjbGFzcyBHcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBX SS5DbwogICAgICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0ku QnV0dG9uTmF2aWdhdGlvbkl0ZW0oInJlZnJlc2giLCBXSS5VSVN0cmluZygiUmVmcmVzaCIpLCAi SW1hZ2VzL1JlbG9hZEZ1bGwuc3ZnIiwgMTMsIDEzKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1 dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5faGFuZGxlUmVmcmVzaEJ1dHRvbkNsaWNrZWQsIHRoaXMp OwogCi0gICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0ku QWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNo b3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCki KSwgV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0 aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0 dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgi c2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0 cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIpLCBX SS5VSVN0cmluZygiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRpb25J dGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEzKTsKICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25O YXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSAhIVdJLnNldHRpbmdzLnNob3dJbWFnZUdyaWQudmFs dWU7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRM aXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9oYW5k bGVTaG93R3JpZEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291 cmNlQ29udGVudFZpZXcuanMKaW5kZXggNjg3NGE1YTFhZjNhYTNjYWQ3OTZhNjMxNTBmMzhiMzQ4 MGZmOGNlMy4uYTBkZTg1ZGMzZTRjYmQ1Mjk2YTE1ODYyNWMyZDNjZjY4ODM2ZDAxZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNv dXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMzUsNyArMzUsNyBAQCBX SS5JbWFnZVJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBJbWFnZVJlc291cmNlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5SZXNvdXJjZQogICAgICAgICB0aGlzLl9kcmFnZ2luZ0ludGVybmFsSW1h Z2VFbGVtZW50ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2Rpc2FibGVEcm9wWm9uZSA9IGRpc2Fi bGVEcm9wWm9uZSB8fCBmYWxzZTsKIAotICAgICAgICBjb25zdCB0b29sVGlwID0gV0kuVUlTdHJp bmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9v bHRpcCkiKTsKKyAgICAgICAgY29uc3QgdG9vbFRpcCA9IFdJLlVJU3RyaW5nKCJTaG93IHRyYW5z cGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiwgIlNob3cg dHJhbnNwYXJlbmN5IGdyaWQiKTsKICAgICAgICAgY29uc3QgYWN0aXZhdGVkVG9vbFRpcCA9IFdJ LlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIik7CiAgICAgICAgIHRoaXMuX3Nob3dH cmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9u SXRlbSgic2hvdy1ncmlkIiwgdG9vbFRpcCwgYWN0aXZhdGVkVG9vbFRpcCwgIkltYWdlcy9OYXZp Z2F0aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlk QnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0 ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcu anMKaW5kZXggNjRjOWQzOGQ3MzU3OGM1M2FiOGQxMmI4ZDdkZDBhNmYzZTUyOTYzYi4uOGFmNTQz NmU3YzdhNjYwNGEyY2E3MDczODExOTBmYmVhMDQyMDE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5n Q29udGVudFZpZXcuanMKQEAgLTU4LDcgKzU4LDcgQEAgV0kuUmVjb3JkaW5nQ29udGVudFZpZXcg PSBjbGFzcyBSZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAg ICAgICAgICAgICAgdGhpcy5fc2hvd1BhdGhCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQg PSAhIVdJLnNldHRpbmdzLnNob3dDYW52YXNQYXRoLnZhbHVlOwogICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFj dGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJTaG93 IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiks IFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdhdGlv bkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOworICAgICAgICAgICAgdGhpcy5fc2hvd0dyaWRC dXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVt KCJzaG93LWdyaWQiLCBXSS5VSVN0cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJTaG93 IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiks IFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdhdGlv bkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOwogICAgICAgICAgICAgdGhpcy5fc2hvd0dyaWRC dXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRl bS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0 b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVt LkV2ZW50LkNsaWNrZWQsIHRoaXMuX3Nob3dHcmlkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAg ICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9ICEh V0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29sbGVjdGlvbkNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMKaW5kZXggZGRmMTExNTQ4MzdmNmM5NjMxMGQ5NWU1 MGUwNjM2YmQ0YmM3ZDRhYi4uZmQ0NmJlNTc1M2Q2NzI2ZjIxYWE4OTk1NjE1NDY0OGMwMWZkMjJm NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMK QEAgLTM4LDcgKzM4LDcgQEAgV0kuUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcgPSBjbGFz cyBSZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50VmlldyBleHRlbmRzIFcKICAgICAgICAgdGhpcy5l bGVtZW50LmNsYXNzTGlzdC5hZGQoInJlc291cmNlLWNvbGxlY3Rpb24iKTsKIAogICAgICAgICBp ZiAoY29sbGVjdGlvbi5yZXNvdXJjZVR5cGUgPT09IFdJLlJlc291cmNlLlR5cGUuSW1hZ2UpIHsK LSAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0ku QWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNo b3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCki KSwgV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0 aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgICAgICB0aGlzLl9zaG93R3Jp ZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0 ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNo b3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQi KSwgV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0 aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3Jp ZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlv bkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5faGFuZGxlU2hvd0dyaWRCdXR0b25DbGlja2VkLCB0 aGlzKTsKICAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlz aWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5Lkxv dzsKICAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZh dGVkID0gISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKaW5kZXggMzMwNGU4MGJjNTc0Mjc4YjdiODUyZTBlNWU3ZDAx OGEyOTUzNWNjNC4uMTk3ZTI1YjI5NjU1ODk0MDBjZmFjN2YxNjNjNDAxYjBhODg5ZTQzZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMDAsNyArMzAwLDcgQEAg V0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKIAogICAgICAgICBzb3VyY2VzU2V0dGluZ3NWaWV3LmFk ZFNlcGFyYXRvcigpOwogCi0gICAgICAgIHNvdXJjZXNTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhX SS5VSVN0cmluZygiSW1hZ2VzOiIpLCBXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLCBXSS5VSVN0 cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlkIChz ZXR0aW5ncyBsYWJlbCkiKSk7CisgICAgICAgIHNvdXJjZXNTZXR0aW5nc1ZpZXcuYWRkU2V0dGlu ZyhXSS5VSVN0cmluZygiSW1hZ2VzOiIpLCBXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLCBXSS5V SVN0cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlk IChzZXR0aW5ncyBsYWJlbCkiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIpKTsKIAogICAgICAg ICB0aGlzLl9jcmVhdGVSZWZlcmVuY2VMaW5rKHNvdXJjZXNTZXR0aW5nc1ZpZXcpOwogCg== 406429 2020-08-11 16:07:44 -0700 2020-08-11 16:59:10 -0700 Patch bug-215387-20200811190743.patch text/plain 11054 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx Njc3YjE1Zjk4NDU1ZTljZGQyODg0YTMxYmZmNjA2NWM4OGQwOTcwLi5jYWI2MjE5ZDk0MDY1YjBk YmE3MDM1Y2E4MTFlZjNiZTNhNThkNjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0wOC0xMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NTIyNCk6IFdlYiBJbnNwZWN0b3I6IExPQ0FMSVpF RCBTVFJJTkcgTk9UIEZPVU5EIG5leHQgdG8gdGhlIEltYWdlIGNoZWNrYm94IGluIHRoZSBTb3Vy Y2VzIHByZWZzIHBhbmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTUzODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2ODU1MjYzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5DYW52YXNDb250ZW50Vmll dyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc092ZXJ2aWV3Q29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5HcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJl c291cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlU291cmNlc1NldHRpbmdzVmlldyk6CisKIDIwMjAt MDgtMDYgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogTWVkaWEgJiBBbmltYXRpb25zIHRpbWVsaW5lIHNob3VsZG4ndCBzaGlm dCB3aGVuIHNvcnRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDVlOTM0 NWI2MmE4ZmIwZDYyYmE1YTM4YjIyZmNlZDczZGEzMDRhMDkuLmE5MDMzZjQ4MDc5MjM1NjhiMmJm MGY1Mjc1MzI4ODU2NGNiODgyOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpA QCAtMTE0Nyw4ICsxMTQ3LDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSBydWxlcnMg YW5kIG5vZGUgYm9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1bGVycyBhCiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHJ1bGVycyJdID0gIlNob3cgcnVsZXJzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0aGUgZGV0YWlscyBzaWRl YmFyICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFy ICglcykiXSA9ICJTaG93IHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSI7Ci1sb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSJdID0gIlNob3cgdHJhbnNw YXJlbmN5IGdyaWQiOworLyogU2V0dGluZ3MgdGFiIGNoZWNrYm94IGxhYmVsIGZvciB3aGV0aGVy IHRoZSB0cmFuc3BhcmVuY3kgZ3JpZCBpcyBzaG93biBieSBkZWZhdWx0ICovCiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHRyYW5zcGFyZW5jeSBncmlkIChzZXR0aW5ncyBsYWJlbCkiXSA9ICJTaG93 IHRyYW5zcGFyZW5jeSBncmlkIjsKKy8qIFRvb2x0aXAgZm9yIHNob3dpbmcgdGhlIGNoZWNrZXJl ZCB0cmFuc3BhcmVuY3kgZ3JpZCB1bmRlciBpbWFnZXMgYW5kIGNhbnZhc2VzICAqLworbG9jYWxp emVkU3RyaW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiXSA9ICJTaG93IHRy YW5zcGFyZW5jeSBncmlkIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdHlwZSBpbmZvcm1hdGlv biJdID0gIlNob3cgdHlwZSBpbmZvcm1hdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93OiJd ID0gIlNob3c6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNpdGUtc3BlY2lmaWMgSGFja3MiXSA9ICJT aXRlLXNwZWNpZmljIEhhY2tzIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzQ29udGVudFZpZXcuanMKaW5kZXggMjQ4 MDU4N2VlYjIxYWRkNzYzMzk2ZDU4NjYzNmM3NmMxNzhiMDUzNC4uZmNlMGFjZDY4ZDU2NmZhZWE5 MWYwMDE1ODBjMWYyZTA5Y2NmOTAyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzQ29udGVudFZpZXcuanMKQEAg LTQ3LDcgKzQ3LDcgQEAgV0kuQ2FudmFzQ29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNDb250ZW50 VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25O YXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNp YmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlv bkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlj a2VkLCB0aGlzLmhhbmRsZVJlZnJlc2hCdXR0b25DbGlja2VkLCB0aGlzKTsKIAotICAgICAgICB0 aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9u TmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJTaG93IHRyYW5zcGFyZW5j eSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiksIFdJLlVJU3RyaW5n KCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1DaGVja2Vy cy5zdmciLCAxMywgMTMpOworICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25J dGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJ LlVJU3RyaW5nKCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdy aWQgKHRvb2x0aXApIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiKSwgV0kuVUlTdHJpbmcoIkhp ZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbUNoZWNrZXJzLnN2 ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0u YWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLl9zaG93R3JpZEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9zaG93R3Jp ZEJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25J dGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9u TmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZh bHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3LmpzCmluZGV4 IGE4ODE4NjMzMzllNjJhZDdjN2I3NjcyNzVkMWM3ZjUzOTFhMmRlMWMuLjQ0OTg1M2NkODYwNmU3 OWFhMTYxZGIzNjM5YjZlYTZlN2M2YzUzZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzT3ZlcnZpZXdDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc092 ZXJ2aWV3Q29udGVudFZpZXcuanMKQEAgLTM5LDcgKzM5LDcgQEAgV0kuR3JhcGhpY3NPdmVydmll d0NvbnRlbnRWaWV3ID0gY2xhc3MgR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ28KICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJ LkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJyZWZyZXNoIiwgV0kuVUlTdHJpbmcoIlJlZnJlc2giKSwg IkltYWdlcy9SZWxvYWRGdWxsLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hC dXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZVJlZnJlc2hCdXR0b25DbGlja2VkLCB0aGlz KTsKIAotICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJ LkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJT aG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXAp IiksIFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdh dGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOworICAgICAgICB0aGlzLl9zaG93R3JpZEJ1 dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0o InNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cg dHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiKSwg V0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9u SXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9u TmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZh bHVlOwogICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50 TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5faGFu ZGxlU2hvd0dyaWRCdXR0b25DbGlja2VkLCB0aGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNv dXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDY4NzRhNWExYWYzYWEzY2FkNzk2YTYzMTUwZjM4YjM0 ODBmZjhjZTMuLmEwZGU4NWRjM2U0Y2JkNTI5NmExNTg2MjVjMmQzY2Y2ODgzNmQwMWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVz b3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTM1LDcgKzM1LDcgQEAg V0kuSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgSW1hZ2VSZXNvdXJjZUNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuUmVzb3VyY2UKICAgICAgICAgdGhpcy5fZHJhZ2dpbmdJbnRlcm5hbElt YWdlRWxlbWVudCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9kaXNhYmxlRHJvcFpvbmUgPSBkaXNh YmxlRHJvcFpvbmUgfHwgZmFsc2U7CiAKLSAgICAgICAgY29uc3QgdG9vbFRpcCA9IFdJLlVJU3Ry aW5nKCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRv b2x0aXApIik7CisgICAgICAgIGNvbnN0IHRvb2xUaXAgPSBXSS5VSVN0cmluZygiU2hvdyB0cmFu c3BhcmVuY3kgZ3JpZCIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSIsICJTaG93 IHRyYW5zcGFyZW5jeSBncmlkIik7CiAgICAgICAgIGNvbnN0IGFjdGl2YXRlZFRvb2xUaXAgPSBX SS5VSVN0cmluZygiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCIpOwogICAgICAgICB0aGlzLl9zaG93 R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlv bkl0ZW0oInNob3ctZ3JpZCIsIHRvb2xUaXAsIGFjdGl2YXRlZFRvb2xUaXAsICJJbWFnZXMvTmF2 aWdhdGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOwogICAgICAgICB0aGlzLl9zaG93R3Jp ZEJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25J dGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3 LmpzCmluZGV4IDY0YzlkMzhkNzM1NzhjNTNhYjhkMTJiOGQ3ZGQwYTZmM2U1Mjk2M2IuLjhhZjU0 MzZlN2M3YTY2MDRhMmNhNzA3MzgxMTkwZmJlYTA0MjAxOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGlu Z0NvbnRlbnRWaWV3LmpzCkBAIC01OCw3ICs1OCw3IEBAIFdJLlJlY29yZGluZ0NvbnRlbnRWaWV3 ID0gY2xhc3MgUmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAg ICAgICAgICAgICAgIHRoaXMuX3Nob3dQYXRoQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVk ID0gISFXSS5zZXR0aW5ncy5zaG93Q2FudmFzUGF0aC52YWx1ZTsKICAgICAgICAgICAgIH0KIAot ICAgICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5B Y3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJzaG93LWdyaWQiLCBXSS5VSVN0cmluZygiU2hv dyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSIp LCBXSS5VSVN0cmluZygiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRp b25JdGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEzKTsKKyAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlk QnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRl bSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hv dyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIp LCBXSS5VSVN0cmluZygiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRp b25JdGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEzKTsKICAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlk QnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0 ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0 dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRl bS5FdmVudC5DbGlja2VkLCB0aGlzLl9zaG93R3JpZEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAg ICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSAh IVdJLnNldHRpbmdzLnNob3dJbWFnZUdyaWQudmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzCmluZGV4IGRkZjExMTU0ODM3ZjZjOTYzMTBkOTVl NTBlMDYzNmJkNGJjN2Q0YWIuLmZkNDZiZTU3NTNkNjcyNmYyMWFhODk5NTYxNTQ2NDhjMDFmZDIy ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3Lmpz CkBAIC0zOCw3ICszOCw3IEBAIFdJLlJlc291cmNlQ29sbGVjdGlvbkNvbnRlbnRWaWV3ID0gY2xh c3MgUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcgZXh0ZW5kcyBXCiAgICAgICAgIHRoaXMu ZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJyZXNvdXJjZS1jb2xsZWN0aW9uIik7CiAKICAgICAgICAg aWYgKGNvbGxlY3Rpb24ucmVzb3VyY2VUeXBlID09PSBXSS5SZXNvdXJjZS5UeXBlLkltYWdlKSB7 Ci0gICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJ LkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJT aG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXAp IiksIFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdh dGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOworICAgICAgICAgICAgdGhpcy5fc2hvd0dy aWRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25J dGVtKCJzaG93LWdyaWQiLCBXSS5VSVN0cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJT aG93IHRyYW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSIsICJTaG93IHRyYW5zcGFyZW5jeSBncmlk IiksIFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFnZXMvTmF2aWdh dGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOwogICAgICAgICAgICAgdGhpcy5fc2hvd0dy aWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRp b25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZVNob3dHcmlkQnV0dG9uQ2xpY2tlZCwg dGhpcyk7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLnZp c2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5M b3c7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2 YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1ZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDMzMDRlODBiYzU3NDI3OGI3Yjg1MmUwZTVlN2Qw MThhMjk1MzVjYzQuLjE5N2UyNWIyOTY1NTg5NDAwY2ZhYzdmMTYzYzQwMWIwYTg4OWU0M2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMzAwLDcgKzMwMCw3IEBA IFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgc291cmNlc1NldHRpbmdzVmlldy5h ZGRTZXBhcmF0b3IoKTsKIAotICAgICAgICBzb3VyY2VzU2V0dGluZ3NWaWV3LmFkZFNldHRpbmco V0kuVUlTdHJpbmcoIkltYWdlczoiKSwgV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZCwgV0kuVUlT dHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAo c2V0dGluZ3MgbGFiZWwpIikpOworICAgICAgICBzb3VyY2VzU2V0dGluZ3NWaWV3LmFkZFNldHRp bmcoV0kuVUlTdHJpbmcoIkltYWdlczoiKSwgV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZCwgV0ku VUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3Jp ZCAoc2V0dGluZ3MgbGFiZWwpIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiKSk7CiAKICAgICAg ICAgdGhpcy5fY3JlYXRlUmVmZXJlbmNlTGluayhzb3VyY2VzU2V0dGluZ3NWaWV3KTsKIAo= 406436 2020-08-11 16:59:12 -0700 2020-08-14 10:22:46 -0700 Patch bug-215387-20200811195911.patch text/plain 11815 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx Njc3YjE1Zjk4NDU1ZTljZGQyODg0YTMxYmZmNjA2NWM4OGQwOTcwLi43ZTI3MmMyZjlmMTNlMTQ3 Zjg4MTMwNDI1Yzg3NTljNWQ1NTEzNTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAyMC0wOC0xMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NTIyNCk6IFdlYiBJbnNwZWN0b3I6IExPQ0FMSVpF RCBTVFJJTkcgTk9UIEZPVU5EIG5leHQgdG8gdGhlIEltYWdlIGNoZWNrYm94IGluIHRoZSBTb3Vy Y2VzIHByZWZzIHBhbmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTUzODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2ODU1MjYzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv QmFzZS9Mb2FkTG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKFdJLnJlcGVhdGVkVUlTdHJp bmcuc2hvd1RyYW5zcGFyZW5jeUdyaWRUb29sdGlwKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQ2FudmFzQ29udGVudFZp ZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NPdmVydmlld0NvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3KToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qczoK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuUmVjb3JkaW5nQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5S ZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJD b250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZVNvdXJjZXNTZXR0aW5nc1ZpZXcpOgorCiAyMDIw LTA4LTA2ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IE1lZGlhICYgQW5pbWF0aW9ucyB0aW1lbGluZSBzaG91bGRuJ3Qgc2hp ZnQgd2hlbiBzb3J0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1ZTkz NDViNjJhOGZiMGQ2MmJhNWEzOGIyMmZjZWQ3M2RhMzA0YTA5Li41YTQ2MmM0MWZjYzdlYzJiZGRj OGRiYTdlNmE2MWJlODRlN2YxNzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK QEAgLTExNDcsOCArMTE0NywxMCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHBhZ2UgcnVsZXJz IGFuZCBub2RlIGJvcmRlciBsaW5lcyJdID0gIlNob3cgcGFnZSBydWxlcnMgYQogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBydWxlcnMiXSA9ICJTaG93IHJ1bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJTaG93IHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIGRldGFpbHMgc2lk ZWJhciAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJh ciAoJXMpIl0gPSAiU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiOwotbG9jYWxpemVk U3RyaW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiXSA9ICJTaG93IHRyYW5z cGFyZW5jeSBncmlkIjsKKy8qIFNldHRpbmdzIHRhYiBjaGVja2JveCBsYWJlbCBmb3Igd2hldGhl ciB0aGUgdHJhbnNwYXJlbmN5IGdyaWQgaXMgc2hvd24gYnkgZGVmYXVsdCAqLwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAoc2V0dGluZ3MgbGFiZWwpIl0gPSAiU2hv dyB0cmFuc3BhcmVuY3kgZ3JpZCI7CisvKiBUb29sdGlwIGZvciBzaG93aW5nIHRoZSBjaGVja2Vy ZWQgdHJhbnNwYXJlbmN5IGdyaWQgdW5kZXIgaW1hZ2VzIGFuZCBjYW52YXNlcyAqLworbG9jYWxp emVkU3RyaW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiXSA9ICJTaG93IHRy YW5zcGFyZW5jeSBncmlkIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdHlwZSBpbmZvcm1hdGlv biJdID0gIlNob3cgdHlwZSBpbmZvcm1hdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93OiJd ID0gIlNob3c6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNpdGUtc3BlY2lmaWMgSGFja3MiXSA9ICJT aXRlLXNwZWNpZmljIEhhY2tzIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4 IDMwYjE3ZTg4YTFjMmYyNDA3MzM2NGZmMWQ0OWJiODgzYjBjNGNlYjIuLmQ5M2FlZGMyZWQ4ZTg3 MzI0YzdiMTc0YTNlZTM4MmY1ZTI4NzAxNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxpemVkU3RyaW5n cy5qcwpAQCAtMTEwLDMgKzExMCw3IEBAIFdJLnJlcGVhdGVkVUlTdHJpbmcuZmV0Y2ggPSBmdW5j dGlvbigpIHsKIFdJLnJlcGVhdGVkVUlTdHJpbmcucmV2ZWFsSW5ET01UcmVlID0gZnVuY3Rpb24o KSB7CiAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJSZXZlYWwgaW4gRE9NIFRyZWUiLCAiT3BlbiBF bGVtZW50cyB0YWIgYW5kIHNlbGVjdCB0aGlzIG5vZGUgaW4gRE9NIHRyZWUiKTsKIH07CisKK1dJ LnJlcGVhdGVkVUlTdHJpbmcuc2hvd1RyYW5zcGFyZW5jeUdyaWRUb29sdGlwID0gZnVuY3Rpb24o KSB7CisgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNo b3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0aXApIiwgIlRvb2x0aXAgZm9yIHNob3dpbmcgdGhl IGNoZWNrZXJlZCB0cmFuc3BhcmVuY3kgZ3JpZCB1bmRlciBpbWFnZXMgYW5kIGNhbnZhc2VzIikK K307CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DYW52YXNDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzCmluZGV4IDI0ODA1ODdlZWIyMWFkZDc2MzM5 NmQ1ODY2MzZjNzZjMTc4YjA1MzQuLjc1NzlkNmEwYjVkMjgzNDQyZTcyMmFhY2UwOGFlN2I2YTBm OTk0MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzCkBAIC00Nyw3ICs0Nyw3IEBAIFdJ LkNhbnZhc0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50VmlldwogICAgICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlz aWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5Lkxv dzsKICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5oYW5kbGVS ZWZyZXNoQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0 b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJz aG93LWdyaWQiLCBXSS5VSVN0cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIsICJTaG93IHRy YW5zcGFyZW5jeSBncmlkICh0b29sdGlwKSIpLCBXSS5VSVN0cmluZygiSGlkZSB0cmFuc3BhcmVu Y3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEzKTsK KyAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3Rp dmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJzaG93LWdyaWQiLCBXSS5yZXBlYXRlZFVJU3RyaW5n LnNob3dUcmFuc3BhcmVuY3lHcmlkVG9vbHRpcCgpLCBXSS5VSVN0cmluZygiSGlkZSB0cmFuc3Bh cmVuY3kgZ3JpZCIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEz KTsKICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExp c3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3Nob3dH cmlkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2 aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJp bGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9u SXRlbS5hY3RpdmF0ZWQgPSAhIVdJLnNldHRpbmdzLnNob3dJbWFnZUdyaWQudmFsdWU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGlj c092ZXJ2aWV3Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9HcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcuanMKaW5kZXggYTg4MTg2MzMz OWU2MmFkN2M3Yjc2NzI3NWQxYzdmNTM5MWEyZGUxYy4uYTVkMmFjY2JjODk3YzNmMGJkZWJhZjQ2 OGFiMzYxYTQxOGRhNGFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvR3JhcGhpY3NPdmVydmlld0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzT3ZlcnZpZXdDb250 ZW50Vmlldy5qcwpAQCAtMzksNyArMzksNyBAQCBXSS5HcmFwaGljc092ZXJ2aWV3Q29udGVudFZp ZXcgPSBjbGFzcyBHcmFwaGljc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5DbwogICAg ICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0dG9uTmF2 aWdhdGlvbkl0ZW0oInJlZnJlc2giLCBXSS5VSVN0cmluZygiUmVmcmVzaCIpLCAiSW1hZ2VzL1Jl bG9hZEZ1bGwuc3ZnIiwgMTMsIDEzKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmln YXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQu Q2xpY2tlZCwgdGhpcy5faGFuZGxlUmVmcmVzaEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogCi0gICAg ICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVC dXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNw YXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRpcCkiKSwgV0kuVUlT dHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbUNo ZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdh dGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlk IiwgV0kucmVwZWF0ZWRVSVN0cmluZy5zaG93VHJhbnNwYXJlbmN5R3JpZFRvb2x0aXAoKSwgV0ku VUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRl bUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZhbHVl OwogICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5faGFuZGxl U2hvd0dyaWRCdXR0b25DbGlja2VkLCB0aGlzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJj ZUNvbnRlbnRWaWV3LmpzCmluZGV4IDY4NzRhNWExYWYzYWEzY2FkNzk2YTYzMTUwZjM4YjM0ODBm ZjhjZTMuLjNmYjkxOGY0MWQxYTI2N2Q5MmQyNzJkNDAyOGFkODc5MGY1MGZiNzEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3Vy Y2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTM1LDcgKzM1LDcgQEAgV0ku SW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuUmVzb3VyY2UKICAgICAgICAgdGhpcy5fZHJhZ2dpbmdJbnRlcm5hbEltYWdl RWxlbWVudCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9kaXNhYmxlRHJvcFpvbmUgPSBkaXNhYmxl RHJvcFpvbmUgfHwgZmFsc2U7CiAKLSAgICAgICAgY29uc3QgdG9vbFRpcCA9IFdJLlVJU3RyaW5n KCJTaG93IHRyYW5zcGFyZW5jeSBncmlkIiwgIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHRvb2x0 aXApIik7CisgICAgICAgIGNvbnN0IHRvb2xUaXAgPSBXSS5yZXBlYXRlZFVJU3RyaW5nLnNob3dU cmFuc3BhcmVuY3lHcmlkVG9vbHRpcCgpOwogICAgICAgICBjb25zdCBhY3RpdmF0ZWRUb29sVGlw ID0gV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKTsKICAgICAgICAgdGhpcy5f c2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmln YXRpb25JdGVtKCJzaG93LWdyaWQiLCB0b29sVGlwLCBhY3RpdmF0ZWRUb29sVGlwLCAiSW1hZ2Vz L05hdmlnYXRpb25JdGVtQ2hlY2tlcnMuc3ZnIiwgMTMsIDEzKTsKICAgICAgICAgdGhpcy5fc2hv d0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0 aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50 Vmlldy5qcwppbmRleCA2NGM5ZDM4ZDczNTc4YzUzYWI4ZDEyYjhkN2RkMGE2ZjNlNTI5NjNiLi44 MzI1ZmIwYmJmODZiZWI0YjAyMmIxYTFhMjA0NjBhNWI2Nzg4MjkwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNv cmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNTgsNyArNTgsNyBAQCBXSS5SZWNvcmRpbmdDb250ZW50 VmlldyA9IGNsYXNzIFJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcK ICAgICAgICAgICAgICAgICB0aGlzLl9zaG93UGF0aEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2 YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0NhbnZhc1BhdGgudmFsdWU7CiAgICAgICAgICAgICB9 CiAKLSAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcg V0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0kuVUlTdHJpbmco IlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAodG9vbHRp cCkiKSwgV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIkltYWdlcy9OYXZp Z2F0aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgICAgICB0aGlzLl9zaG93 R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlv bkl0ZW0oInNob3ctZ3JpZCIsIFdJLnJlcGVhdGVkVUlTdHJpbmcuc2hvd1RyYW5zcGFyZW5jeUdy aWRUb29sdGlwKCksIFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIiksICJJbWFn ZXMvTmF2aWdhdGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOwogICAgICAgICAgICAgdGhp cy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5O YXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICAgICAgdGhpcy5f c2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5h dmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3Nob3dHcmlkQnV0dG9uQ2xpY2tlZCwg dGhpcyk7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFj dGl2YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1ZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29sbGVj dGlvbkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMKaW5kZXggZGRmMTExNTQ4Mzdm NmM5NjMxMGQ5NWU1MGUwNjM2YmQ0YmM3ZDRhYi4uZmM2ZjU3NzgyNTQ0ODEzYmZlNDIxMDQ3NWI5 NjI4NmVjZWRlMDgzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29u dGVudFZpZXcuanMKQEAgLTM4LDcgKzM4LDcgQEAgV0kuUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVu dFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNvbGxlY3Rpb25Db250ZW50VmlldyBleHRlbmRzIFcKICAg ICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInJlc291cmNlLWNvbGxlY3Rpb24iKTsK IAogICAgICAgICBpZiAoY29sbGVjdGlvbi5yZXNvdXJjZVR5cGUgPT09IFdJLlJlc291cmNlLlR5 cGUuSW1hZ2UpIHsKLSAgICAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0 ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy1ncmlkIiwgV0ku VUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0cmFuc3BhcmVuY3kgZ3Jp ZCAodG9vbHRpcCkiKSwgV0kuVUlTdHJpbmcoIkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiKSwgIklt YWdlcy9OYXZpZ2F0aW9uSXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgICAgICB0 aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9u TmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLnJlcGVhdGVkVUlTdHJpbmcuc2hvd1RyYW5z cGFyZW5jeUdyaWRUb29sdGlwKCksIFdJLlVJU3RyaW5nKCJIaWRlIHRyYW5zcGFyZW5jeSBncmlk IiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1DaGVja2Vycy5zdmciLCAxMywgMTMpOwogICAgICAg ICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVy KFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZVNob3dH cmlkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRv bk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZp c2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5h dmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1 ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDMzMDRlODBiYzU3 NDI3OGI3Yjg1MmUwZTVlN2QwMThhMjk1MzVjYzQuLjQ4MmUxNDJhZTExZDYzYzAwMTVmOTZjNzRi Y2IyZGVhMmZlNTA2OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpA QCAtMzAwLDcgKzMwMCw3IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0 aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgc291 cmNlc1NldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIAotICAgICAgICBzb3VyY2VzU2V0dGlu Z3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIkltYWdlczoiKSwgV0kuc2V0dGluZ3Muc2hv d0ltYWdlR3JpZCwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hvdyB0 cmFuc3BhcmVuY3kgZ3JpZCAoc2V0dGluZ3MgbGFiZWwpIikpOworICAgICAgICBzb3VyY2VzU2V0 dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIkltYWdlczoiKSwgV0kuc2V0dGluZ3Mu c2hvd0ltYWdlR3JpZCwgV0kuVUlTdHJpbmcoIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiLCAiU2hv dyB0cmFuc3BhcmVuY3kgZ3JpZCAoc2V0dGluZ3MgbGFiZWwpIiwgIlNldHRpbmdzIHRhYiBjaGVj a2JveCBsYWJlbCBmb3Igd2hldGhlciB0aGUgdHJhbnNwYXJlbmN5IGdyaWQgaXMgc2hvd24gYnkg ZGVmYXVsdCIpKTsKIAogICAgICAgICB0aGlzLl9jcmVhdGVSZWZlcmVuY2VMaW5rKHNvdXJjZXNT ZXR0aW5nc1ZpZXcpOwogCg==