118106 2013-06-26 17:24:20 -0700 Web Inspector: AX: Add additional contextual labels for Error/Warnings/Logs that will be spoken for screen readers 2013-08-19 18:30:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P3 Normal --- 115976 1 jcraig jcraig commit-queue graouts jcraig joepeck timothy webkit-bug-importer oldest_to_newest 904003 0 jcraig 2013-06-26 17:24:20 -0700 Web Inspector: AX: Add additional contextual labels for Error/Warnings/Logs that will be spoken for screen readers Icons next to each line in the console log indicate if it's an error, warning, or log. These are just background images, so look for "data-labelprefix" in the source to see how this is done for the "Input:" and "Output:" strings. 904004 1 webkit-bug-importer 2013-06-26 17:24:35 -0700 <rdar://problem/14284013> 904062 2 jcraig 2013-06-26 22:44:11 -0700 Dependent on bug 115976 918155 3 208968 jcraig 2013-08-16 17:46:00 -0700 Created attachment 208968 patch 918173 4 208968 joepeck 2013-08-16 19:31:53 -0700 Comment on attachment 208968 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208968&action=review Nice! > Source/WebInspectorUI/UserInterface/ConsoleCommandResult.js:49 > + if (!element.getAttribute("data-labelprefix")) Nit: This check could be hasAttribute instead of getAttribute. 918174 5 208968 joepeck 2013-08-16 19:35:54 -0700 Comment on attachment 208968 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208968&action=review > Source/WebInspectorUI/UserInterface/ConsoleMessageImpl.js:486 > + element.setAttribute("data-labelprefix", WebInspector.UIString("Tip: ")); We could even use elem.dataset for "data-x" attributes: element.dataset.labelprefix = WebInspector.UIString("Tip: "); However, I'm not sure if dataset is any clearer or more performant. So lets stick with your setAttribute calls. It makes it easy to search for "data-labelprefix" and find all the places we deal with it in code. 918397 6 jcraig 2013-08-18 01:06:07 -0700 (In reply to comment #4) > (From update of attachment 208968 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=208968&action=review > > Nice! > > > Source/WebInspectorUI/UserInterface/ConsoleCommandResult.js:49 > > + if (!element.getAttribute("data-labelprefix")) > > Nit: This check could be hasAttribute instead of getAttribute. hasAttribute won't cover the empty string case, I believe. Without my shorthand version, I'd need to do this to cover both cases. if (!element.hasAttribute("data-labelprefix") || element.getAttribute("data-labelprefix") !== "") But I like the shorthand version better. 918398 7 jcraig 2013-08-18 01:08:01 -0700 (In reply to comment #5) > (From update of attachment 208968 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=208968&action=review > > > Source/WebInspectorUI/UserInterface/ConsoleMessageImpl.js:486 > > + element.setAttribute("data-labelprefix", WebInspector.UIString("Tip: ")); > > We could even use elem.dataset for "data-x" attributes: > > element.dataset.labelprefix = WebInspector.UIString("Tip: "); > > However, I'm not sure if dataset is any clearer or more performant. So lets stick with your setAttribute calls. It makes it easy to search for "data-labelprefix" and find all the places we deal with it in code. Good idea. I could go either way on this, but it looks like you're leaning slightly toward searchability, so I'll leave it the way it is for now. 918902 8 208968 commit-queue 2013-08-19 18:30:18 -0700 Comment on attachment 208968 patch Clearing flags on attachment: 208968 Committed r154310: <http://trac.webkit.org/changeset/154310> 918903 9 commit-queue 2013-08-19 18:30:21 -0700 All reviewed patches have been landed. Closing bug. 208968 2013-08-16 17:46:00 -0700 2013-08-19 18:30:18 -0700 patch 118106.patch text/plain 7841 jcraig SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0MjA3KQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDE3IEBA CiAyMDEzLTA4LTE2ICBKYW1lcyBDcmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KIAorICAg ICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE4MTA2PiBXZWIgSW5zcGVjdG9yOiBBWDogQWRk IGFkZGl0aW9uYWwgY29udGV4dHVhbCBsYWJlbHMgZm9yIEVycm9yL1dhcm5pbmdzL0xvZ3MgdGhh dCB3aWxsIGJlIHNwb2tlbiBmb3Igc2NyZWVuIHJlYWRlcnMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2VkIGdlbmVyYWwgY29uc29sZSAiT3V0 cHV0IiBzdHJpbmcgdG8gbW9yZSBzcGVjaWZpYyAiRXJyb3IiLCAiV2FybmluZyIsIGV0YyBmb3Ig YWNjZXNzaWJpbGl0eS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVz dWx0LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29uc29sZU1lc3NhZ2VJbXBsLmpzOgor CisyMDEzLTA4LTE2ICBKYW1lcyBDcmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KKwogICAg ICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE4MTA1PiBXZWIgSW5zcGVjdG9yOiBBWDogQWRk IHN1cHBvcnQgZm9yIEFSSUEgdGFibGlzdHMvdGFicyB0byBpbnNwZWN0b3IgdGFicwogCiAgICAg ICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcwkocmV2aXNpb24gMTU0MjA3KQorKysgU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwkod29ya2luZyBjb3B5 KQpAQCAtOTksNiArOTksNyBAQAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAi AEQAYQB0AGEAIAByAGUAdAB1AHIAbgBlAGQAIABmAHIAbwBtACAAdABoAGUAIABkAGEAdABhAGIA YQBzAGUAIABpAHMAIAB0AG8AbwAgAGwAYQByAGcAZQAuACIAXQAgAD0AIAAiAEQAYQB0AGEAIABy AGUAdAB1AHIAbgBlAGQAIABmAHIAbwBtACAAdABoAGUAIABkAGEAdABhAGIAYQBzAGUAIABpAHMA IAB0AG8AbwAgAGwAYQByAGcAZQAuACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4A ZwBzAFsAIgBEAGEAdABhAGIAYQBzAGUAIABuAG8AIABsAG8AbgBnAGUAcgAgAGgAYQBzACAAZQB4 AHAAZQBjAHQAZQBkACAAdgBlAHIAcwBpAG8AbgAuACIAXQAgAD0AIAAiAEQAYQB0AGEAYgBhAHMA ZQAgAG4AbwAgAGwAbwBuAGcAZQByACAAaABhAHMAIABlAHgAcABlAGMAdABlAGQAIAB2AGUAcgBz AGkAbwBuAC4AIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAYQB0 AGEAYgBhAHMAZQBzACIAXQAgAD0AIAAiAEQAYQB0AGEAYgBhAHMAZQBzACIAOwAKKwBsAG8AYwBh AGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBEAGUAYgB1AGcAOgAgACIAXQAgAD0AIAAiAEQA ZQBiAHUAZwA6ACAAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQA ZQBiAHUAZwBnAGUAcgAiAF0AIAA9ACAAIgBEAGUAYgB1AGcAZwBlAHIAIgA7AAogAGwAbwBjAGEA bABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAZQBjAG8AZABlAGQAIgBdACAAPQAgACIARABl AGMAbwBkAGUAZAAiADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIARABl AGwAZQB0AGUAIgBdACAAPQAgACIARABlAGwAZQB0AGUAIgA7AApAQCAtMTU2LDYgKzE1Nyw3IEBA CiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIARQBuAGEAYgBsAGUAIABwAG8A aQBuAHQAIAB0AG8AIABpAG4AcwBwAGUAYwB0ACAAbQBvAGQAZQAgACgAJQBzACkAIgBdACAAPQAg ACIARQBuAGEAYgBsAGUAIABwAG8AaQBuAHQAIAB0AG8AIABpAG4AcwBwAGUAYwB0ACAAbQBvAGQA ZQAgACgAJQBzACkAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEUA bgBjAG8AZABlAGQAIgBdACAAPQAgACIARQBuAGMAbwBkAGUAZAAiADsACiAAbABvAGMAYQBsAGkA egBlAGQAUwB0AHIAaQBuAGcAcwBbACIARQBuAGMAbwBkAGkAbgBnACIAXQAgAD0AIAAiAEUAbgBj AG8AZABpAG4AZwAiADsACisAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIARQBy AHIAbwByADoAIAAiAF0AIAA9ACAAIgBFAHIAcgBvAHIAOgAgACIAOwAKIABsAG8AYwBhAGwAaQB6 AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBFAHIAcgBvAHIAcwAiAF0AIAA9ACAAIgBFAHIAcgBvAHIA cwAiADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIARQB2AGUAbgB0ACAA RABpAHMAcABhAHQAYwBoAGUAZAAiAF0AIAA9ACAAIgBFAHYAZQBuAHQAIABEAGkAcwBwAGEAdABj AGgAZQBkACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBFAHYAZQBu AHQAIABMAGkAcwB0AGUAbgBlAHIAcwAiAF0AIAA9ACAAIgBFAHYAZQBuAHQAIABMAGkAcwB0AGUA bgBlAHIAcwAiADsACkBAIC0yMjQsNiArMjI2LDcgQEAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQA cgBpAG4AZwBzAFsAIgBMAG8AYwBhAGwAIABWAGEAcgBpAGEAYgBsAGUAcwAiAF0AIAA9ACAAIgBM AG8AYwBhAGwAIABWAGEAcgBpAGEAYgBsAGUAcwAiADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0 AHIAaQBuAGcAcwBbACIATABvAGMAYQB0AGUAZAAgAGEAdAAgACUAcwAiAF0AIAA9ACAAIgBMAG8A YwBhAHQAZQBkACAAYQB0ACAAJQBzACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4A ZwBzAFsAIgBMAG8AYwBhAHQAaQBvAG4AIgBdACAAPQAgACIATABvAGMAYQB0AGkAbwBuACIAOwAK KwBsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBMAG8AZwA6ACAAIgBdACAAPQAg ACIATABvAGcAOgAgACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBM AG8AZwBzACIAXQAgAD0AIAAiAEwAbwBnAHMAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdABy AGkAbgBnAHMAWwAiAE0ASQBNAEUAIABUAHkAcABlACIAXQAgAD0AIAAiAE0ASQBNAEUAIABUAHkA cABlACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBNAGEAaQBuACAA RgByAGEAbQBlACIAXQAgAD0AIAAiAE0AYQBpAG4AIABGAHIAYQBtAGUAIgA7AApAQCAtMzczLDYg KzM3Niw3IEBACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIAVABpAG0AZQBy ACAASQBuAHMAdABhAGwAbABlAGQAIgBdACAAPQAgACIAVABpAG0AZQByACAASQBuAHMAdABhAGwA bABlAGQAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAFQAaQBtAGUA cgAgAFIAZQBtAG8AdgBlAGQAIgBdACAAPQAgACIAVABpAG0AZQByACAAUgBlAG0AbwB2AGUAZAAi ADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIAVABpAG0AZQBzAHQAYQBt AHAAIABtAGEAcgBrAGUAcgAgAGEAdAAgACUAcwAiAF0AIAA9ACAAIgBUAGkAbQBlAHMAdABhAG0A cAAgAG0AYQByAGsAZQByACAAYQB0ACAAJQBzACIAOwAKKwBsAG8AYwBhAGwAaQB6AGUAZABTAHQA cgBpAG4AZwBzAFsAIgBUAGkAcAA6ACAAIgBdACAAPQAgACIAVABpAHAAOgAgACIAOwAKIABsAG8A YwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBUAG8AdABhAGwAIgBdACAAPQAgACIAVABv AHQAYQBsACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBUAG8AdABh AGwAIABuAHUAbQBiAGUAcgAgAG8AZgAgAHIAZQBzAG8AdQByAGMAZQBzACwAIABjAGwAaQBjAGsA IAB0AG8AIABzAGgAbwB3ACAAdABoAGUAIABSAGUAcwBvAHUAcgBjAGUAcwAgAG4AYQB2AGkAZwBh AHQAaQBvAG4AIABzAGkAZABlAGIAYQByACIAXQAgAD0AIAAiAFQAbwB0AGEAbAAgAG4AdQBtAGIA ZQByACAAbwBmACAAcgBlAHMAbwB1AHIAYwBlAHMALAAgAGMAbABpAGMAawAgAHQAbwAgAHMAaABv AHcAIAB0AGgAZQAgAFIAZQBzAG8AdQByAGMAZQBzACAAbgBhAHYAaQBnAGEAdABpAG8AbgAgAHMA aQBkAGUAYgBhAHIAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAFQA bwB0AGEAbAAgAHMAaQB6AGUAIABvAGYAIABhAGwAbAAgAHIAZQBzAG8AdQByAGMAZQBzACwAIABj AGwAaQBjAGsAIAB0AG8AIABzAGgAbwB3ACAAdABoAGUAIABOAGUAdAB3AG8AcgBrACAAUgBlAHEA dQBlAHMAdABzACAAdABpAG0AZQBsAGkAbgBlACIAXQAgAD0AIAAiAFQAbwB0AGEAbAAgAHMAaQB6 AGUAIABvAGYAIABhAGwAbAAgAHIAZQBzAG8AdQByAGMAZQBzACwAIABjAGwAaQBjAGsAIAB0AG8A IABzAGgAbwB3ACAAdABoAGUAIABOAGUAdAB3AG8AcgBrACAAUgBlAHEAdQBlAHMAdABzACAAdABp AG0AZQBsAGkAbgBlACIAOwAKQEAgLTM4NSw2ICszODksNyBAQAogAGwAbwBjAGEAbABpAHoAZQBk AFMAdAByAGkAbgBnAHMAWwAiAFUAcwBlAHIAIABBAGcAZQBuAHQAIABTAHQAeQBsAGUAcwBoAGUA ZQB0ACIAXQAgAD0AIAAiAFUAcwBlAHIAIABBAGcAZQBuAHQAIABTAHQAeQBsAGUAcwBoAGUAZQB0 ACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsAIgBVAHMAZQByACAAUwB0 AHkAbABlAHMAaABlAGUAdAAiAF0AIAA9ACAAIgBVAHMAZQByACAAUwB0AHkAbABlAHMAaABlAGUA dAAiADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcAcwBbACIAVgBhAGwAdQBlACIA XQAgAD0AIAAiAFYAYQBsAHUAZQAiADsACisAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcA cwBbACIAVwBhAHIAbgBpAG4AZwA6ACAAIgBdACAAPQAgACIAVwBhAHIAbgBpAG4AZwA6ACAAIgA7 AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAFcAYQByAG4AaQBuAGcAcwAi AF0AIAA9ACAAIgBXAGEAcgBuAGkAbgBnAHMAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdABy AGkAbgBnAHMAWwAiAFcAZQBiACAASQBuAHMAcABlAGMAdABvAHIAIgBdACAAPQAgACIAVwBlAGIA IABJAG4AcwBwAGUAYwB0AG8AcgAiADsACiAAbABvAGMAYQBsAGkAegBlAGQAUwB0AHIAaQBuAGcA cwBbACIAVwBpAGQAdABoACIAXQAgAD0AIAAiAFcAaQBkAHQAaAAiADsACkluZGV4OiBTb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlTWVzc2FnZUltcGwuanMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZU1lc3Nh Z2VJbXBsLmpzCShyZXZpc2lvbiAxNTQyMDcpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db25zb2xlTWVzc2FnZUltcGwuanMJKHdvcmtpbmcgY29weSkKQEAgLTQ4Mywx OCArNDgzLDIzIEBACiAgICAgICAgIHN3aXRjaCAodGhpcy5sZXZlbCkgewogICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLlRpcDoKICAgICAg ICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbnNvbGUtdGlwLWxldmVsIik7Cisg ICAgICAgICAgICAgICAgZWxlbWVudC5zZXRBdHRyaWJ1dGUoImRhdGEtbGFiZWxwcmVmaXgiLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpcDogIikpOwogICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVs LkxvZzoKICAgICAgICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbnNvbGUtbG9n LWxldmVsIik7CisgICAgICAgICAgICAgICAgZWxlbWVudC5zZXRBdHRyaWJ1dGUoImRhdGEtbGFi ZWxwcmVmaXgiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvZzogIikpOwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2Uu TWVzc2FnZUxldmVsLkRlYnVnOgogICAgICAgICAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgiY29uc29sZS1kZWJ1Zy1sZXZlbCIpOworICAgICAgICAgICAgICAgIGVsZW1lbnQuc2V0QXR0 cmlidXRlKCJkYXRhLWxhYmVscHJlZml4IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWJ1Zzog IikpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLldhcm5pbmc6CiAgICAgICAgICAgICAgICAg ZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJjb25zb2xlLXdhcm5pbmctbGV2ZWwiKTsKKyAgICAgICAg ICAgICAgICBlbGVtZW50LnNldEF0dHJpYnV0ZSgiZGF0YS1sYWJlbHByZWZpeCIsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiV2FybmluZzogIikpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVy cm9yOgogICAgICAgICAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29uc29sZS1lcnJv ci1sZXZlbCIpOworICAgICAgICAgICAgICAgIGVsZW1lbnQuc2V0QXR0cmlidXRlKCJkYXRhLWxh YmVscHJlZml4IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFcnJvcjogIikpOwogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzCShy ZXZpc2lvbiAxNTQyMDcpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b25zb2xlQ29tbWFuZFJlc3VsdC5qcwkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsOCBAQAog ICAgIHsKICAgICAgICAgdmFyIGVsZW1lbnQgPSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJ bXBsLnByb3RvdHlwZS50b01lc3NhZ2VFbGVtZW50LmNhbGwodGhpcyk7CiAgICAgICAgIGVsZW1l bnQuY2xhc3NMaXN0LmFkZCgiY29uc29sZS11c2VyLWNvbW1hbmQtcmVzdWx0Iik7Ci0gICAgICAg IGVsZW1lbnQuc2V0QXR0cmlidXRlKCJkYXRhLWxhYmVscHJlZml4IiwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJPdXRwdXQ6ICIpKTsKKyAgICAgICAgaWYgKCFlbGVtZW50LmdldEF0dHJpYnV0ZSgi ZGF0YS1sYWJlbHByZWZpeCIpKSAKKyAgICAgICAgICAgIGVsZW1lbnQuc2V0QXR0cmlidXRlKCJk YXRhLWxhYmVscHJlZml4IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPdXRwdXQ6ICIpKTsKICAg ICAgICAgcmV0dXJuIGVsZW1lbnQ7CiAgICAgfSwKIAo=