195335 2019-03-05 12:05:04 -0800 Web Inspector: CSS: there should be a way to inline-replace a variable with it's value 2019-03-07 11:12:26 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck nvasilyev webkit-bug-importer oldest_to_newest 1512750 0 hi 2019-03-05 12:05:04 -0800 This would be useful to see/edit a specific value, rather than having to go and find and edit the variable itself. 1512834 1 363688 hi 2019-03-05 14:25:45 -0800 Created attachment 363688 Patch 1512839 2 363688 nvasilyev 2019-03-05 14:35:40 -0800 Comment on attachment 363688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363688&action=review > Source/WebInspectorUI/UserInterface/Views/SpreadsheetTextField.js:199 > + if (event.target.closest("." + WI.InlineSwatch.className)) > + return; I don't think SpreadsheetTextField should know about WI.InlineSwatch. Can we call `event.stopPropagation()` in WI.InlineSwatch.prototype._swatchElementClicked? 1513373 3 363688 joepeck 2019-03-06 20:48:08 -0800 Comment on attachment 363688 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363688&action=review r=me. The Shift+Click is hard to discover, even with a tooltip, but this is quite good for now. >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetTextField.js:199 >> + return; > > I don't think SpreadsheetTextField should know about WI.InlineSwatch. > Can we call `event.stopPropagation()` in WI.InlineSwatch.prototype._swatchElementClicked? I like this idea as well, it makes sense for the InlineSwatch to consume the click. 1513576 4 363893 hi 2019-03-07 10:38:39 -0800 Created attachment 363893 Patch 1513610 5 363893 commit-queue 2019-03-07 11:11:58 -0800 Comment on attachment 363893 Patch Clearing flags on attachment: 363893 Committed r242602: <https://trac.webkit.org/changeset/242602> 1513611 6 commit-queue 2019-03-07 11:11:59 -0800 All reviewed patches have been landed. Closing bug. 1513612 7 webkit-bug-importer 2019-03-07 11:12:26 -0800 <rdar://problem/48682509> 363688 2019-03-05 14:25:45 -0800 2019-03-07 10:38:37 -0800 Patch bug-195335-20190305142544.patch text/plain 15296 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk1YzVkMDU0NGYyNWM3YzE1ZTA3MzE4ZTcwMGQy MmVlMmJjMjEwODUuLjA4MzAzNzRjYWIwNjFjZWJlMjIwYTE0M2NjYTU5ZTljY2ExNjFkYmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE5LTAzLTA1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD U1M6IHRoZXJlIHNob3VsZCBiZSBhIHdheSB0byBpbmxpbmUtcmVwbGFjZSBhIHZhcmlhYmxlIHdp dGggaXQncyB2YWx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk1MzM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5qczoKKyAgICAgICAgKFdJ LklubGluZVN3YXRjaCk6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9zd2F0 Y2hFbGVtZW50Q2xpY2tlZCk6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9z d2F0Y2hFbGVtZW50Q2xpY2tlZC5vcHRpb25zRm9yVHlwZSk6IEFkZGVkLgorICAgICAgICBTaGlm dC1jbGlja2luZyBhIHZhcmlhYmxlIHN3YXRjaCByZXBsYWNlcyB0aGUgdGV4dCB3aXRoIHRoZSB2 YXJpYWJsZSdzIHZhbHVlLgorICAgICAgICBEcml2ZS1ieTogdHJ5IHRvIGNyZWF0ZSBhIHJlYWRv bmx5IHN3YXRjaCBmb3IgdGhlIHZhcmlhYmxlJ3MgdmFsdWUgKGUuZy4gYSBjb2xvciBpbmRpY2F0 b3IpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJv cGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkucHJvdG90eXBl Ll9jcmVhdGVJbmxpbmVTd2F0Y2gpOgorICAgICAgICBJZiB0aGUgdmFsdWUgb2YgYSB2YXJpYWJs ZSBzd2F0Y2ggY2hhbmdlcywgcmUtcmVuZGVyIHRoZSB2YWx1ZS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanM6CisgICAgICAgIChXSS5TcHJl YWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUuX2hhbmRsZUNsaWNrKToKKyAgICAgICAgRHJpdmUt Ynk6IGRvbid0IHN0YXJ0IGVkaXRpbmcgb2YgdGhlIHRhcmdldCBvZiB0aGUgImNsaWNrIiBpcyB3 aXRoaW4gYW4gYC5pbmxpbmUtc3dhdGNoYC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ29kZU1pcnJvclRleHRNYXJrZXJzLmpzOgorICAgICAgICAoY3JlYXRlQ29kZU1pcnJvclRl eHRNYXJrZXJzKToKKyAgICAgICAgKGNyZWF0ZUNvZGVNaXJyb3JDb2xvclRleHRNYXJrZXJzKToK KyAgICAgICAgKGNyZWF0ZUNvZGVNaXJyb3JHcmFkaWVudFRleHRNYXJrZXJzKToKKyAgICAgICAg KGNyZWF0ZUNvZGVNaXJyb3JCZXppZXJUZXh0TWFya2Vycyk6CisgICAgICAgIChjcmVhdGVDb2Rl TWlycm9yU3ByaW5nVGV4dE1hcmtlcnMpOgorICAgICAgICBSZWZhY3RvciBmdW5jdGlvbiBwYXJh bWV0ZXJzIGZvciBtb3JlIGZsZXhpYmlsaXR5LgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDE5LTAzLTA1ICBEZXZpbiBSb3Vzc28g IDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBpUG9kIHVzZXIg YWdlbnQgVUlTdHJpbmcgc2hvdWxkIGhhdmUgYSBsb3dlcmNhc2UgIlQiCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwppbmRleCA1OTViYWI2M2QyM2UxMjQ5YmIwMGVkYjQ4OWMyMDQ3N2Zh NTI5YjY1Li5jMDRhMGIzMGIwYTgxZGUzYTA2NTZkNjViZTkxZWU0ZTZhZjhlNTQ3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTIyMCw3ICsyMjAsOCBAQCBsb2NhbGl6ZWRT dHJpbmdzWyJDbGVhciBzYW1wbGVzIl0gPSAiQ2xlYXIgc2FtcGxlcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJDbGVhciB3YXRjaCBleHByZXNzaW9ucyJdID0gIkNsZWFyIHdhdGNoIGV4cHJlc3Npb25z IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsaWNrIExpc3RlbmVyIl0gPSAiQ2xpY2sgTGlzdGVuZXIi OwogbG9jYWxpemVkU3RyaW5nc1siQ2xpY2sgdG8gY2xvc2UgdGhpcyB0YWIiXSA9ICJDbGljayB0 byBjbG9zZSB0aGlzIHRhYiI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJDbGljayB0byBzZWxlY3QgYSBj b2xvci4gU2hpZnQtY2xpY2sgdG8gc3dpdGNoIGNvbG9yIGZvcm1hdHMuIl0gPSAiQ2xpY2sgdG8g c2VsZWN0IGEgY29sb3IuIFNoaWZ0LWNsaWNrIHRvIHN3aXRjaCBjb2xvciBmb3JtYXRzLiI7Cits b2NhbGl6ZWRTdHJpbmdzWyJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQtY2xpY2sgdG8g c3dpdGNoIGNvbG9yIGZvcm1hdHMiXSA9ICJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQt Y2xpY2sgdG8gc3dpdGNoIGNvbG9yIGZvcm1hdHMiOworbG9jYWxpemVkU3RyaW5nc1siQ2xpY2sg dG8gdmlldyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sgdG8gcmVwbGFjZSB2YXJpYWJsZSB3 aXRoIHZhbHVlIl0gPSAiQ2xpY2sgdG8gdmlldyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sg dG8gcmVwbGFjZSB2YXJpYWJsZSB3aXRoIHZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsaWNr YWJsZSJdID0gIkNsaWNrYWJsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSJdID0gIkNsb3Nl IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsb3NlICVzIHRpbWVsaW5lIHZpZXciXSA9ICJDbG9zZSAl cyB0aW1lbGluZSB2aWV3IjsKQEAgLTEwODcsNyArMTA4OCw2IEBAIGxvY2FsaXplZFN0cmluZ3Nb IlZlcnkgSGlnaCJdID0gIlZlcnkgSGlnaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWaWV3IEltYWdl Il0gPSAiVmlldyBJbWFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWaWV3IFJlY29yZGluZyJdID0g IlZpZXcgUmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlZpZXcgU2hhZGVyIl0gPSAiVmll dyBTaGFkZXIiOwotbG9jYWxpemVkU3RyaW5nc1siVmlldyB2YXJpYWJsZSB2YWx1ZSJdID0gIlZp ZXcgdmFyaWFibGUgdmFsdWUiOwogbG9jYWxpemVkU3RyaW5nc1siVmlzaWJsZSJdID0gIlZpc2li bGUiOwogbG9jYWxpemVkU3RyaW5nc1siV2FpdGluZyJdID0gIldhaXRpbmciOwogbG9jYWxpemVk U3RyaW5nc1siV2FpdGluZyBmb3IgY2FudmFzIGNvbnRleHRzIGNyZWF0ZWQgYnkgc2NyaXB0IG9y IENTUy4iXSA9ICJXYWl0aW5nIGZvciBjYW52YXMgY29udGV4dHMgY3JlYXRlZCBieSBzY3JpcHQg b3IgQ1NTLiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db2RlTWlycm9yVGV4dE1hcmtlcnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yVGV4dE1hcmtlcnMuanMKaW5kZXggZjg3NTRj NGYwYWEzNTQ0OWUyODE4NzQ1MDdhYzIzYzMxMjVjYWZlMy4uMWQ0NzY5MzAxZjU2NTI0NDlhOTlm Mzk0MDkxZjQ3ZWEwMDdmMjdmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvclRleHRNYXJrZXJzLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JUZXh0TWFya2Vycy5q cwpAQCAtMjMsNyArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog ICovCiAKLWZ1bmN0aW9uIGNyZWF0ZUNvZGVNaXJyb3JUZXh0TWFya2Vycyh0eXBlLCBwYXR0ZXJu LCBtYXRjaEZ1bmN0aW9uLCBjb2RlTWlycm9yLCByYW5nZSwgY2FsbGJhY2spCitmdW5jdGlvbiBj cmVhdGVDb2RlTWlycm9yVGV4dE1hcmtlcnMoe2NvZGVNaXJyb3IsIHJhbmdlLCB0eXBlLCBwYXR0 ZXJuLCBtYXRjaEZ1bmN0aW9uLCBhbGxvd2VkVG9rZW5zLCBjYWxsYmFja30pCiB7CiAgICAgdmFy IGNyZWF0ZWRNYXJrZXJzID0gW107CiAgICAgdmFyIHN0YXJ0ID0gcmFuZ2UgaW5zdGFuY2VvZiBX SS5UZXh0UmFuZ2UgPyByYW5nZS5zdGFydExpbmUgOiAwOwpAQCAtNTYsNyArNTYsNyBAQCBmdW5j dGlvbiBjcmVhdGVDb2RlTWlycm9yVGV4dE1hcmtlcnModHlwZSwgcGF0dGVybiwgbWF0Y2hGdW5j dGlvbiwgY29kZU1pcnJvciwgcgogCiAgICAgICAgICAgICAvLyBXZSdyZSBub3QgaW50ZXJlc3Rl ZCBpZiB0aGUgdmFsdWUgaXMgbm90IGluc2lkZSBhIGtleXdvcmQuCiAgICAgICAgICAgICB2YXIg dG9rZW5UeXBlID0gY29kZU1pcnJvci5nZXRUb2tlblR5cGVBdChmcm9tKTsKLSAgICAgICAgICAg IGlmICh0b2tlblR5cGUgJiYgIXRva2VuVHlwZS5pbmNsdWRlcygia2V5d29yZCIpKSB7CisgICAg ICAgICAgICBpZiAodG9rZW5UeXBlICYmICF0b2tlblR5cGUuaW5jbHVkZXMoImtleXdvcmQiKSAm JiAoIWFsbG93ZWRUb2tlbnMgfHwgIWFsbG93ZWRUb2tlbnMudGVzdCh0b2tlblR5cGUpKSkgewog ICAgICAgICAgICAgICAgIG1hdGNoID0gcGF0dGVybi5leGVjKGxpbmVDb250ZW50KTsKICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KQEAgLTgyLDEwICs4MiwxMCBAQCBm dW5jdGlvbiBjcmVhdGVDb2RlTWlycm9yVGV4dE1hcmtlcnModHlwZSwgcGF0dGVybiwgbWF0Y2hG dW5jdGlvbiwgY29kZU1pcnJvciwgcgogICAgIHJldHVybiBjcmVhdGVkTWFya2VyczsKIH0KIAot ZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckNvbG9yVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFu Z2UsIGNhbGxiYWNrKQorZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckNvbG9yVGV4dE1hcmtlcnMo Y29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnMgPSB7fSkKIHsKICAgICAvLyBNYXRjaGVzIHJnYmEo MCwgMCwgMCwgMC41KSwgcmdiKDAsIDAsIDApLCBoc2woKSwgaHNsYSgpLCAjZmZmLCAjZmZmZiwg I2ZmZmZmZiwgI2ZmZmZmZmZmLCB3aGl0ZQotICAgIGxldCBjb2xvclJlZ2V4ID0gLygoPzpyZ2J8 aHNsKWE/XChbXildK1wpfCNbMC05YS1mQS1GXXs4fXwjWzAtOWEtZkEtRl17Nn18I1swLTlhLWZB LUZdezMsNH18XGJcdytcYig/IVstLl0pKS9nOworICAgIGNvbnN0IHBhdHRlcm4gPSAvKCg/OnJn Ynxoc2wpYT9cKFteKV0rXCl8I1swLTlhLWZBLUZdezh9fCNbMC05YS1mQS1GXXs2fXwjWzAtOWEt ZkEtRl17Myw0fXxcYlx3K1xiKD8hWy0uXSkpL2c7CiAgICAgZnVuY3Rpb24gbWF0Y2hGdW5jdGlv bihsaW5lQ29udGVudCwgbWF0Y2gpIHsKICAgICAgICAgaWYgKCFsaW5lQ29udGVudCB8fCAhbGlu ZUNvbnRlbnQubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTE4LDEwICsx MTgsMTAgQEAgZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckNvbG9yVGV4dE1hcmtlcnMoY29kZU1p cnJvciwgcmFuZ2UsIGNhbGxiYWNrKQogICAgICAgICByZXR1cm4gIShtYXRjaC5pbmRleCA+IDAg JiYgL1stLlwiXCddLy50ZXN0KGxpbmVDb250ZW50W21hdGNoLmluZGV4IC0gMV0pKTsKICAgICB9 CiAKLSAgICByZXR1cm4gY3JlYXRlQ29kZU1pcnJvclRleHRNYXJrZXJzKCJDb2xvciIsIGNvbG9y UmVnZXgsIG1hdGNoRnVuY3Rpb24sIGNvZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFjayk7CisgICAg cmV0dXJuIGNyZWF0ZUNvZGVNaXJyb3JUZXh0TWFya2Vycyh7Y29kZU1pcnJvciwgcmFuZ2UsIHR5 cGU6ICJDb2xvciIsIHBhdHRlcm4sIG1hdGNoRnVuY3Rpb24sIC4uLm9wdGlvbnN9KTsKIH0KIAot ZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckdyYWRpZW50VGV4dE1hcmtlcnMoY29kZU1pcnJvciwg cmFuZ2UsIGNhbGxiYWNrKQorZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckdyYWRpZW50VGV4dE1h cmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnMgPSB7fSkKIHsKICAgICB2YXIgY3JlYXRl ZE1hcmtlcnMgPSBbXTsKIApAQCAtMTgxLDcgKzE4MSw3IEBAIGZ1bmN0aW9uIGNyZWF0ZUNvZGVN aXJyb3JHcmFkaWVudFRleHRNYXJrZXJzKGNvZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFjaykKICAg ICAgICAgICAgIGNyZWF0ZWRNYXJrZXJzLnB1c2gobWFya2VyKTsKIAogICAgICAgICAgICAgaWYg KHR5cGVvZiBjYWxsYmFjayA9PT0gImZ1bmN0aW9uIikKLSAgICAgICAgICAgICAgICBjYWxsYmFj ayhtYXJrZXIsIGdyYWRpZW50LCBncmFkaWVudFN0cmluZyk7CisgICAgICAgICAgICAgICAgb3B0 aW9ucy5jYWxsYmFjayhtYXJrZXIsIGdyYWRpZW50LCBncmFkaWVudFN0cmluZyk7CiAKICAgICAg ICAgICAgIG1hdGNoID0gZ3JhZGllbnRSZWdleC5leGVjKGxpbmVDb250ZW50KTsKICAgICAgICAg fQpAQCAtMTkwLDE0ICsxOTAsMTQgQEAgZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckdyYWRpZW50 VGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQogICAgIHJldHVybiBjcmVh dGVkTWFya2VyczsKIH0KIAotZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckN1YmljQmV6aWVyVGV4 dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQorZnVuY3Rpb24gY3JlYXRlQ29k ZU1pcnJvckN1YmljQmV6aWVyVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnMg PSB7fSkKIHsKLSAgICB2YXIgY3ViaWNCZXppZXJSZWdleCA9IC8oY3ViaWMtYmV6aWVyXChbXild K1wpfFxiXHcrXGIoPzotXGJcdytcYil7MCwyfSkvZzsKLSAgICByZXR1cm4gY3JlYXRlQ29kZU1p cnJvclRleHRNYXJrZXJzKCJDdWJpY0JlemllciIsIGN1YmljQmV6aWVyUmVnZXgsIG51bGwsIGNv ZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFjayk7CisgICAgY29uc3QgcGF0dGVybiA9IC8oY3ViaWMt YmV6aWVyXChbXildK1wpfFxiXHcrXGIoPzotXGJcdytcYil7MCwyfSkvZzsKKyAgICByZXR1cm4g Y3JlYXRlQ29kZU1pcnJvclRleHRNYXJrZXJzKHtjb2RlTWlycm9yLCByYW5nZSwgdHlwZTogIkN1 YmljQmV6aWVyIiwgcGF0dGVybiwgLi4ub3B0aW9uc30pOwogfQogCi1mdW5jdGlvbiBjcmVhdGVD b2RlTWlycm9yU3ByaW5nVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQor ZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvclNwcmluZ1RleHRNYXJrZXJzKGNvZGVNaXJyb3IsIHJh bmdlLCBvcHRpb25zID0ge30pCiB7Ci0gICAgY29uc3Qgc3ByaW5nUmVnZXggPSAvKHNwcmluZ1wo W14pXStcKSkvZzsKLSAgICByZXR1cm4gY3JlYXRlQ29kZU1pcnJvclRleHRNYXJrZXJzKCJTcHJp bmciLCBzcHJpbmdSZWdleCwgbnVsbCwgY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKTsKKyAg ICBjb25zdCBwYXR0ZXJuID0gLyhzcHJpbmdcKFteKV0rXCkpL2c7CisgICAgcmV0dXJuIGNyZWF0 ZUNvZGVNaXJyb3JUZXh0TWFya2Vycyh7Y29kZU1pcnJvciwgcmFuZ2UsIHR5cGU6ICJTcHJpbmci LCBwYXR0ZXJuLCAuLi5vcHRpb25zfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMKaW5kZXggMmE0NjQ0 MjMzZDY5NWVmZDU1ZWVmOGFmNWEyNDM5YzM3ZjIyMTRhMC4uYmRjMWU1ZGUyOGQ3NDVhM2FiZTlk YTgwMTA5NjViZDIwOWFjNGRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5qcwpAQCAtMzksNyArMzksNyBA QCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVTd2F0Y2ggZXh0ZW5kcyBXSS5PYmplY3QK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKIAotICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LmNs YXNzTGlzdC5hZGQoImlubGluZS1zd2F0Y2giLCB0aGlzLl90eXBlLnNwbGl0KCItIikubGFzdFZh bHVlKTsKKyAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLklubGlu ZVN3YXRjaC5jbGFzc05hbWUsIHRoaXMuX3R5cGUuc3BsaXQoIi0iKS5sYXN0VmFsdWUpOwogCiAg ICAgICAgIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVudENsaWNrZWQgPSBudWxsOwogCkBAIC00OCw3 ICs0OCw3IEBAIFdJLklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIHN3aXRjaCAodGhpcy5fdHlwZSkg ewogICAgICAgICAgICAgY2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5Db2xvcjoKLSAgICAgICAg ICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkNsaWNrIHRv IHNlbGVjdCBhIGNvbG9yLiBTaGlmdC1jbGljayB0byBzd2l0Y2ggY29sb3IgZm9ybWF0cy4iKTsK KyAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmco IkNsaWNrIHRvIHNlbGVjdCBhIGNvbG9yXG5TaGlmdC1jbGljayB0byBzd2l0Y2ggY29sb3IgZm9y bWF0cyIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXSS5Jbmxp bmVTd2F0Y2guVHlwZS5HcmFkaWVudDoKICAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVt ZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkVkaXQgY3VzdG9tIGdyYWRpZW50Iik7CkBAIC02MCw3 ICs2MCw3IEBAIFdJLklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0bGUgPSBXSS5V SVN0cmluZygiRWRpdCBcdTIwMUNzcHJpbmdcdTIwMUQgZnVuY3Rpb24iKTsKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5cGUuVmFyaWFi bGU6Ci0gICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IFdJLlVJU3Ry aW5nKCJWaWV3IHZhcmlhYmxlIHZhbHVlIik7CisgICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNo RWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5nKCJDbGljayB0byB2aWV3IHZhcmlhYmxlIHZhbHVl XG5TaGlmdC1jbGljayB0byByZXBsYWNlIHZhcmlhYmxlIHdpdGggdmFsdWUiKTsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5cGUuSW1h Z2U6CiAgICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IFdJLlVJU3Ry aW5nKCJWaWV3IEltYWdlIik7CkBAIC0xNDksMTcgKzE0OSwyMyBAQCBXSS5JbmxpbmVTd2F0Y2gg PSBjbGFzcyBJbmxpbmVTd2F0Y2ggZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIF9zd2F0Y2hFbGVt ZW50Q2xpY2tlZChldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdJLklubGluZVN3YXRjaC5FdmVudC5CZWZvcmVDbGlja2VkKTsKLQotICAgICAgICBp ZiAodGhpcy5fdHlwZSA9PT0gV0kuSW5saW5lU3dhdGNoLlR5cGUuQ29sb3IgJiYgZXZlbnQuc2hp ZnRLZXkgJiYgdGhpcy5fdmFsdWUpIHsKLSAgICAgICAgICAgIGxldCBuZXh0Rm9ybWF0ID0gdGhp cy5fdmFsdWUubmV4dEZvcm1hdCgpOwotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQobmV4dEZv cm1hdCk7Ci0gICAgICAgICAgICBpZiAoIW5leHRGb3JtYXQpCisgICAgICAgIGlmIChldmVudC5z aGlmdEtleSAmJiB0aGlzLl92YWx1ZSkgeworICAgICAgICAgICAgaWYgKHRoaXMuX3R5cGUgPT09 IFdJLklubGluZVN3YXRjaC5UeXBlLkNvbG9yKSB7CisgICAgICAgICAgICAgICAgbGV0IG5leHRG b3JtYXQgPSB0aGlzLl92YWx1ZS5uZXh0Rm9ybWF0KCk7CisgICAgICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQobmV4dEZvcm1hdCk7CisgICAgICAgICAgICAgICAgaWYgKG5leHRGb3JtYXQpIHsK KyAgICAgICAgICAgICAgICAgICAgdGhpcy5fdmFsdWUuZm9ybWF0ID0gbmV4dEZvcm1hdDsKKyAg ICAgICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlU3dhdGNoKCk7CisgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg dGhpcy5fdmFsdWUuZm9ybWF0ID0gbmV4dEZvcm1hdDsKLSAgICAgICAgICAgIHRoaXMuX3VwZGF0 ZVN3YXRjaCgpOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgaWYgKHRoaXMuX3R5 cGUgPT09IFdJLklubGluZVN3YXRjaC5UeXBlLlZhcmlhYmxlKSB7CisgICAgICAgICAgICAgICAg Ly8gRm9yY2UgdGhlIHN3YXRjaCB0byByZXBsYWNlIHRoZSBkaXNwbGF5ZWQgdGV4dCB3aXRoIHRo ZSB2YXJpYWJsZSdzIHZhbHVlLgorICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQu cmVtb3ZlKCk7CisgICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlU3dhdGNoKCk7CisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgbGV0 IGJvdW5kcyA9IFdJLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KHRoaXMuX3N3YXRjaEVsZW1lbnQu Z2V0Qm91bmRpbmdDbGllbnRSZWN0KCkpOwpAQCAtMjQ4LDEwICsyNTQsMjcgQEAgV0kuSW5saW5l U3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAg ICB0aGlzLl92YWx1ZUVkaXRvci5zcHJpbmcgPSB2YWx1ZTsKICAgICAgICAgICAgIGJyZWFrOwog Ci0gICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5cGUuVmFyaWFibGU6Ci0gICAgICAgICAg ICB0aGlzLl92YWx1ZUVkaXRvci5jb2RlTWlycm9yLnNldFZhbHVlKHZhbHVlKTsKKyAgICAgICAg Y2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5WYXJpYWJsZTogeworICAgICAgICAgICAgbGV0IGNv ZGVNaXJyb3IgPSB0aGlzLl92YWx1ZUVkaXRvci5jb2RlTWlycm9yOworICAgICAgICAgICAgY29k ZU1pcnJvci5zZXRWYWx1ZSh2YWx1ZSk7CisKKyAgICAgICAgICAgIGNvbnN0IHJhbmdlID0gbnVs bDsKKyAgICAgICAgICAgIGZ1bmN0aW9uIG9wdGlvbnNGb3JUeXBlKHR5cGUpIHsKKyAgICAgICAg ICAgICAgICByZXR1cm4geworICAgICAgICAgICAgICAgICAgICBhbGxvd2VkVG9rZW5zOiAvXGJ0 YWdcYi8sCisgICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKG1hcmtlciwgdmFsdWVPYmplY3Qs IHZhbHVlU3RyaW5nKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBsZXQgc3dhdGNoID0gbmV3 IFdJLklubGluZVN3YXRjaCh0eXBlLCB2YWx1ZU9iamVjdCwgdHJ1ZSk7CisgICAgICAgICAgICAg ICAgICAgICAgICBjb2RlTWlycm9yLnNldFVuaXF1ZUJvb2ttYXJrKHtsaW5lOiAwLCBjaDogMH0s IHN3YXRjaC5lbGVtZW50KTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IH07CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjcmVhdGVDb2RlTWlycm9yQ29sb3JUZXh0 TWFya2Vycyhjb2RlTWlycm9yLCByYW5nZSwgb3B0aW9uc0ZvclR5cGUoV0kuSW5saW5lU3dhdGNo LlR5cGUuQ29sb3IpKTsKKyAgICAgICAgICAgIGNyZWF0ZUNvZGVNaXJyb3JHcmFkaWVudFRleHRN YXJrZXJzKGNvZGVNaXJyb3IsIHJhbmdlLCBvcHRpb25zRm9yVHlwZShXSS5JbmxpbmVTd2F0Y2gu VHlwZS5HcmFkaWVudCkpOworICAgICAgICAgICAgY3JlYXRlQ29kZU1pcnJvckN1YmljQmV6aWVy VGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnNGb3JUeXBlKFdJLklubGluZVN3 YXRjaC5UeXBlLkJlemllcikpOworICAgICAgICAgICAgY3JlYXRlQ29kZU1pcnJvclNwcmluZ1Rl eHRNYXJrZXJzKGNvZGVNaXJyb3IsIHJhbmdlLCBvcHRpb25zRm9yVHlwZShXSS5JbmxpbmVTd2F0 Y2guVHlwZS5TcHJpbmcpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CisgICAgICAg IH0KICAgICB9CiAKICAgICBfdmFsdWVFZGl0b3JWYWx1ZURpZENoYW5nZShldmVudCkKQEAgLTM2 OCw2ICszOTEsOCBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVTd2F0Y2ggZXh0ZW5k cyBXSS5PYmplY3QKICAgICB9CiB9OwogCitXSS5JbmxpbmVTd2F0Y2guY2xhc3NOYW1lID0gImlu bGluZS1zd2F0Y2giOworCiBXSS5JbmxpbmVTd2F0Y2guVHlwZSA9IHsKICAgICBDb2xvcjogImlu bGluZS1zd2F0Y2gtdHlwZS1jb2xvciIsCiAgICAgR3JhZGllbnQ6ICJpbmxpbmUtc3dhdGNoLXR5 cGUtZ3JhZGllbnQiLApAQCAtMzc4LDcgKzQwMyw2IEBAIFdJLklubGluZVN3YXRjaC5UeXBlID0g ewogfTsKIAogV0kuSW5saW5lU3dhdGNoLkV2ZW50ID0gewotICAgIEJlZm9yZUNsaWNrZWQ6ICJp bmxpbmUtc3dhdGNoLWJlZm9yZS1jbGlja2VkIiwKICAgICBWYWx1ZUNoYW5nZWQ6ICJpbmxpbmUt c3dhdGNoLXZhbHVlLWNoYW5nZWQiLAogICAgIEFjdGl2YXRlZDogImlubGluZS1zd2F0Y2gtYWN0 aXZhdGVkIiwKICAgICBEZWFjdGl2YXRlZDogImlubGluZS1zd2F0Y2gtZGVhY3RpdmF0ZWQiLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCmluZGV4IDRkOGQyNTQ0NDc1 NTMyZWViN2QzNDEwOWFlNjhiNGYwNTRhZWJiYjcuLjQ2MmE4YTBhYzAwOWVjYjNhMmRiNjk5Y2Vi NDhkZWQ2NTgxMGJhMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHku anMKQEAgLTUwMCwzMCArNTAwLDI1IEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNs YXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAg ICAgICBpbm5lckVsZW1lbnQudGV4dENvbnRlbnQgPSB2YWx1ZTsKICAgICAgICAgICAgIHRoaXMu X2hhbmRsZVZhbHVlQ2hhbmdlKCk7CisKKyAgICAgICAgICAgIGlmICh0eXBlID09PSBXSS5Jbmxp bmVTd2F0Y2guVHlwZS5WYXJpYWJsZSkKKyAgICAgICAgICAgICAgICB0aGlzLl9yZW5kZXJWYWx1 ZSh0aGlzLl9wcm9wZXJ0eS5yYXdWYWx1ZSk7CiAgICAgICAgIH0sIHRoaXMpOwogCiAgICAgICAg IGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3R5bGVQcm9wZXJ0 eUlubGluZVN3YXRjaEFjdGl2YXRlZCA9PT0gImZ1bmN0aW9uIikgewogICAgICAgICAgICAgc3dh dGNoLmFkZEV2ZW50TGlzdGVuZXIoV0kuSW5saW5lU3dhdGNoLkV2ZW50LkFjdGl2YXRlZCwgKCkg PT4gewotICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEFjdGl2ZSA9IHRydWU7CiAgICAgICAg ICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc3R5bGVQcm9wZXJ0eUlubGluZVN3YXRjaEFjdGl2YXRl ZCgpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fZGVs ZWdhdGUgJiYgdHlwZW9mIHRoaXMuX2RlbGVnYXRlLnN0eWxlUHJvcGVydHlJbmxpbmVTd2F0Y2hE ZWFjdGl2YXRlZCA9PT0gImZ1bmN0aW9uIikgewogICAgICAgICAgICAgc3dhdGNoLmFkZEV2ZW50 TGlzdGVuZXIoV0kuSW5saW5lU3dhdGNoLkV2ZW50LkRlYWN0aXZhdGVkLCAoKSA9PiB7Ci0gICAg ICAgICAgICAgICAgdGhpcy5fc3dhdGNoQWN0aXZlID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg dGhpcy5fZGVsZWdhdGUuc3R5bGVQcm9wZXJ0eUlubGluZVN3YXRjaERlYWN0aXZhdGVkKCk7CiAg ICAgICAgICAgICB9KTsKICAgICAgICAgfQogCiAgICAgICAgIHRva2VuRWxlbWVudC5hcHBlbmQo c3dhdGNoLmVsZW1lbnQsIGlubmVyRWxlbWVudCk7CiAKLSAgICAgICAgLy8gUHJldmVudCB0aGUg dmFsdWUgZnJvbSBlZGl0aW5nIHdoZW4gY2xpY2tpbmcgb24gdGhlIHN3YXRjaC4KLSAgICAgICAg c3dhdGNoLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoZXZlbnQpID0+IHsKLSAg ICAgICAgICAgIGlmICh0aGlzLl9zd2F0Y2hBY3RpdmUgfHwgZXZlbnQuc2hpZnRLZXkpCi0gICAg ICAgICAgICAgICAgZXZlbnQuc3RvcCgpOwotICAgICAgICB9KTsKLQogICAgICAgICByZXR1cm4g dG9rZW5FbGVtZW50OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwpp bmRleCAxMjQ3NGE1MWEyZDgzNWQzMWYwODE5ZWM1NGFhNTMyOWMwM2E1ZGFmLi5mYWUxNWU3ZDQw YTZkYTEyY2ZiYzExYTkyNDIxYzYzNWExMWM1YjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRl eHRGaWVsZC5qcwpAQCAtMTk1LDYgKzE5NSw5IEBAIFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkID0g Y2xhc3MgU3ByZWFkc2hlZXRUZXh0RmllbGQKIAogICAgIF9oYW5kbGVDbGljayhldmVudCkKICAg ICB7CisgICAgICAgIGlmIChldmVudC50YXJnZXQuY2xvc2VzdCgiLiIgKyBXSS5JbmxpbmVTd2F0 Y2guY2xhc3NOYW1lKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB0aGlzLnN0YXJ0 RWRpdGluZygpOwogICAgIH0KIAo= 363893 2019-03-07 10:38:39 -0800 2019-03-07 11:11:58 -0800 Patch bug-195335-20190307103838.patch text/plain 15970 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZjMDJmYjUxMGU2MjViMTAzYWE4NGU1NzgwYjZk ODY5MTkyZTFjMmUuLjY4N2UyYmM5MTAzMWM0MDU3Yjk3ODEyNGFmNjI5NTcwOGJmODYzNDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTAzLTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD U1M6IHRoZXJlIHNob3VsZCBiZSBhIHdheSB0byBpbmxpbmUtcmVwbGFjZSBhIHZhcmlhYmxlIHdp dGggaXQncyB2YWx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk1MzM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanM6CisgICAgICAgIChX SS5JbmxpbmVTd2F0Y2gpOgorICAgICAgICAoV0kuSW5saW5lU3dhdGNoLnByb3RvdHlwZS5kaWRE aXNtaXNzUG9wb3Zlcik6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9zd2F0 Y2hFbGVtZW50Q2xpY2tlZCk6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9z d2F0Y2hFbGVtZW50Q2xpY2tlZC5vcHRpb25zRm9yVHlwZSk6IEFkZGVkLgorICAgICAgICBTaGlm dC1jbGlja2luZyBhIHZhcmlhYmxlIHN3YXRjaCByZXBsYWNlcyB0aGUgdGV4dCB3aXRoIHRoZSB2 YXJpYWJsZSdzIHZhbHVlLgorICAgICAgICBEcml2ZS1ieTogdHJ5IHRvIGNyZWF0ZSBhIHJlYWRv bmx5IHN3YXRjaCBmb3IgdGhlIHZhcmlhYmxlJ3MgdmFsdWUgKGUuZy4gYSBjb2xvciBpbmRpY2F0 b3IpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJv cGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkucHJvdG90eXBl Ll9jcmVhdGVJbmxpbmVTd2F0Y2gpOgorICAgICAgICBJZiB0aGUgdmFsdWUgb2YgYSB2YXJpYWJs ZSBzd2F0Y2ggY2hhbmdlcywgcmUtcmVuZGVyIHRoZSB2YWx1ZS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvclRleHRNYXJrZXJzLmpzOgorICAgICAgICAoY3JlYXRl Q29kZU1pcnJvclRleHRNYXJrZXJzKToKKyAgICAgICAgKGNyZWF0ZUNvZGVNaXJyb3JDb2xvclRl eHRNYXJrZXJzKToKKyAgICAgICAgKGNyZWF0ZUNvZGVNaXJyb3JHcmFkaWVudFRleHRNYXJrZXJz KToKKyAgICAgICAgKGNyZWF0ZUNvZGVNaXJyb3JCZXppZXJUZXh0TWFya2Vycyk6CisgICAgICAg IChjcmVhdGVDb2RlTWlycm9yU3ByaW5nVGV4dE1hcmtlcnMpOgorICAgICAgICBSZWZhY3RvciBm dW5jdGlvbiBwYXJhbWV0ZXJzIGZvciBtb3JlIGZsZXhpYmlsaXR5LgorCisgICAgICAgICogTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDE5LTAzLTA2ICBE ZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBFbGVtZW50czogaGlnaGxpZ2h0IHRoZSBub2RlIHdoZW4gaG92ZXJpbmcgZXZlbnQgbGlzdGVu ZXJzIHNvcnRlZCBieSBub2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBh NDUwOWQ2NjA4YjYyYzg2NzQ1NzI1MDljZGQ4ODZmNGRkMDdkMTAyLi43NDM3OGFjOWQ2MTMxZjEy MDQ5MTA4ZjE5NjVmMWY2ZjMyN2YyZWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKQEAgLTIyMyw3ICsyMjMsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDbGVhciBzYW1wbGVzIl0g PSAiQ2xlYXIgc2FtcGxlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbGVhciB3YXRjaCBleHByZXNz aW9ucyJdID0gIkNsZWFyIHdhdGNoIGV4cHJlc3Npb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNs aWNrIExpc3RlbmVyIl0gPSAiQ2xpY2sgTGlzdGVuZXIiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xp Y2sgdG8gY2xvc2UgdGhpcyB0YWIiXSA9ICJDbGljayB0byBjbG9zZSB0aGlzIHRhYiI7Ci1sb2Nh bGl6ZWRTdHJpbmdzWyJDbGljayB0byBzZWxlY3QgYSBjb2xvci4gU2hpZnQtY2xpY2sgdG8gc3dp dGNoIGNvbG9yIGZvcm1hdHMuIl0gPSAiQ2xpY2sgdG8gc2VsZWN0IGEgY29sb3IuIFNoaWZ0LWNs aWNrIHRvIHN3aXRjaCBjb2xvciBmb3JtYXRzLiI7Citsb2NhbGl6ZWRTdHJpbmdzWyJDbGljayB0 byBzZWxlY3QgYSBjb2xvclxuU2hpZnQtY2xpY2sgdG8gc3dpdGNoIGNvbG9yIGZvcm1hdHMiXSA9 ICJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQtY2xpY2sgdG8gc3dpdGNoIGNvbG9yIGZv cm1hdHMiOworbG9jYWxpemVkU3RyaW5nc1siQ2xpY2sgdG8gdmlldyB2YXJpYWJsZSB2YWx1ZVxu U2hpZnQtY2xpY2sgdG8gcmVwbGFjZSB2YXJpYWJsZSB3aXRoIHZhbHVlIl0gPSAiQ2xpY2sgdG8g dmlldyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sgdG8gcmVwbGFjZSB2YXJpYWJsZSB3aXRo IHZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsaWNrYWJsZSJdID0gIkNsaWNrYWJsZSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJDbG9zZSJdID0gIkNsb3NlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNs b3NlICVzIHRpbWVsaW5lIHZpZXciXSA9ICJDbG9zZSAlcyB0aW1lbGluZSB2aWV3IjsKQEAgLTEx MDAsNyArMTEwMSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlZlcnkgSGlnaCJdID0gIlZlcnkgSGln aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWaWV3IEltYWdlIl0gPSAiVmlldyBJbWFnZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJWaWV3IFJlY29yZGluZyJdID0gIlZpZXcgUmVjb3JkaW5nIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlZpZXcgU2hhZGVyIl0gPSAiVmlldyBTaGFkZXIiOwotbG9jYWxpemVkU3Ry aW5nc1siVmlldyB2YXJpYWJsZSB2YWx1ZSJdID0gIlZpZXcgdmFyaWFibGUgdmFsdWUiOwogbG9j YWxpemVkU3RyaW5nc1siVmlzaWJsZSJdID0gIlZpc2libGUiOwogbG9jYWxpemVkU3RyaW5nc1si V2FpdGluZyJdID0gIldhaXRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siV2FpdGluZyBmb3IgY2Fu dmFzIGNvbnRleHRzIGNyZWF0ZWQgYnkgc2NyaXB0IG9yIENTUy4iXSA9ICJXYWl0aW5nIGZvciBj YW52YXMgY29udGV4dHMgY3JlYXRlZCBieSBzY3JpcHQgb3IgQ1NTLiI7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yVGV4dE1h cmtlcnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2Rl TWlycm9yVGV4dE1hcmtlcnMuanMKaW5kZXggZjg3NTRjNGYwYWEzNTQ0OWUyODE4NzQ1MDdhYzIz YzMxMjVjYWZlMy4uMWQ0NzY5MzAxZjU2NTI0NDlhOTlmMzk0MDkxZjQ3ZWEwMDdmMjdmOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1p cnJvclRleHRNYXJrZXJzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvZGVNaXJyb3JUZXh0TWFya2Vycy5qcwpAQCAtMjMsNyArMjMsNyBAQAogICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLWZ1bmN0aW9uIGNyZWF0ZUNv ZGVNaXJyb3JUZXh0TWFya2Vycyh0eXBlLCBwYXR0ZXJuLCBtYXRjaEZ1bmN0aW9uLCBjb2RlTWly cm9yLCByYW5nZSwgY2FsbGJhY2spCitmdW5jdGlvbiBjcmVhdGVDb2RlTWlycm9yVGV4dE1hcmtl cnMoe2NvZGVNaXJyb3IsIHJhbmdlLCB0eXBlLCBwYXR0ZXJuLCBtYXRjaEZ1bmN0aW9uLCBhbGxv d2VkVG9rZW5zLCBjYWxsYmFja30pCiB7CiAgICAgdmFyIGNyZWF0ZWRNYXJrZXJzID0gW107CiAg ICAgdmFyIHN0YXJ0ID0gcmFuZ2UgaW5zdGFuY2VvZiBXSS5UZXh0UmFuZ2UgPyByYW5nZS5zdGFy dExpbmUgOiAwOwpAQCAtNTYsNyArNTYsNyBAQCBmdW5jdGlvbiBjcmVhdGVDb2RlTWlycm9yVGV4 dE1hcmtlcnModHlwZSwgcGF0dGVybiwgbWF0Y2hGdW5jdGlvbiwgY29kZU1pcnJvciwgcgogCiAg ICAgICAgICAgICAvLyBXZSdyZSBub3QgaW50ZXJlc3RlZCBpZiB0aGUgdmFsdWUgaXMgbm90IGlu c2lkZSBhIGtleXdvcmQuCiAgICAgICAgICAgICB2YXIgdG9rZW5UeXBlID0gY29kZU1pcnJvci5n ZXRUb2tlblR5cGVBdChmcm9tKTsKLSAgICAgICAgICAgIGlmICh0b2tlblR5cGUgJiYgIXRva2Vu VHlwZS5pbmNsdWRlcygia2V5d29yZCIpKSB7CisgICAgICAgICAgICBpZiAodG9rZW5UeXBlICYm ICF0b2tlblR5cGUuaW5jbHVkZXMoImtleXdvcmQiKSAmJiAoIWFsbG93ZWRUb2tlbnMgfHwgIWFs bG93ZWRUb2tlbnMudGVzdCh0b2tlblR5cGUpKSkgewogICAgICAgICAgICAgICAgIG1hdGNoID0g cGF0dGVybi5leGVjKGxpbmVDb250ZW50KTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgICAgIH0KQEAgLTgyLDEwICs4MiwxMCBAQCBmdW5jdGlvbiBjcmVhdGVDb2RlTWlycm9y VGV4dE1hcmtlcnModHlwZSwgcGF0dGVybiwgbWF0Y2hGdW5jdGlvbiwgY29kZU1pcnJvciwgcgog ICAgIHJldHVybiBjcmVhdGVkTWFya2VyczsKIH0KIAotZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJv ckNvbG9yVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQorZnVuY3Rpb24g Y3JlYXRlQ29kZU1pcnJvckNvbG9yVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlv bnMgPSB7fSkKIHsKICAgICAvLyBNYXRjaGVzIHJnYmEoMCwgMCwgMCwgMC41KSwgcmdiKDAsIDAs IDApLCBoc2woKSwgaHNsYSgpLCAjZmZmLCAjZmZmZiwgI2ZmZmZmZiwgI2ZmZmZmZmZmLCB3aGl0 ZQotICAgIGxldCBjb2xvclJlZ2V4ID0gLygoPzpyZ2J8aHNsKWE/XChbXildK1wpfCNbMC05YS1m QS1GXXs4fXwjWzAtOWEtZkEtRl17Nn18I1swLTlhLWZBLUZdezMsNH18XGJcdytcYig/IVstLl0p KS9nOworICAgIGNvbnN0IHBhdHRlcm4gPSAvKCg/OnJnYnxoc2wpYT9cKFteKV0rXCl8I1swLTlh LWZBLUZdezh9fCNbMC05YS1mQS1GXXs2fXwjWzAtOWEtZkEtRl17Myw0fXxcYlx3K1xiKD8hWy0u XSkpL2c7CiAgICAgZnVuY3Rpb24gbWF0Y2hGdW5jdGlvbihsaW5lQ29udGVudCwgbWF0Y2gpIHsK ICAgICAgICAgaWYgKCFsaW5lQ29udGVudCB8fCAhbGluZUNvbnRlbnQubGVuZ3RoKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTE4LDEwICsxMTgsMTAgQEAgZnVuY3Rpb24gY3JlYXRl Q29kZU1pcnJvckNvbG9yVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQog ICAgICAgICByZXR1cm4gIShtYXRjaC5pbmRleCA+IDAgJiYgL1stLlwiXCddLy50ZXN0KGxpbmVD b250ZW50W21hdGNoLmluZGV4IC0gMV0pKTsKICAgICB9CiAKLSAgICByZXR1cm4gY3JlYXRlQ29k ZU1pcnJvclRleHRNYXJrZXJzKCJDb2xvciIsIGNvbG9yUmVnZXgsIG1hdGNoRnVuY3Rpb24sIGNv ZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFjayk7CisgICAgcmV0dXJuIGNyZWF0ZUNvZGVNaXJyb3JU ZXh0TWFya2Vycyh7Y29kZU1pcnJvciwgcmFuZ2UsIHR5cGU6ICJDb2xvciIsIHBhdHRlcm4sIG1h dGNoRnVuY3Rpb24sIC4uLm9wdGlvbnN9KTsKIH0KIAotZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJv ckdyYWRpZW50VGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQorZnVuY3Rp b24gY3JlYXRlQ29kZU1pcnJvckdyYWRpZW50VGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2Us IG9wdGlvbnMgPSB7fSkKIHsKICAgICB2YXIgY3JlYXRlZE1hcmtlcnMgPSBbXTsKIApAQCAtMTgx LDcgKzE4MSw3IEBAIGZ1bmN0aW9uIGNyZWF0ZUNvZGVNaXJyb3JHcmFkaWVudFRleHRNYXJrZXJz KGNvZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFjaykKICAgICAgICAgICAgIGNyZWF0ZWRNYXJrZXJz LnB1c2gobWFya2VyKTsKIAogICAgICAgICAgICAgaWYgKHR5cGVvZiBjYWxsYmFjayA9PT0gImZ1 bmN0aW9uIikKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhtYXJrZXIsIGdyYWRpZW50LCBncmFk aWVudFN0cmluZyk7CisgICAgICAgICAgICAgICAgb3B0aW9ucy5jYWxsYmFjayhtYXJrZXIsIGdy YWRpZW50LCBncmFkaWVudFN0cmluZyk7CiAKICAgICAgICAgICAgIG1hdGNoID0gZ3JhZGllbnRS ZWdleC5leGVjKGxpbmVDb250ZW50KTsKICAgICAgICAgfQpAQCAtMTkwLDE0ICsxOTAsMTQgQEAg ZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckdyYWRpZW50VGV4dE1hcmtlcnMoY29kZU1pcnJvciwg cmFuZ2UsIGNhbGxiYWNrKQogICAgIHJldHVybiBjcmVhdGVkTWFya2VyczsKIH0KIAotZnVuY3Rp b24gY3JlYXRlQ29kZU1pcnJvckN1YmljQmV6aWVyVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFu Z2UsIGNhbGxiYWNrKQorZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJvckN1YmljQmV6aWVyVGV4dE1h cmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnMgPSB7fSkKIHsKLSAgICB2YXIgY3ViaWNC ZXppZXJSZWdleCA9IC8oY3ViaWMtYmV6aWVyXChbXildK1wpfFxiXHcrXGIoPzotXGJcdytcYil7 MCwyfSkvZzsKLSAgICByZXR1cm4gY3JlYXRlQ29kZU1pcnJvclRleHRNYXJrZXJzKCJDdWJpY0Jl emllciIsIGN1YmljQmV6aWVyUmVnZXgsIG51bGwsIGNvZGVNaXJyb3IsIHJhbmdlLCBjYWxsYmFj ayk7CisgICAgY29uc3QgcGF0dGVybiA9IC8oY3ViaWMtYmV6aWVyXChbXildK1wpfFxiXHcrXGIo PzotXGJcdytcYil7MCwyfSkvZzsKKyAgICByZXR1cm4gY3JlYXRlQ29kZU1pcnJvclRleHRNYXJr ZXJzKHtjb2RlTWlycm9yLCByYW5nZSwgdHlwZTogIkN1YmljQmV6aWVyIiwgcGF0dGVybiwgLi4u b3B0aW9uc30pOwogfQogCi1mdW5jdGlvbiBjcmVhdGVDb2RlTWlycm9yU3ByaW5nVGV4dE1hcmtl cnMoY29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKQorZnVuY3Rpb24gY3JlYXRlQ29kZU1pcnJv clNwcmluZ1RleHRNYXJrZXJzKGNvZGVNaXJyb3IsIHJhbmdlLCBvcHRpb25zID0ge30pCiB7Ci0g ICAgY29uc3Qgc3ByaW5nUmVnZXggPSAvKHNwcmluZ1woW14pXStcKSkvZzsKLSAgICByZXR1cm4g Y3JlYXRlQ29kZU1pcnJvclRleHRNYXJrZXJzKCJTcHJpbmciLCBzcHJpbmdSZWdleCwgbnVsbCwg Y29kZU1pcnJvciwgcmFuZ2UsIGNhbGxiYWNrKTsKKyAgICBjb25zdCBwYXR0ZXJuID0gLyhzcHJp bmdcKFteKV0rXCkpL2c7CisgICAgcmV0dXJuIGNyZWF0ZUNvZGVNaXJyb3JUZXh0TWFya2Vycyh7 Y29kZU1pcnJvciwgcmFuZ2UsIHR5cGU6ICJTcHJpbmciLCBwYXR0ZXJuLCAuLi5vcHRpb25zfSk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9JbmxpbmVTd2F0Y2guanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9JbmxpbmVTd2F0Y2guanMKaW5kZXggMmE0NjQ0MjMzZDY5NWVmZDU1ZWVmOGFmNWEyNDM5 YzM3ZjIyMTRhMC4uNGRlMWZkNGRhOGE4MmQ0MTg2YzBjZWUyMmUxOTM1YWYyMjdhYzdjMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5l U3dhdGNoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0lubGluZVN3YXRjaC5qcwpAQCAtNDEsMTQgKzQxLDEyIEBAIFdJLklubGluZVN3YXRjaCA9IGNs YXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIHRoaXMuX3N3YXRj aEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaW5saW5lLXN3YXRjaCIsIHRoaXMuX3R5cGUuc3BsaXQo Ii0iKS5sYXN0VmFsdWUpOwogCi0gICAgICAgIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVudENsaWNr ZWQgPSBudWxsOwotCiAgICAgICAgIGlmIChyZWFkT25seSkKICAgICAgICAgICAgIHRoaXMuX3N3 YXRjaEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmVhZC1vbmx5Iik7CiAgICAgICAgIGVsc2Ugewog ICAgICAgICAgICAgc3dpdGNoICh0aGlzLl90eXBlKSB7CiAgICAgICAgICAgICBjYXNlIFdJLklu bGluZVN3YXRjaC5UeXBlLkNvbG9yOgotICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1l bnQudGl0bGUgPSBXSS5VSVN0cmluZygiQ2xpY2sgdG8gc2VsZWN0IGEgY29sb3IuIFNoaWZ0LWNs aWNrIHRvIHN3aXRjaCBjb2xvciBmb3JtYXRzLiIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3 YXRjaEVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiQ2xpY2sgdG8gc2VsZWN0IGEgY29sb3Jc blNoaWZ0LWNsaWNrIHRvIHN3aXRjaCBjb2xvciBmb3JtYXRzIik7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdJLklubGluZVN3YXRjaC5UeXBlLkdyYWRpZW50Ogog ICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygi RWRpdCBjdXN0b20gZ3JhZGllbnQiKTsKQEAgLTYwLDcgKzU4LDcgQEAgV0kuSW5saW5lU3dhdGNo ID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAg dGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5nKCJFZGl0IFx1MjAxQ3Nwcmlu Z1x1MjAxRCBmdW5jdGlvbiIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Y2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5WYXJpYWJsZToKLSAgICAgICAgICAgICAgICB0aGlz Ll9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIlZpZXcgdmFyaWFibGUgdmFsdWUi KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJp bmcoIkNsaWNrIHRvIHZpZXcgdmFyaWFibGUgdmFsdWVcblNoaWZ0LWNsaWNrIHRvIHJlcGxhY2Ug dmFyaWFibGUgd2l0aCB2YWx1ZSIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgY2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5JbWFnZToKICAgICAgICAgICAgICAgICB0aGlz Ll9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIlZpZXcgSW1hZ2UiKTsKQEAgLTcw LDggKzY4LDcgQEAgV0kuSW5saW5lU3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKLSAgICAg ICAgICAgIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVudENsaWNrZWQgPSB0aGlzLl9zd2F0Y2hFbGVt ZW50Q2xpY2tlZC5iaW5kKHRoaXMpOwotICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVudENsaWNrZWQp OworICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGlj ayIsIHRoaXMuX3N3YXRjaEVsZW1lbnRDbGlja2VkLmJpbmQodGhpcykpOwogICAgICAgICAgICAg aWYgKHRoaXMuX3R5cGUgPT09IFdJLklubGluZVN3YXRjaC5UeXBlLkNvbG9yKQogICAgICAgICAg ICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUi LCB0aGlzLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LmJpbmQodGhpcykpOwogICAgICAgICB9CkBA IC0xMDksMTEgKzEwNiwxMyBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVTd2F0Y2gg ZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKCF0aGlzLl92YWx1ZUVkaXRvcikKICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAodHlwZW9mIHRoaXMuX3ZhbHVlRWRpdG9yLnJl bW92ZUxpc3RlbmVycyA9PT0gImZ1bmN0aW9uIikKKyAgICAgICAgaWYgKHRoaXMuX3ZhbHVlRWRp dG9yLnJlbW92ZUxpc3RlbmVycykKICAgICAgICAgICAgIHRoaXMuX3ZhbHVlRWRpdG9yLnJlbW92 ZUxpc3RlbmVycygpOwogCi0gICAgICAgIGlmICh0aGlzLl9ib3VuZFN3YXRjaEVsZW1lbnRDbGlj a2VkKQotICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVudENsaWNrZWQpOworICAgICAgICBpZiAodGhp cy5fdmFsdWVFZGl0b3IgaW5zdGFuY2VvZiBXSS5PYmplY3QpCisgICAgICAgICAgICB0aGlzLl92 YWx1ZUVkaXRvci5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworCisgICAg ICAgIHRoaXMuX3ZhbHVlRWRpdG9yID0gbnVsbDsKIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXSS5JbmxpbmVTd2F0Y2guRXZlbnQuRGVhY3RpdmF0ZWQpOwogICAgIH0K QEAgLTE0OSwxOSArMTQ4LDMwIEBAIFdJLklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRj aCBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgX3N3YXRjaEVsZW1lbnRDbGlja2VkKGV2ZW50KQog ICAgIHsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuSW5saW5lU3dh dGNoLkV2ZW50LkJlZm9yZUNsaWNrZWQpOworICAgICAgICBldmVudC5zdG9wKCk7CiAKLSAgICAg ICAgaWYgKHRoaXMuX3R5cGUgPT09IFdJLklubGluZVN3YXRjaC5UeXBlLkNvbG9yICYmIGV2ZW50 LnNoaWZ0S2V5ICYmIHRoaXMuX3ZhbHVlKSB7Ci0gICAgICAgICAgICBsZXQgbmV4dEZvcm1hdCA9 IHRoaXMuX3ZhbHVlLm5leHRGb3JtYXQoKTsKLSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG5l eHRGb3JtYXQpOwotICAgICAgICAgICAgaWYgKCFuZXh0Rm9ybWF0KQorICAgICAgICBpZiAoZXZl bnQuc2hpZnRLZXkgJiYgdGhpcy5fdmFsdWUpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLl90eXBl ID09PSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5Db2xvcikgeworICAgICAgICAgICAgICAgIGxldCBu ZXh0Rm9ybWF0ID0gdGhpcy5fdmFsdWUubmV4dEZvcm1hdCgpOworICAgICAgICAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KG5leHRGb3JtYXQpOworICAgICAgICAgICAgICAgIGlmIChuZXh0Rm9ybWF0 KSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3ZhbHVlLmZvcm1hdCA9IG5leHRGb3JtYXQ7 CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVN3YXRjaCgpOworICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAKLSAgICAgICAg ICAgIHRoaXMuX3ZhbHVlLmZvcm1hdCA9IG5leHRGb3JtYXQ7Ci0gICAgICAgICAgICB0aGlzLl91 cGRhdGVTd2F0Y2goKTsKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGlmICh0aGlz Ll90eXBlID09PSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5WYXJpYWJsZSkgeworICAgICAgICAgICAg ICAgIC8vIEZvcmNlIHRoZSBzd2F0Y2ggdG8gcmVwbGFjZSB0aGUgZGlzcGxheWVkIHRleHQgd2l0 aCB0aGUgdmFyaWFibGUncyB2YWx1ZS4KKyAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVt ZW50LnJlbW92ZSgpOworICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVN3YXRjaCgpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAg IGlmICh0aGlzLl92YWx1ZUVkaXRvcikKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBs ZXQgYm91bmRzID0gV0kuUmVjdC5yZWN0RnJvbUNsaWVudFJlY3QodGhpcy5fc3dhdGNoRWxlbWVu dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKSk7CiAgICAgICAgIGxldCBwb3BvdmVyID0gbmV3IFdJ LlBvcG92ZXIodGhpcyk7CiAKQEAgLTIyNSw5ICsyMzUsNiBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBj bGFzcyBJbmxpbmVTd2F0Y2ggZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgcG9wb3Zlci5jb250 ZW50ID0gdGhpcy5fdmFsdWVFZGl0b3IuZWxlbWVudDsKICAgICAgICAgcG9wb3Zlci5wcmVzZW50 KGJvdW5kcy5wYWQoMiksIFtXSS5SZWN0RWRnZS5NSU5fWF0pOwogCi0gICAgICAgIGlmICh0aGlz Ll9ib3VuZFN3YXRjaEVsZW1lbnRDbGlja2VkKQotICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxl bWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3dhdGNoRWxlbWVu dENsaWNrZWQpOwotCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLklu bGluZVN3YXRjaC5FdmVudC5BY3RpdmF0ZWQpOwogCiAgICAgICAgIGxldCB2YWx1ZSA9IHRoaXMu X3ZhbHVlIHx8IHRoaXMuX2ZhbGxiYWNrVmFsdWUoKTsKQEAgLTI0OCwxMCArMjU1LDI3IEBAIFdJ LklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJLk9iamVjdAogICAg ICAgICAgICAgdGhpcy5fdmFsdWVFZGl0b3Iuc3ByaW5nID0gdmFsdWU7CiAgICAgICAgICAgICBi cmVhazsKIAotICAgICAgICBjYXNlIFdJLklubGluZVN3YXRjaC5UeXBlLlZhcmlhYmxlOgotICAg ICAgICAgICAgdGhpcy5fdmFsdWVFZGl0b3IuY29kZU1pcnJvci5zZXRWYWx1ZSh2YWx1ZSk7Cisg ICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5cGUuVmFyaWFibGU6IHsKKyAgICAgICAgICAg IGxldCBjb2RlTWlycm9yID0gdGhpcy5fdmFsdWVFZGl0b3IuY29kZU1pcnJvcjsKKyAgICAgICAg ICAgIGNvZGVNaXJyb3Iuc2V0VmFsdWUodmFsdWUpOworCisgICAgICAgICAgICBjb25zdCByYW5n ZSA9IG51bGw7CisgICAgICAgICAgICBmdW5jdGlvbiBvcHRpb25zRm9yVHlwZSh0eXBlKSB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgICAgICAgICAgICAgYWxsb3dlZFRva2Vu czogL1xidGFnXGIvLAorICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhtYXJrZXIsIHZhbHVl T2JqZWN0LCB2YWx1ZVN0cmluZykgeworICAgICAgICAgICAgICAgICAgICAgICAgbGV0IHN3YXRj aCA9IG5ldyBXSS5JbmxpbmVTd2F0Y2godHlwZSwgdmFsdWVPYmplY3QsIHRydWUpOworICAgICAg ICAgICAgICAgICAgICAgICAgY29kZU1pcnJvci5zZXRVbmlxdWVCb29rbWFyayh7bGluZTogMCwg Y2g6IDB9LCBzd2F0Y2guZWxlbWVudCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICB9OworICAgICAgICAgICAgfQorICAgICAgICAgICAgY3JlYXRlQ29kZU1pcnJvckNv bG9yVGV4dE1hcmtlcnMoY29kZU1pcnJvciwgcmFuZ2UsIG9wdGlvbnNGb3JUeXBlKFdJLklubGlu ZVN3YXRjaC5UeXBlLkNvbG9yKSk7CisgICAgICAgICAgICBjcmVhdGVDb2RlTWlycm9yR3JhZGll bnRUZXh0TWFya2Vycyhjb2RlTWlycm9yLCByYW5nZSwgb3B0aW9uc0ZvclR5cGUoV0kuSW5saW5l U3dhdGNoLlR5cGUuR3JhZGllbnQpKTsKKyAgICAgICAgICAgIGNyZWF0ZUNvZGVNaXJyb3JDdWJp Y0JlemllclRleHRNYXJrZXJzKGNvZGVNaXJyb3IsIHJhbmdlLCBvcHRpb25zRm9yVHlwZShXSS5J bmxpbmVTd2F0Y2guVHlwZS5CZXppZXIpKTsKKyAgICAgICAgICAgIGNyZWF0ZUNvZGVNaXJyb3JT cHJpbmdUZXh0TWFya2Vycyhjb2RlTWlycm9yLCByYW5nZSwgb3B0aW9uc0ZvclR5cGUoV0kuSW5s aW5lU3dhdGNoLlR5cGUuU3ByaW5nKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQor ICAgICAgICB9CiAgICAgfQogCiAgICAgX3ZhbHVlRWRpdG9yVmFsdWVEaWRDaGFuZ2UoZXZlbnQp CkBAIC0zNzgsNyArNDAyLDYgQEAgV0kuSW5saW5lU3dhdGNoLlR5cGUgPSB7CiB9OwogCiBXSS5J bmxpbmVTd2F0Y2guRXZlbnQgPSB7Ci0gICAgQmVmb3JlQ2xpY2tlZDogImlubGluZS1zd2F0Y2gt YmVmb3JlLWNsaWNrZWQiLAogICAgIFZhbHVlQ2hhbmdlZDogImlubGluZS1zd2F0Y2gtdmFsdWUt Y2hhbmdlZCIsCiAgICAgQWN0aXZhdGVkOiAiaW5saW5lLXN3YXRjaC1hY3RpdmF0ZWQiLAogICAg IERlYWN0aXZhdGVkOiAiaW5saW5lLXN3YXRjaC1kZWFjdGl2YXRlZCIsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxl UHJvcGVydHkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKaW5kZXggNGQ4ZDI1NDQ0NzU1MzJlZWI3ZDM0MTA5 YWU2OGI0ZjA1NGFlYmJiNy4uNDYyYThhMGFjMDA5ZWNiM2EyZGI2OTljZWI0OGRlZDY1ODEwYmEx YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwpAQCAtNTAwLDMw ICs1MDAsMjUgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hl ZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgICAgIGlubmVyRWxl bWVudC50ZXh0Q29udGVudCA9IHZhbHVlOwogICAgICAgICAgICAgdGhpcy5faGFuZGxlVmFsdWVD aGFuZ2UoKTsKKworICAgICAgICAgICAgaWYgKHR5cGUgPT09IFdJLklubGluZVN3YXRjaC5UeXBl LlZhcmlhYmxlKQorICAgICAgICAgICAgICAgIHRoaXMuX3JlbmRlclZhbHVlKHRoaXMuX3Byb3Bl cnR5LnJhd1ZhbHVlKTsKICAgICAgICAgfSwgdGhpcyk7CiAKICAgICAgICAgaWYgKHRoaXMuX2Rl bGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5zdHlsZVByb3BlcnR5SW5saW5lU3dhdGNo QWN0aXZhdGVkID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgICAgICBzd2F0Y2guYWRkRXZlbnRM aXN0ZW5lcihXSS5JbmxpbmVTd2F0Y2guRXZlbnQuQWN0aXZhdGVkLCAoKSA9PiB7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fc3dhdGNoQWN0aXZlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS5zdHlsZVByb3BlcnR5SW5saW5lU3dhdGNoQWN0aXZhdGVkKCk7CiAgICAgICAg ICAgICB9KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBl b2YgdGhpcy5fZGVsZWdhdGUuc3R5bGVQcm9wZXJ0eUlubGluZVN3YXRjaERlYWN0aXZhdGVkID09 PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgICAgICBzd2F0Y2guYWRkRXZlbnRMaXN0ZW5lcihXSS5J bmxpbmVTd2F0Y2guRXZlbnQuRGVhY3RpdmF0ZWQsICgpID0+IHsKLSAgICAgICAgICAgICAgICB0 aGlzLl9zd2F0Y2hBY3RpdmUgPSBmYWxzZTsKICAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0 ZS5zdHlsZVByb3BlcnR5SW5saW5lU3dhdGNoRGVhY3RpdmF0ZWQoKTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9CiAKICAgICAgICAgdG9rZW5FbGVtZW50LmFwcGVuZChzd2F0Y2guZWxlbWVu dCwgaW5uZXJFbGVtZW50KTsKIAotICAgICAgICAvLyBQcmV2ZW50IHRoZSB2YWx1ZSBmcm9tIGVk aXRpbmcgd2hlbiBjbGlja2luZyBvbiB0aGUgc3dhdGNoLgotICAgICAgICBzd2F0Y2guZWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIChldmVudCkgPT4gewotICAgICAgICAgICAgaWYg KHRoaXMuX3N3YXRjaEFjdGl2ZSB8fCBldmVudC5zaGlmdEtleSkKLSAgICAgICAgICAgICAgICBl dmVudC5zdG9wKCk7Ci0gICAgICAgIH0pOwotCiAgICAgICAgIHJldHVybiB0b2tlbkVsZW1lbnQ7 CiAgICAgfQogCg==