171402 2017-04-27 16:14:46 -0700 Web Inspector: RTL: inherit system layout direction by default 2018-04-29 22:53:48 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg dbates inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1302369 0 bburg 2017-04-27 16:14:46 -0700 Ready, set, file bugs! 1302370 1 bburg 2017-04-27 16:15:13 -0700 <rdar://problem/30753626> 1302379 2 308473 bburg 2017-04-27 16:28:42 -0700 Created attachment 308473 Patch 1302387 3 308473 joepeck 2017-04-27 16:38:45 -0700 Comment on attachment 308473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308473&action=review r=me > Source/WebInspectorUI/UserInterface/Base/Setting.js:115 > - // FIXME: change initial value to 'system' once we are happy with RTL support. > - // This will cause Web Inspector to use the system user interface layout direction. > - layoutDirection: new WebInspector.Setting("layout-direction", "ltr"), > + layoutDirectionOverride: new WebInspector.Setting("layout-direction-override", "system"), I realize the storage name needs to change in order for us to get the new default value of "system" going forward. However I think WebInspector.settings.layoutDirection is way better than WebInspector.settings.layoutDirectionOverride. I suggest we keep that. This brings to light that in the future we should name settings that are in experimental stages with a storage name "...-experimental" so that when we turn it on by default and rename it we can get the better name when it graduates! 1302388 4 308474 bburg 2017-04-27 16:39:37 -0700 Created attachment 308474 Patch 1302390 5 bburg 2017-04-27 16:41:10 -0700 (In reply to Joseph Pecoraro from comment #3) > Comment on attachment 308473 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308473&action=review > > r=me > > > Source/WebInspectorUI/UserInterface/Base/Setting.js:115 > > - // FIXME: change initial value to 'system' once we are happy with RTL support. > > - // This will cause Web Inspector to use the system user interface layout direction. > > - layoutDirection: new WebInspector.Setting("layout-direction", "ltr"), > > + layoutDirectionOverride: new WebInspector.Setting("layout-direction-override", "system"), > > I realize the storage name needs to change in order for us to get the new > default value of "system" going forward. > > However I think WebInspector.settings.layoutDirection is way better than > WebInspector.settings.layoutDirectionOverride. I suggest we keep that. > > This brings to light that in the future we should name settings that are in > experimental stages with a storage name "...-experimental" so that when we > turn it on by default and rename it we can get the better name when it > graduates! OK! 1302394 6 bburg 2017-04-27 16:45:00 -0700 Committed r215906: <http://trac.webkit.org/changeset/215906> 1303484 7 mattbaker 2017-05-01 16:28:07 -0700 (In reply to Joseph Pecoraro from comment #3) > This brings to light that in the future we should name settings that are in > experimental stages with a storage name "...-experimental" so that when we > turn it on by default and rename it we can get the better name when it > graduates! We could either: 1) Create an ExperimentalSetting class which adds the storage name. 2) Add an `experimental` property (default false) to Setting which does the same thing. 1418952 8 308474 dbates 2018-04-29 22:53:48 -0700 Comment on attachment 308474 Patch Clearing review flag as this patch was landed per comment 6. 308473 2017-04-27 16:28:42 -0700 2017-04-27 16:39:36 -0700 Patch bug-171402-20170427162841.patch text/plain 11575 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1ODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm MDQzOTY4YjlhYzRkY2FlZWVkMzBkMDVkMzM4MmMwYzk4ZWViOWIwLi41Y2RiYzRjNzk1N2IwNTMw NjE1ZTdlZDg5YTEwZjNjNzk4YjljNjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNy0wNC0yNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6IGluaGVyaXQgc3lzdGVtIGxheW91dCBkaXJlY3Rp b24gYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTcxNDAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDc1MzYyNj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yJ3Mg bGF5b3V0IGRpcmVjdGlvbiBzaG91bGQgZm9sbG93IHRoZSBzeXN0ZW0gbGF5b3V0IGRpcmVjdGlv bgorICAgICAgICBieSBkZWZhdWx0IG5vdyB0aGF0IG1vc3QgUlRMIGJ1Z3Mgc2VlbSB0byBiZSBm aXhlZC4gV2UgYXJlIHJlYWR5IGZvciBtb3JlCisgICAgICAgIGZlZWRiYWNrLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL1NldHRpbmcuanM6CisgICAgICAgIFJlbmFtZSB0aGUgZXhpc3RpbmcgImxheW91dC1kaXJl Y3Rpb24iIHNldHRpbmcgc28gdGhhdCB0aGUgbmV3IGRlZmF1bHQKKyAgICAgICAgdmFsdWUgaXMg c2V0IHByb3Blcmx5IGV2ZW4gZm9yIHBlb3BsZSB3aG8gaGF2ZSBvdmVycmlkZGVuIHRoZSBsYXlv dXQKKyAgICAgICAgZGlyZWN0aW9uIHdoaWxlIHRoZSBzZXR0aW5nIHdhcyBleHBvc2VkIHRvIGV2 ZXJ5b25lLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU2V0dGluZ3NW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdlbmVyYWxTZXR0aW5nc1ZpZXcucHJvdG90 eXBlLmluaXRpYWxMYXlvdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdlbmVyYWxTZXR0aW5n c1ZpZXcucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuR2VuZXJhbFNl dHRpbmdzVmlldyk6CisgICAgICAgIE1ha2UgdGhlIGxheW91dCBkaXJlY3Rpb24gb3ZlcnJpZGUg c2V0dGluZyBvbmx5IHZpc2libGUgd2hlbiBEZWJ1Z1VJCisgICAgICAgIGlzIHR1cm5lZCBvbi4g VGhpcyByZW1haW5zIG9ubHkgZm9yIGVuZ2luZWVycyB0byBxdWlja2x5IGNoZWNrIGxheW91dCBi dWdzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1ZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NWaWV3LnByb3RvdHlwZS5hZGRHcm91cFdpdGhD dXN0b21TZXR0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1ZpZXcucHJvdG90 eXBlLmFkZEN1c3RvbVNldHRpbmcpOiBEZWxldGVkLgorICAgICAgICBSZWZhY3RvciB0aGUgY29u dmVuaWVuY2UgbWV0aG9kIHRvIHJldHVybiBib3RoIHRoZSBncm91cCBhbmQgdGhlCisgICAgICAg IGN1c3RvbSBzZXR0aW5nLiBUaGlzIGFsbG93cyB1cyB0byB0b2dnbGUgLmhpZGRlbiBvbiB0aGUg ZW50aXJlCisgICAgICAgIHJvdyBmb3IgdGhlIExheW91dCBEaXJlY3Rpb24gc2V0dGluZyAobGFi ZWwgYW5kIGVkaXRvcikuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanM6CisgICAgICAgIFVubG9jYWxpemUgdGhlIHNldHRpbmcgc3RyaW5ncyBz aW5jZSB0aGV5IGFyZSBvbmx5IHNob3duIGluIGVuZ2luZWVyaW5nIGJ1aWxkcyBub3cuCisKIDIw MTctMDQtMjcgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAg ICAgICAgW0dUS10gV2ViIEluc3BlY3RvcjogQWRkIG5ldyBHVEsrIGljb25zIGZvciBpbnN0cnVt ZW50IGljb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBmZDA0YzY0MGVh MjlkOTgyZTVmODc1MGIzMzQxYjczNmZjZmVkYTMzLi5jMDBlNjQ2NWJhZjdmZjBkOWUxYTY4MWRm ZjkwZjE3OWRmNWY2MWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTQ4 MywxMCArNDgzLDggQEAgbG9jYWxpemVkU3RyaW5nc1siTGF5ZXIgSW5mbyJdID0gIkxheWVyIElu Zm8iOwogbG9jYWxpemVkU3RyaW5nc1siTGF5ZXJzIl0gPSAiTGF5ZXJzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkxheW91dCJdID0gIkxheW91dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQgJiBS ZW5kZXJpbmciXSA9ICJMYXlvdXQgJiBSZW5kZXJpbmciOwotbG9jYWxpemVkU3RyaW5nc1siTGF5 b3V0IERpcmVjdGlvbjoiXSA9ICJMYXlvdXQgRGlyZWN0aW9uOiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJMYXlvdXQgSW52YWxpZGF0ZWQiXSA9ICJMYXlvdXQgSW52YWxpZGF0ZWQiOwogbG9jYWxpemVk U3RyaW5nc1siTGVmdCJdID0gIkxlZnQiOwotbG9jYWxpemVkU3RyaW5nc1siTGVmdCB0byBSaWdo dCAoTFRSKSJdID0gIkxlZnQgdG8gUmlnaHQgKExUUikiOwogbG9jYWxpemVkU3RyaW5nc1siTGV0 dGVyIl0gPSAiTGV0dGVyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpZ2F0dXJlcyJdID0gIkxpZ2F0 dXJlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMaW5lICVkIl0gPSAiTGluZSAlZCI7CkBAIC02OTcs NyArNjk1LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIERlYnVnZ2VyIFRhYiJdID0g IlJldmVhbCBpbiBEZWJ1Z2dlciBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIE9y aWdpbmFsIFJlc291cmNlIl0gPSAiUmV2ZWFsIGluIE9yaWdpbmFsIFJlc291cmNlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlJldmVhbCBpbiBSZXNvdXJjZXMgVGFiIl0gPSAiUmV2ZWFsIGluIFJlc291 cmNlcyBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siUmlnaHQiXSA9ICJSaWdodCI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJSaWdodCB0byBMZWZ0IChSVEwpIl0gPSAiUmlnaHQgdG8gTGVmdCAoUlRMKSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJSb2xlIl0gPSAiUm9sZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJS dWxlIl0gPSAiUnVsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTYW1wbGVzIl0gPSAiU2FtcGxlcyI7 CkBAIC04MjAsNyArODE3LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siU3R5bGVzIFx1MjAxNCBWaXN1 YWwiXSA9ICJTdHlsZXMgXHUyMDE0IFZpc3VhbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdHlsZXNo ZWV0Il0gPSAiU3R5bGVzaGVldCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdHlsZXNoZWV0cyJdID0g IlN0eWxlc2hlZXRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN1YnRyZWUgTW9kaWZpZWQiXSA9ICJT dWJ0cmVlIE1vZGlmaWVkIjsKLWxvY2FsaXplZFN0cmluZ3NbIlN5c3RlbSBEZWZhdWx0Il0gPSAi U3lzdGVtIERlZmF1bHQiOwogbG9jYWxpemVkU3RyaW5nc1siVGFiIHdpZHRoOiJdID0gIlRhYiB3 aWR0aDoiOwogbG9jYWxpemVkU3RyaW5nc1siVGFicyJdID0gIlRhYnMiOwogbG9jYWxpemVkU3Ry aW5nc1siVGFrZSBzbmFwc2hvdCJdID0gIlRha2Ugc25hcHNob3QiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGY0NjlmZDJiMWE4 ZmQwOTgwYjNlZTQzN2UwNjM2MTRhNWFhZGFlYzAuLjgyNzdjZGVlNWVjMjc3YzY5ODY2ZTYxZjkw ZTFhNzU5YzZiZjkxYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKQEAgLTIxNzIsMjIgKzIxNzIsMjIgQEAgV2ViSW5zcGVjdG9yLnNl dFpvb21GYWN0b3IgPSBmdW5jdGlvbihmYWN0b3IpCiAKIFdlYkluc3BlY3Rvci5yZXNvbHZlZExh eW91dERpcmVjdGlvbiA9IGZ1bmN0aW9uKCkKIHsKLSAgICBsZXQgbGF5b3V0RGlyZWN0aW9uID0g V2ViSW5zcGVjdG9yLnNldHRpbmdzLmxheW91dERpcmVjdGlvbi52YWx1ZTsKKyAgICBsZXQgbGF5 b3V0RGlyZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLmxheW91dERpcmVjdGlvbk92ZXJy aWRlLnZhbHVlOwogICAgIGlmIChsYXlvdXREaXJlY3Rpb24gPT09IFdlYkluc3BlY3Rvci5MYXlv dXREaXJlY3Rpb24uU3lzdGVtKQogICAgICAgICBsYXlvdXREaXJlY3Rpb24gPSBJbnNwZWN0b3JG cm9udGVuZEhvc3QudXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbigpOwogCiAgICAgcmV0dXJu IGxheW91dERpcmVjdGlvbjsKIH07CiAKLVdlYkluc3BlY3Rvci5zZXRMYXlvdXREaXJlY3Rpb24g PSBmdW5jdGlvbih2YWx1ZSkKK1dlYkluc3BlY3Rvci5zZXRMYXlvdXREaXJlY3Rpb25PdmVycmlk ZSA9IGZ1bmN0aW9uKHZhbHVlKQogewogICAgIGlmICghT2JqZWN0LnZhbHVlcyhXZWJJbnNwZWN0 b3IuTGF5b3V0RGlyZWN0aW9uKS5pbmNsdWRlcyh2YWx1ZSkpCiAgICAgICAgIFdlYkluc3BlY3Rv ci5yZXBvcnRJbnRlcm5hbEVycm9yKCJVbmtub3duIGxheW91dCBkaXJlY3Rpb24gcmVxdWVzdGVk OiAiICsgdmFsdWUpOwogCi0gICAgaWYgKHZhbHVlID09PSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Mu bGF5b3V0RGlyZWN0aW9uLnZhbHVlKQorICAgIGlmICh2YWx1ZSA9PT0gV2ViSW5zcGVjdG9yLnNl dHRpbmdzLmxheW91dERpcmVjdGlvbk92ZXJyaWRlLnZhbHVlKQogICAgICAgICByZXR1cm47CiAK LSAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubGF5b3V0RGlyZWN0aW9uLnZhbHVlID0gdmFsdWU7 CisgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmxheW91dERpcmVjdGlvbk92ZXJyaWRlLnZhbHVl ID0gdmFsdWU7CiAKICAgICBpZiAoV2ViSW5zcGVjdG9yLnJlc29sdmVkTGF5b3V0RGlyZWN0aW9u KCkgPT09IFdlYkluc3BlY3Rvci5MYXlvdXREaXJlY3Rpb24uUlRMICYmIHRoaXMuX2RvY2tDb25m aWd1cmF0aW9uID09PSBXZWJJbnNwZWN0b3IuRG9ja0NvbmZpZ3VyYXRpb24uUmlnaHQpCiAgICAg ICAgIHRoaXMuX2RvY2tMZWZ0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggNTUwYzQ2NDcxMTk2Y2RjOGIxYTExY2Q5 ODM3YjE2MmZlNTUxZTMzNS4uNzI5OTAwZWZmNWVkMzEzMGY5NTZkMTkzZmMzZjJiOTVjOTgyOWRh YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9T ZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv U2V0dGluZy5qcwpAQCAtMTEyLDkgKzExMiw3IEBAIFdlYkluc3BlY3Rvci5zZXR0aW5ncyA9IHsK ICAgICBjbGVhckxvZ09uTmF2aWdhdGU6IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiY2xlYXIt bG9nLW9uLW5hdmlnYXRlIiwgdHJ1ZSksCiAgICAgY2xlYXJOZXR3b3JrT25OYXZpZ2F0ZTogbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjbGVhci1uZXR3b3JrLW9uLW5hdmlnYXRlIiwgdHJ1ZSks CiAgICAgem9vbUZhY3RvcjogbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJ6b29tLWZhY3RvciIs IDEpLAotICAgIC8vIEZJWE1FOiBjaGFuZ2UgaW5pdGlhbCB2YWx1ZSB0byAnc3lzdGVtJyBvbmNl IHdlIGFyZSBoYXBweSB3aXRoIFJUTCBzdXBwb3J0LgotICAgIC8vIFRoaXMgd2lsbCBjYXVzZSBX ZWIgSW5zcGVjdG9yIHRvIHVzZSB0aGUgc3lzdGVtIHVzZXIgaW50ZXJmYWNlIGxheW91dCBkaXJl Y3Rpb24uCi0gICAgbGF5b3V0RGlyZWN0aW9uOiBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImxh eW91dC1kaXJlY3Rpb24iLCAibHRyIiksCisgICAgbGF5b3V0RGlyZWN0aW9uT3ZlcnJpZGU6IG5l dyBXZWJJbnNwZWN0b3IuU2V0dGluZygibGF5b3V0LWRpcmVjdGlvbi1vdmVycmlkZSIsICJzeXN0 ZW0iKSwKICAgICBzdHlsZXNTaG93SW5saW5lV2FybmluZ3M6IG5ldyBXZWJJbnNwZWN0b3IuU2V0 dGluZygic3R5bGVzLXNob3ctaW5saW5lLXdhcm5pbmciLCB0cnVlKSwKICAgICBzdHlsZXNJbnNl cnROZXdsaW5lOiBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInN0eWxlcy1pbnNlcnQtbmV3bGlu ZSIsIHRydWUpLAogICAgIHN0eWxlc1NlbGVjdE9uRmlyc3RDbGljazogbmV3IFdlYkluc3BlY3Rv ci5TZXR0aW5nKCJzdHlsZXMtc2VsZWN0LW9uLWZpcnN0LWNsaWNrIiwgdHJ1ZSksCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU2V0 dGluZ3NWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv R2VuZXJhbFNldHRpbmdzVmlldy5qcwppbmRleCAzNjhmMmY3MGM1MDI0ZTgzMWJmZmE1MmUzMjMz Y2IxZDQzY2E1YzY4Li5iYTk0OGZiMDg0YzYwMDljN2I3ZTZkOWE2NzVhN2NmNGEzOTk0ZDVkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5l cmFsU2V0dGluZ3NWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0dlbmVyYWxTZXR0aW5nc1ZpZXcuanMKQEAgLTM2LDcgKzM2LDcgQEAgV2ViSW5z cGVjdG9yLkdlbmVyYWxTZXR0aW5nc1ZpZXcgPSBjbGFzcyBHZW5lcmFsU2V0dGluZ3NWaWV3IGV4 dGVuZHMgV2ViSW5zcGVjdG8KICAgICB7CiAgICAgICAgIGNvbnN0IGluZGVudFZhbHVlcyA9IFtX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRhYnMiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTcGFj ZXMiKV07CiAKLSAgICAgICAgbGV0IGluZGVudEVkaXRvciA9IHRoaXMuYWRkQ3VzdG9tU2V0dGlu ZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByZWZlciBpbmRlbnQgdXNpbmc6IiksIFdlYkluc3Bl Y3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiBpbmRlbnRWYWx1ZXN9KTsK KyAgICAgICAgbGV0IFsvKiB1bnVzZWQgKi8sIGluZGVudEVkaXRvcl0gPSB0aGlzLmFkZEdyb3Vw V2l0aEN1c3RvbVNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmVmZXIgaW5kZW50IHVz aW5nOiIpLCBXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRvci5UeXBlLlNlbGVjdCwge3ZhbHVlczog aW5kZW50VmFsdWVzfSk7CiAgICAgICAgIGluZGVudEVkaXRvci52YWx1ZSA9IGluZGVudFZhbHVl c1tXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuaW5kZW50V2l0aFRhYnMudmFsdWUgPyAwIDogMV07CiAg ICAgICAgIGluZGVudEVkaXRvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TZXR0aW5n RWRpdG9yLkV2ZW50LlZhbHVlRGlkQ2hhbmdlLCAoKSA9PiB7CiAgICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MuaW5kZW50V2l0aFRhYnMudmFsdWUgPSBpbmRlbnRFZGl0b3IudmFsdWUg PT09IGluZGVudFZhbHVlc1swXTsKQEAgLTc4LDIwICs3OCwyNyBAQCBXZWJJbnNwZWN0b3IuR2Vu ZXJhbFNldHRpbmdzVmlldyA9IGNsYXNzIEdlbmVyYWxTZXR0aW5nc1ZpZXcgZXh0ZW5kcyBXZWJJ bnNwZWN0bwogICAgICAgICBjb25zdCB6b29tTGV2ZWxzID0gWzAuNiwgMC44LCAxLCAxLjIsIDEu NCwgMS42LCAxLjgsIDIsIDIuMiwgMi40XTsKICAgICAgICAgY29uc3Qgem9vbVZhbHVlcyA9IHpv b21MZXZlbHMubWFwKChsZXZlbCkgPT4gW2xldmVsLCBOdW1iZXIucGVyY2VudGFnZVN0cmluZyhs ZXZlbCwgMCldKTsKIAotICAgICAgICBsZXQgem9vbUVkaXRvciA9IHRoaXMuYWRkQ3VzdG9tU2V0 dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlpvb206IiksIFdlYkluc3BlY3Rvci5TZXR0aW5n RWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiB6b29tVmFsdWVzfSk7CisgICAgICAgIGxldCBb LyogdW51c2VkICovLCB6b29tRWRpdG9yXSA9IHRoaXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGlu ZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlpvb206IiksIFdlYkluc3BlY3Rvci5TZXR0aW5nRWRp dG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiB6b29tVmFsdWVzfSk7CiAgICAgICAgIHpvb21FZGl0 b3IudmFsdWUgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muem9vbUZhY3Rvci52YWx1ZTsKICAgICAg ICAgem9vbUVkaXRvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9y LkV2ZW50LlZhbHVlRGlkQ2hhbmdlLCAoKSA9PiB7IFdlYkluc3BlY3Rvci5zZXRab29tRmFjdG9y KHpvb21FZGl0b3IudmFsdWUpOyB9KTsKIAogICAgICAgICB0aGlzLmFkZFNlcGFyYXRvcigpOwog CisgICAgICAgIC8vIFRoaXMgc2V0dGluZyBpcyBvbmx5IGV2ZXIgc2hvd24gaW4gZW5naW5lZXJp bmcgYnVpbGRzLCBzbyBpdHMgc3RyaW5ncyBhcmUgdW5sb2NhbGl6ZWQuCiAgICAgICAgIGNvbnN0 IGxheW91dERpcmVjdGlvblZhbHVlcyA9IFsKLSAgICAgICAgICAgIFtXZWJJbnNwZWN0b3IuTGF5 b3V0RGlyZWN0aW9uLlN5c3RlbSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTeXN0ZW0gRGVmYXVs dCIpXSwKLSAgICAgICAgICAgIFtXZWJJbnNwZWN0b3IuTGF5b3V0RGlyZWN0aW9uLkxUUiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJMZWZ0IHRvIFJpZ2h0IChMVFIpIildLAotICAgICAgICAgICAg W1dlYkluc3BlY3Rvci5MYXlvdXREaXJlY3Rpb24uUlRMLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJpZ2h0IHRvIExlZnQgKFJUTCkiKV0sCisgICAgICAgICAgICBbV2ViSW5zcGVjdG9yLkxheW91 dERpcmVjdGlvbi5TeXN0ZW0sIFdlYkluc3BlY3Rvci51bmxvY2FsaXplZFN0cmluZygiU3lzdGVt IERlZmF1bHQiKV0sCisgICAgICAgICAgICBbV2ViSW5zcGVjdG9yLkxheW91dERpcmVjdGlvbi5M VFIsIFdlYkluc3BlY3Rvci51bmxvY2FsaXplZFN0cmluZygiTGVmdCB0byBSaWdodCAoTFRSKSIp XSwKKyAgICAgICAgICAgIFtXZWJJbnNwZWN0b3IuTGF5b3V0RGlyZWN0aW9uLlJUTCwgV2ViSW5z cGVjdG9yLnVubG9jYWxpemVkU3RyaW5nKCJSaWdodCB0byBMZWZ0IChSVEwpIildLAogICAgICAg ICBdOwogCi0gICAgICAgIGxldCBsYXlvdXREaXJlY3Rpb25FZGl0b3IgPSB0aGlzLmFkZEN1c3Rv bVNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXlvdXQgRGlyZWN0aW9uOiIpLCBXZWJJ bnNwZWN0b3IuU2V0dGluZ0VkaXRvci5UeXBlLlNlbGVjdCwge3ZhbHVlczogbGF5b3V0RGlyZWN0 aW9uVmFsdWVzfSk7Ci0gICAgICAgIGxheW91dERpcmVjdGlvbkVkaXRvci52YWx1ZSA9IFdlYklu c3BlY3Rvci5zZXR0aW5ncy5sYXlvdXREaXJlY3Rpb24udmFsdWU7Ci0gICAgICAgIGxheW91dERp cmVjdGlvbkVkaXRvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9y LkV2ZW50LlZhbHVlRGlkQ2hhbmdlLCAoKSA9PiB7IFdlYkluc3BlY3Rvci5zZXRMYXlvdXREaXJl Y3Rpb24obGF5b3V0RGlyZWN0aW9uRWRpdG9yLnZhbHVlKTsgfSk7CisgICAgICAgIGxldCBbbGF5 b3V0RGlyZWN0aW9uR3JvdXAsIGxheW91dERpcmVjdGlvbkVkaXRvcl0gPSB0aGlzLmFkZEdyb3Vw V2l0aEN1c3RvbVNldHRpbmcoV2ViSW5zcGVjdG9yLnVubG9jYWxpemVkU3RyaW5nKCJMYXlvdXQg RGlyZWN0aW9uOiIpLCBXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRvci5UeXBlLlNlbGVjdCwge3Zh bHVlczogbGF5b3V0RGlyZWN0aW9uVmFsdWVzfSk7CisgICAgICAgIHRoaXMuX2xheW91dERpcmVj dGlvbkdyb3VwID0gbGF5b3V0RGlyZWN0aW9uR3JvdXA7CisgICAgICAgIGxheW91dERpcmVjdGlv bkVkaXRvci52YWx1ZSA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5sYXlvdXREaXJlY3Rpb25PdmVy cmlkZS52YWx1ZTsKKyAgICAgICAgbGF5b3V0RGlyZWN0aW9uRWRpdG9yLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+ IHsgV2ViSW5zcGVjdG9yLnNldExheW91dERpcmVjdGlvbk92ZXJyaWRlKGxheW91dERpcmVjdGlv bkVkaXRvci52YWx1ZSk7IH0pOworICAgIH0KKworICAgIGxheW91dCgpCisgICAgeworICAgICAg ICB0aGlzLl9sYXlvdXREaXJlY3Rpb25Hcm91cC5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImhp ZGRlbiIsICFXZWJJbnNwZWN0b3IuaXNEZWJ1Z1VJRW5hYmxlZCgpKTsKICAgICB9CiB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NWaWV3LmpzCmluZGV4IDEwNWUzYzBlYzAxMTIzZTIzMTY2YjRjMmIyMzAwZDg4ZDE2ZjA3 ODQuLmIzMzYxZjBiODY0Y2EzNjM0Y2ViY2U1Mzc2N2M0NGFlNTA0Y2RhMzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5n c1ZpZXcuanMKQEAgLTQ2LDEwICs0NiwxMSBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NWaWV3ID0g Y2xhc3MgU2V0dGluZ3NWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgcmV0 dXJuIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhzZXR0aW5nLCBsYWJlbCwgb3B0aW9ucyk7CiAg ICAgfQogCi0gICAgYWRkQ3VzdG9tU2V0dGluZyh0aXRsZSwgZWRpdG9yVHlwZSwgb3B0aW9ucykK KyAgICBhZGRHcm91cFdpdGhDdXN0b21TZXR0aW5nKHRpdGxlLCBlZGl0b3JUeXBlLCBvcHRpb25z KQogICAgIHsKICAgICAgICAgbGV0IHNldHRpbmdzR3JvdXAgPSB0aGlzLmFkZEdyb3VwKHRpdGxl KTsKLSAgICAgICAgcmV0dXJuIHNldHRpbmdzR3JvdXAuYWRkQ3VzdG9tU2V0dGluZyhlZGl0b3JU eXBlLCBvcHRpb25zKTsKKyAgICAgICAgbGV0IGN1c3RvbVNldHRpbmcgPSBzZXR0aW5nc0dyb3Vw LmFkZEN1c3RvbVNldHRpbmcoZWRpdG9yVHlwZSwgb3B0aW9ucyk7CisgICAgICAgIHJldHVybiBb c2V0dGluZ3NHcm91cCwgY3VzdG9tU2V0dGluZ107CiAgICAgfQogCiAgICAgYWRkR3JvdXAodGl0 bGUpCg== 308474 2017-04-27 16:39:37 -0700 2018-04-29 22:53:48 -0700 Patch bug-171402-20170427163936.patch text/plain 9776 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1ODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm MDQzOTY4YjlhYzRkY2FlZWVkMzBkMDVkMzM4MmMwYzk4ZWViOWIwLi41Y2RiYzRjNzk1N2IwNTMw NjE1ZTdlZDg5YTEwZjNjNzk4YjljNjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNy0wNC0yNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6IGluaGVyaXQgc3lzdGVtIGxheW91dCBkaXJlY3Rp b24gYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTcxNDAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDc1MzYyNj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yJ3Mg bGF5b3V0IGRpcmVjdGlvbiBzaG91bGQgZm9sbG93IHRoZSBzeXN0ZW0gbGF5b3V0IGRpcmVjdGlv bgorICAgICAgICBieSBkZWZhdWx0IG5vdyB0aGF0IG1vc3QgUlRMIGJ1Z3Mgc2VlbSB0byBiZSBm aXhlZC4gV2UgYXJlIHJlYWR5IGZvciBtb3JlCisgICAgICAgIGZlZWRiYWNrLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL1NldHRpbmcuanM6CisgICAgICAgIFJlbmFtZSB0aGUgZXhpc3RpbmcgImxheW91dC1kaXJl Y3Rpb24iIHNldHRpbmcgc28gdGhhdCB0aGUgbmV3IGRlZmF1bHQKKyAgICAgICAgdmFsdWUgaXMg c2V0IHByb3Blcmx5IGV2ZW4gZm9yIHBlb3BsZSB3aG8gaGF2ZSBvdmVycmlkZGVuIHRoZSBsYXlv dXQKKyAgICAgICAgZGlyZWN0aW9uIHdoaWxlIHRoZSBzZXR0aW5nIHdhcyBleHBvc2VkIHRvIGV2 ZXJ5b25lLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU2V0dGluZ3NW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdlbmVyYWxTZXR0aW5nc1ZpZXcucHJvdG90 eXBlLmluaXRpYWxMYXlvdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdlbmVyYWxTZXR0aW5n c1ZpZXcucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuR2VuZXJhbFNl dHRpbmdzVmlldyk6CisgICAgICAgIE1ha2UgdGhlIGxheW91dCBkaXJlY3Rpb24gb3ZlcnJpZGUg c2V0dGluZyBvbmx5IHZpc2libGUgd2hlbiBEZWJ1Z1VJCisgICAgICAgIGlzIHR1cm5lZCBvbi4g VGhpcyByZW1haW5zIG9ubHkgZm9yIGVuZ2luZWVycyB0byBxdWlja2x5IGNoZWNrIGxheW91dCBi dWdzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1ZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NWaWV3LnByb3RvdHlwZS5hZGRHcm91cFdpdGhD dXN0b21TZXR0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1ZpZXcucHJvdG90 eXBlLmFkZEN1c3RvbVNldHRpbmcpOiBEZWxldGVkLgorICAgICAgICBSZWZhY3RvciB0aGUgY29u dmVuaWVuY2UgbWV0aG9kIHRvIHJldHVybiBib3RoIHRoZSBncm91cCBhbmQgdGhlCisgICAgICAg IGN1c3RvbSBzZXR0aW5nLiBUaGlzIGFsbG93cyB1cyB0byB0b2dnbGUgLmhpZGRlbiBvbiB0aGUg ZW50aXJlCisgICAgICAgIHJvdyBmb3IgdGhlIExheW91dCBEaXJlY3Rpb24gc2V0dGluZyAobGFi ZWwgYW5kIGVkaXRvcikuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanM6CisgICAgICAgIFVubG9jYWxpemUgdGhlIHNldHRpbmcgc3RyaW5ncyBz aW5jZSB0aGV5IGFyZSBvbmx5IHNob3duIGluIGVuZ2luZWVyaW5nIGJ1aWxkcyBub3cuCisKIDIw MTctMDQtMjcgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAg ICAgICAgW0dUS10gV2ViIEluc3BlY3RvcjogQWRkIG5ldyBHVEsrIGljb25zIGZvciBpbnN0cnVt ZW50IGljb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBmZDA0YzY0MGVh MjlkOTgyZTVmODc1MGIzMzQxYjczNmZjZmVkYTMzLi5jMDBlNjQ2NWJhZjdmZjBkOWUxYTY4MWRm ZjkwZjE3OWRmNWY2MWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTQ4 MywxMCArNDgzLDggQEAgbG9jYWxpemVkU3RyaW5nc1siTGF5ZXIgSW5mbyJdID0gIkxheWVyIElu Zm8iOwogbG9jYWxpemVkU3RyaW5nc1siTGF5ZXJzIl0gPSAiTGF5ZXJzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkxheW91dCJdID0gIkxheW91dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQgJiBS ZW5kZXJpbmciXSA9ICJMYXlvdXQgJiBSZW5kZXJpbmciOwotbG9jYWxpemVkU3RyaW5nc1siTGF5 b3V0IERpcmVjdGlvbjoiXSA9ICJMYXlvdXQgRGlyZWN0aW9uOiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJMYXlvdXQgSW52YWxpZGF0ZWQiXSA9ICJMYXlvdXQgSW52YWxpZGF0ZWQiOwogbG9jYWxpemVk U3RyaW5nc1siTGVmdCJdID0gIkxlZnQiOwotbG9jYWxpemVkU3RyaW5nc1siTGVmdCB0byBSaWdo dCAoTFRSKSJdID0gIkxlZnQgdG8gUmlnaHQgKExUUikiOwogbG9jYWxpemVkU3RyaW5nc1siTGV0 dGVyIl0gPSAiTGV0dGVyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpZ2F0dXJlcyJdID0gIkxpZ2F0 dXJlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMaW5lICVkIl0gPSAiTGluZSAlZCI7CkBAIC02OTcs NyArNjk1LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIERlYnVnZ2VyIFRhYiJdID0g IlJldmVhbCBpbiBEZWJ1Z2dlciBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siUmV2ZWFsIGluIE9y aWdpbmFsIFJlc291cmNlIl0gPSAiUmV2ZWFsIGluIE9yaWdpbmFsIFJlc291cmNlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlJldmVhbCBpbiBSZXNvdXJjZXMgVGFiIl0gPSAiUmV2ZWFsIGluIFJlc291 cmNlcyBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siUmlnaHQiXSA9ICJSaWdodCI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJSaWdodCB0byBMZWZ0IChSVEwpIl0gPSAiUmlnaHQgdG8gTGVmdCAoUlRMKSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJSb2xlIl0gPSAiUm9sZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJS dWxlIl0gPSAiUnVsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTYW1wbGVzIl0gPSAiU2FtcGxlcyI7 CkBAIC04MjAsNyArODE3LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siU3R5bGVzIFx1MjAxNCBWaXN1 YWwiXSA9ICJTdHlsZXMgXHUyMDE0IFZpc3VhbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdHlsZXNo ZWV0Il0gPSAiU3R5bGVzaGVldCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdHlsZXNoZWV0cyJdID0g IlN0eWxlc2hlZXRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN1YnRyZWUgTW9kaWZpZWQiXSA9ICJT dWJ0cmVlIE1vZGlmaWVkIjsKLWxvY2FsaXplZFN0cmluZ3NbIlN5c3RlbSBEZWZhdWx0Il0gPSAi U3lzdGVtIERlZmF1bHQiOwogbG9jYWxpemVkU3RyaW5nc1siVGFiIHdpZHRoOiJdID0gIlRhYiB3 aWR0aDoiOwogbG9jYWxpemVkU3RyaW5nc1siVGFicyJdID0gIlRhYnMiOwogbG9jYWxpemVkU3Ry aW5nc1siVGFrZSBzbmFwc2hvdCJdID0gIlRha2Ugc25hcHNob3QiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDU1MGM0 NjQ3MTE5NmNkYzhiMWExMWNkOTgzN2IxNjJmZTU1MWUzMzUuLmM2MjYwMmIxNjc3NmJlZTljNzQz MjI1MWJhM2JhYzQ0ZDg5NzA2ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTExMiw5ICsxMTIsNyBAQCBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MgPSB7CiAgICAgY2xlYXJMb2dPbk5hdmlnYXRlOiBuZXcgV2ViSW5zcGVj dG9yLlNldHRpbmcoImNsZWFyLWxvZy1vbi1uYXZpZ2F0ZSIsIHRydWUpLAogICAgIGNsZWFyTmV0 d29ya09uTmF2aWdhdGU6IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiY2xlYXItbmV0d29yay1v bi1uYXZpZ2F0ZSIsIHRydWUpLAogICAgIHpvb21GYWN0b3I6IG5ldyBXZWJJbnNwZWN0b3IuU2V0 dGluZygiem9vbS1mYWN0b3IiLCAxKSwKLSAgICAvLyBGSVhNRTogY2hhbmdlIGluaXRpYWwgdmFs dWUgdG8gJ3N5c3RlbScgb25jZSB3ZSBhcmUgaGFwcHkgd2l0aCBSVEwgc3VwcG9ydC4KLSAgICAv LyBUaGlzIHdpbGwgY2F1c2UgV2ViIEluc3BlY3RvciB0byB1c2UgdGhlIHN5c3RlbSB1c2VyIGlu dGVyZmFjZSBsYXlvdXQgZGlyZWN0aW9uLgotICAgIGxheW91dERpcmVjdGlvbjogbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKCJsYXlvdXQtZGlyZWN0aW9uIiwgImx0ciIpLAorICAgIGxheW91dERp cmVjdGlvbjogbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXlvdXQtZGlyZWN0aW9uLW92ZXJy aWRlIiwgInN5c3RlbSIpLAogICAgIHN0eWxlc1Nob3dJbmxpbmVXYXJuaW5nczogbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKCJzdHlsZXMtc2hvdy1pbmxpbmUtd2FybmluZyIsIHRydWUpLAogICAg IHN0eWxlc0luc2VydE5ld2xpbmU6IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygic3R5bGVzLWlu c2VydC1uZXdsaW5lIiwgdHJ1ZSksCiAgICAgc3R5bGVzU2VsZWN0T25GaXJzdENsaWNrOiBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoInN0eWxlcy1zZWxlY3Qtb24tZmlyc3QtY2xpY2siLCB0cnVl KSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0dlbmVyYWxTZXR0aW5nc1ZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9HZW5lcmFsU2V0dGluZ3NWaWV3LmpzCmluZGV4IDM2OGYyZjcwYzUwMjRlODMx YmZmYTUyZTMyMzNjYjFkNDNjYTVjNjguLjM1YjQwMjQ3NTA4YjhmZjVkOWZlZGU5MzczNjk0ZTc5 ZmM5NjEzZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxTZXR0aW5nc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFNldHRpbmdzVmlldy5qcwpAQCAtMzYsNyArMzYs NyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFNldHRpbmdzVmlldyA9IGNsYXNzIEdlbmVyYWxTZXR0 aW5nc1ZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgIHsKICAgICAgICAgY29uc3QgaW5kZW50 VmFsdWVzID0gW1dlYkluc3BlY3Rvci5VSVN0cmluZygiVGFicyIpLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNwYWNlcyIpXTsKIAotICAgICAgICBsZXQgaW5kZW50RWRpdG9yID0gdGhpcy5hZGRD dXN0b21TZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJlZmVyIGluZGVudCB1c2luZzoi KSwgV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IGluZGVu dFZhbHVlc30pOworICAgICAgICBsZXQgWy8qIHVudXNlZCAqLywgaW5kZW50RWRpdG9yXSA9IHRo aXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByZWZl ciBpbmRlbnQgdXNpbmc6IiksIFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuU2VsZWN0 LCB7dmFsdWVzOiBpbmRlbnRWYWx1ZXN9KTsKICAgICAgICAgaW5kZW50RWRpdG9yLnZhbHVlID0g aW5kZW50VmFsdWVzW1dlYkluc3BlY3Rvci5zZXR0aW5ncy5pbmRlbnRXaXRoVGFicy52YWx1ZSA/ IDAgOiAxXTsKICAgICAgICAgaW5kZW50RWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlNldHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsKICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5pbmRlbnRXaXRoVGFicy52YWx1ZSA9IGluZGVudEVk aXRvci52YWx1ZSA9PT0gaW5kZW50VmFsdWVzWzBdOwpAQCAtNzgsMjAgKzc4LDI3IEBAIFdlYklu c3BlY3Rvci5HZW5lcmFsU2V0dGluZ3NWaWV3ID0gY2xhc3MgR2VuZXJhbFNldHRpbmdzVmlldyBl eHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgIGNvbnN0IHpvb21MZXZlbHMgPSBbMC42LCAwLjgs IDEsIDEuMiwgMS40LCAxLjYsIDEuOCwgMiwgMi4yLCAyLjRdOwogICAgICAgICBjb25zdCB6b29t VmFsdWVzID0gem9vbUxldmVscy5tYXAoKGxldmVsKSA9PiBbbGV2ZWwsIE51bWJlci5wZXJjZW50 YWdlU3RyaW5nKGxldmVsLCAwKV0pOwogCi0gICAgICAgIGxldCB6b29tRWRpdG9yID0gdGhpcy5h ZGRDdXN0b21TZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiWm9vbToiKSwgV2ViSW5zcGVj dG9yLlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IHpvb21WYWx1ZXN9KTsKKyAg ICAgICAgbGV0IFsvKiB1bnVzZWQgKi8sIHpvb21FZGl0b3JdID0gdGhpcy5hZGRHcm91cFdpdGhD dXN0b21TZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiWm9vbToiKSwgV2ViSW5zcGVjdG9y LlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IHpvb21WYWx1ZXN9KTsKICAgICAg ICAgem9vbUVkaXRvci52YWx1ZSA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy56b29tRmFjdG9yLnZh bHVlOwogICAgICAgICB6b29tRWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNl dHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsgV2ViSW5zcGVjdG9yLnNl dFpvb21GYWN0b3Ioem9vbUVkaXRvci52YWx1ZSk7IH0pOwogCiAgICAgICAgIHRoaXMuYWRkU2Vw YXJhdG9yKCk7CiAKKyAgICAgICAgLy8gVGhpcyBzZXR0aW5nIGlzIG9ubHkgZXZlciBzaG93biBp biBlbmdpbmVlcmluZyBidWlsZHMsIHNvIGl0cyBzdHJpbmdzIGFyZSB1bmxvY2FsaXplZC4KICAg ICAgICAgY29uc3QgbGF5b3V0RGlyZWN0aW9uVmFsdWVzID0gWwotICAgICAgICAgICAgW1dlYklu c3BlY3Rvci5MYXlvdXREaXJlY3Rpb24uU3lzdGVtLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN5 c3RlbSBEZWZhdWx0IildLAotICAgICAgICAgICAgW1dlYkluc3BlY3Rvci5MYXlvdXREaXJlY3Rp b24uTFRSLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxlZnQgdG8gUmlnaHQgKExUUikiKV0sCi0g ICAgICAgICAgICBbV2ViSW5zcGVjdG9yLkxheW91dERpcmVjdGlvbi5SVEwsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUmlnaHQgdG8gTGVmdCAoUlRMKSIpXSwKKyAgICAgICAgICAgIFtXZWJJbnNw ZWN0b3IuTGF5b3V0RGlyZWN0aW9uLlN5c3RlbSwgV2ViSW5zcGVjdG9yLnVubG9jYWxpemVkU3Ry aW5nKCJTeXN0ZW0gRGVmYXVsdCIpXSwKKyAgICAgICAgICAgIFtXZWJJbnNwZWN0b3IuTGF5b3V0 RGlyZWN0aW9uLkxUUiwgV2ViSW5zcGVjdG9yLnVubG9jYWxpemVkU3RyaW5nKCJMZWZ0IHRvIFJp Z2h0IChMVFIpIildLAorICAgICAgICAgICAgW1dlYkluc3BlY3Rvci5MYXlvdXREaXJlY3Rpb24u UlRMLCBXZWJJbnNwZWN0b3IudW5sb2NhbGl6ZWRTdHJpbmcoIlJpZ2h0IHRvIExlZnQgKFJUTCki KV0sCiAgICAgICAgIF07CiAKLSAgICAgICAgbGV0IGxheW91dERpcmVjdGlvbkVkaXRvciA9IHRo aXMuYWRkQ3VzdG9tU2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxheW91dCBEaXJlY3Rp b246IiksIFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiBs YXlvdXREaXJlY3Rpb25WYWx1ZXN9KTsKKyAgICAgICAgbGV0IFtsYXlvdXREaXJlY3Rpb25Hcm91 cCwgbGF5b3V0RGlyZWN0aW9uRWRpdG9yXSA9IHRoaXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGlu ZyhXZWJJbnNwZWN0b3IudW5sb2NhbGl6ZWRTdHJpbmcoIkxheW91dCBEaXJlY3Rpb246IiksIFdl Ykluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiBsYXlvdXREaXJl Y3Rpb25WYWx1ZXN9KTsKKyAgICAgICAgdGhpcy5fbGF5b3V0RGlyZWN0aW9uR3JvdXAgPSBsYXlv dXREaXJlY3Rpb25Hcm91cDsKICAgICAgICAgbGF5b3V0RGlyZWN0aW9uRWRpdG9yLnZhbHVlID0g V2ViSW5zcGVjdG9yLnNldHRpbmdzLmxheW91dERpcmVjdGlvbi52YWx1ZTsKICAgICAgICAgbGF5 b3V0RGlyZWN0aW9uRWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNldHRpbmdF ZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsgV2ViSW5zcGVjdG9yLnNldExheW91 dERpcmVjdGlvbihsYXlvdXREaXJlY3Rpb25FZGl0b3IudmFsdWUpOyB9KTsKICAgICB9CisKKyAg ICBsYXlvdXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5fbGF5b3V0RGlyZWN0aW9uR3JvdXAuZWxl bWVudC5jbGFzc0xpc3QudG9nZ2xlKCJoaWRkZW4iLCAhV2ViSW5zcGVjdG9yLmlzRGVidWdVSUVu YWJsZWQoKSk7CisgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVmlldy5qcwppbmRleCAxMDVlM2MwZWMwMTEy M2UyMzE2NmI0YzJiMjMwMGQ4OGQxNmYwNzg0Li5iMzM2MWYwYjg2NGNhMzYzNGNlYmNlNTM3Njdj NDRhZTUwNGNkYTMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NWaWV3LmpzCkBAIC00NiwxMCArNDYsMTEgQEAgV2Vi SW5zcGVjdG9yLlNldHRpbmdzVmlldyA9IGNsYXNzIFNldHRpbmdzVmlldyBleHRlbmRzIFdlYklu c3BlY3Rvci5WaWV3CiAgICAgICAgIHJldHVybiBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoc2V0 dGluZywgbGFiZWwsIG9wdGlvbnMpOwogICAgIH0KIAotICAgIGFkZEN1c3RvbVNldHRpbmcodGl0 bGUsIGVkaXRvclR5cGUsIG9wdGlvbnMpCisgICAgYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGluZyh0 aXRsZSwgZWRpdG9yVHlwZSwgb3B0aW9ucykKICAgICB7CiAgICAgICAgIGxldCBzZXR0aW5nc0dy b3VwID0gdGhpcy5hZGRHcm91cCh0aXRsZSk7Ci0gICAgICAgIHJldHVybiBzZXR0aW5nc0dyb3Vw LmFkZEN1c3RvbVNldHRpbmcoZWRpdG9yVHlwZSwgb3B0aW9ucyk7CisgICAgICAgIGxldCBjdXN0 b21TZXR0aW5nID0gc2V0dGluZ3NHcm91cC5hZGRDdXN0b21TZXR0aW5nKGVkaXRvclR5cGUsIG9w dGlvbnMpOworICAgICAgICByZXR1cm4gW3NldHRpbmdzR3JvdXAsIGN1c3RvbVNldHRpbmddOwog ICAgIH0KIAogICAgIGFkZEdyb3VwKHRpdGxlKQo=