209879 2020-04-01 14:05:19 -0700 Web Inspector: Use ECMAScript Numeric Separators for numbers with 5 or more digits 2020-04-01 15:51:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1636651 0 nvasilyev 2020-04-01 14:05:19 -0700 Instead of `1000000` write `1_000_000` so it's easier to read. 1636652 1 395201 nvasilyev 2020-04-01 14:08:15 -0700 Created attachment 395201 Patch 1636672 2 395201 joepeck 2020-04-01 14:58:53 -0700 Comment on attachment 395201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395201&action=review Nice! Some comments > Source/WebInspectorUI/UserInterface/Models/Geometry.js:569 > - epsilon = epsilon || 0.0001; > + epsilon = epsilon || 0.000_1; I don't like this one. But maybe that is just me? > Source/WebInspectorUI/UserInterface/Models/ProfileNode.js:161 > + if (this._selfTime < 0.000_1) Ditto > Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js:539 > +WI.TimelineRecording.TimestampThresholdForLegacyAssumedMilliseconds = 1_420_099_200_000; // Date.parse("Jan 1, 2015"). Milliseconds since epoch. This is a very specific thing, not sure we even want to fake it being readable. > Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js:392 > + totalElement.textContent = Number.percentageString(percent === 1 ? percent : (percent - 0.000_5)); Ditto. 1636675 3 395201 nvasilyev 2020-04-01 15:03:54 -0700 Comment on attachment 395201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395201&action=review >> Source/WebInspectorUI/UserInterface/Models/Geometry.js:569 >> + epsilon = epsilon || 0.000_1; > > I don't like this one. But maybe that is just me? Yeah, I wasn't sure about this myself. I can revert. >> Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js:539 >> +WI.TimelineRecording.TimestampThresholdForLegacyAssumedMilliseconds = 1_420_099_200_000; // Date.parse("Jan 1, 2015"). Milliseconds since epoch. > > This is a very specific thing, not sure we even want to fake it being readable. I agree. I simply found numbers with 5 or more digits. I'll revert this chunk if you think the rest is r+ worthy. 1636676 4 joepeck 2020-04-01 15:07:43 -0700 > I agree. I simply found numbers with 5 or more digits. I'll revert this > chunk if you think the rest is r+ worthy. Yep 1636678 5 395209 nvasilyev 2020-04-01 15:13:37 -0700 Created attachment 395209 Patch 1636684 6 395209 joepeck 2020-04-01 15:25:16 -0700 Comment on attachment 395209 Patch r=me 1636704 7 ews-feeder 2020-04-01 15:50:22 -0700 Committed r259368: <https://trac.webkit.org/changeset/259368> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395209. 1636705 8 webkit-bug-importer 2020-04-01 15:51:19 -0700 <rdar://problem/61179192> 395201 2020-04-01 14:08:15 -0700 2020-04-01 15:13:37 -0700 Patch patch.txt text/plain 12245 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi44MTdhMjZkNDJjOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDQtMDEgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogVXNlIEVDTUFTY3JpcHQgTnVtZXJpYyBTZXBhcmF0b3JzIGZvciBudW1iZXJzIHdpdGggNSBv ciBtb3JlIGRpZ2l0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA5ODc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBgMTAwMDAwMGAgd3JpdGUgYDFfMDAwXzAwMGAgc28gaXQncyBlYXNp ZXIgdG8gcmVhZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGlu ZU1hbmFnZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvR2VvbWV0cnkuanM6 CisgICAgICAgIChXSS5TcHJpbmcucHJvdG90eXBlLmNhbGN1bGF0ZUR1cmF0aW9uKToKKyAgICAg ICAgKFdJLlNwcmluZyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQu anM6CisgICAgICAgIChXSS5HcmFkaWVudC5wcm90b3R5cGUuc3RyaW5nRnJvbVN0b3BzKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9IZWFwQWxsb2NhdGlvbnNJbnN0cnVtZW50Lmpz OgorICAgICAgICAoV0kuSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5wcm90b3R5cGUuc3RhcnRJ bnN0cnVtZW50YXRpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2ZpbGVO b2RlLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5n LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5qczoKKyAg ICAgICAgKEluc3BlY3RvckJhY2tlbmQuQ29ubmVjdGlvbi5wcm90b3R5cGUuX2Rpc3BhdGNoUmVz cG9uc2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBlLmluaXRpYWxM YXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3 LmpzOgorICAgICAgICAoV0kuTWVtb3J5VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdXBkYXRlTWF4 Q29tcGFyaXNvbkxlZ2VuZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3Jr VGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 LnByb3RvdHlwZS5fdXBkYXRlTG9hZFRpbWVTdGF0aXN0aWMpOgorCiAyMDIwLTAzLTI2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBh ZGQga2V5Ym9hcmQgc2hvcnRjdXQgdG8gdG9vbHRpcCBvZiBwaW5uZWQgdGFicwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpp bmRleCAwNDU5NjIyYTUxMS4uZjgxYWVlNmJmZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xMzQ4LDEzICsx MzQ4LDEzIEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShOdW1iZXIsICJhYmJyZXZpYXRlIiwKICAg ICAgICAgaWYgKG51bSA8IDEwMDApCiAgICAgICAgICAgICByZXR1cm4gbnVtLnRvTG9jYWxlU3Ry aW5nKCk7CiAKLSAgICAgICAgaWYgKG51bSA8IDEwMDAwMDApCisgICAgICAgIGlmIChudW0gPCAx XzAwMF8wMDApCiAgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIiUuMWZLIikuZm9ybWF0 KE1hdGgucm91bmQobnVtIC8gMTAwKSAvIDEwKTsKIAotICAgICAgICBpZiAobnVtIDwgMTAwMDAw MDAwMCkKLSAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiJS4xZk0iKS5mb3JtYXQoTWF0 aC5yb3VuZChudW0gLyAxMDAwMDApIC8gMTApOworICAgICAgICBpZiAobnVtIDwgMV8wMDBfMDAw XzAwMCkKKyAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiJS4xZk0iKS5mb3JtYXQoTWF0 aC5yb3VuZChudW0gLyAxMDBfMDAwKSAvIDEwKTsKIAotICAgICAgICByZXR1cm4gV0kuVUlTdHJp bmcoIiUuMWZCIikuZm9ybWF0KE1hdGgucm91bmQobnVtIC8gMTAwMDAwMDAwKSAvIDEwKTsKKyAg ICAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCIlLjFmQiIpLmZvcm1hdChNYXRoLnJvdW5kKG51bSAv IDEwMF8wMDBfMDAwKSAvIDEwKTsKICAgICB9CiB9KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdD b250cm9sbGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCmluZGV4IDEwNWYyMWNmZmE5Li43 NzJiNmZlZDNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dW aWV3Q29udHJvbGxlci5qcwpAQCAtMzYyLDUgKzM2Miw1IEBAIFdJLkphdmFTY3JpcHRMb2dWaWV3 Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBleHRlbmRzIFdJ Lk9iCiAgICAgfQogfTsKIAotV0kuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLkNhY2hlZFBy b3BlcnRpZXNEdXJhdGlvbiA9IDMwMDAwOworV0kuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVy LkNhY2hlZFByb3BlcnRpZXNEdXJhdGlvbiA9IDMwXzAwMDsKIFdJLkphdmFTY3JpcHRMb2dWaWV3 Q29udHJvbGxlci5JZ25vcmVkUmVwZWF0Q291bnQgPSBTeW1ib2woImlnbm9yZWQtcmVwZWF0LWNv dW50Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNzI5Njk2ZjA0 MWMuLmZkMWM0NDJlYWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBA IC0xNDQwLDYgKzE0NDAsNiBAQCBXSS5UaW1lbGluZU1hbmFnZXIuRXZlbnQgPSB7CiAgICAgUmVj b3JkaW5nSW1wb3J0ZWQ6ICJ0aW1lbGluZS1tYW5hZ2VyLXJlY29yZGluZy1pbXBvcnRlZCIsCiB9 OwogCi1XSS5UaW1lbGluZU1hbmFnZXIuTWF4aW11bUF1dG9SZWNvcmREdXJhdGlvbiA9IDkwMDAw OyAvLyA5MCBzZWNvbmRzCi1XSS5UaW1lbGluZU1hbmFnZXIuTWF4aW11bUF1dG9SZWNvcmREdXJh dGlvbkFmdGVyTG9hZEV2ZW50ID0gMTAwMDA7IC8vIDEwIHNlY29uZHMKLVdJLlRpbWVsaW5lTWFu YWdlci5EZWFkVGltZVJlcXVpcmVkVG9TdG9wQXV0b1JlY29yZGluZ0Vhcmx5ID0gMjAwMDsgLy8g MiBzZWNvbmRzCitXSS5UaW1lbGluZU1hbmFnZXIuTWF4aW11bUF1dG9SZWNvcmREdXJhdGlvbiA9 IDkwXzAwMDsgLy8gOTAgc2Vjb25kcworV0kuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVj b3JkRHVyYXRpb25BZnRlckxvYWRFdmVudCA9IDEwXzAwMDsgLy8gMTAgc2Vjb25kcworV0kuVGlt ZWxpbmVNYW5hZ2VyLkRlYWRUaW1lUmVxdWlyZWRUb1N0b3BBdXRvUmVjb3JkaW5nRWFybHkgPSAy XzAwMDsgLy8gMiBzZWNvbmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvR2VvbWV0cnkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvR2VvbWV0cnkuanMKaW5kZXggOGIyYzZmOWVkYjMuLjE2MWNhOWE3 NTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvR2VvbWV0cnkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0dlb21ldHJ5LmpzCkBAIC01NjYsNyArNTY2LDcgQEAgV0kuU3ByaW5nID0gY2xhc3Mg U3ByaW5nCiAKICAgICBjYWxjdWxhdGVEdXJhdGlvbihlcHNpbG9uKQogICAgIHsKLSAgICAgICAg ZXBzaWxvbiA9IGVwc2lsb24gfHwgMC4wMDAxOworICAgICAgICBlcHNpbG9uID0gZXBzaWxvbiB8 fCAwLjAwMF8xOwogICAgICAgICBsZXQgdCA9IDA7CiAgICAgICAgIGxldCBjdXJyZW50ID0gMDsK ICAgICAgICAgbGV0IG1pbmltdW0gPSBOdW1iZXIuUE9TSVRJVkVfSU5GSU5JVFk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQu anMKaW5kZXggZGY4OWMxNmVhNTQuLmY3M2RlNzVlZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0dyYWRpZW50LmpzCkBAIC0xNDIs NyArMTQyLDcgQEAgV0kuR3JhZGllbnQgPSBjbGFzcyBHcmFkaWVudAogICAgICAgICByZXR1cm4g c3RvcHMubWFwKGZ1bmN0aW9uKHN0b3AsIGluZGV4KSB7CiAgICAgICAgICAgICB2YXIgc3RyID0g c3RvcC5jb2xvcjsKICAgICAgICAgICAgIGlmIChzdG9wLm9mZnNldCAhPT0gaW5kZXggLyBjb3Vu dCkKLSAgICAgICAgICAgICAgICBzdHIgKz0gIiAiICsgTWF0aC5yb3VuZChzdG9wLm9mZnNldCAq IDEwMDAwKSAvIDEwMCArICIlIjsKKyAgICAgICAgICAgICAgICBzdHIgKz0gIiAiICsgTWF0aC5y b3VuZChzdG9wLm9mZnNldCAqIDEwXzAwMCkgLyAxMDAgKyAiJSI7CiAgICAgICAgICAgICByZXR1 cm4gc3RyOwogICAgICAgICB9KS5qb2luKCIsICIpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9IZWFwQWxsb2NhdGlvbnNJbnN0 cnVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0hl YXBBbGxvY2F0aW9uc0luc3RydW1lbnQuanMKaW5kZXggMTNiMDhkMjg3M2IuLjZhNjgxMzNkM2Q2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv SGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5qcwpAQCAtNjAs NyArNjAsNyBAQCBXSS5IZWFwQWxsb2NhdGlvbnNJbnN0cnVtZW50ID0gY2xhc3MgSGVhcEFsbG9j YXRpb25zSW5zdHJ1bWVudCBleHRlbmRzIFdJLkluc3RydQogICAgICAgICB9CiAKICAgICAgICAg Ly8gUGVyaW9kaWMgc25hcHNob3RzLgotICAgICAgICBjb25zdCBzbmFwc2hvdEludGVydmFsID0g MTAwMDA7CisgICAgICAgIGNvbnN0IHNuYXBzaG90SW50ZXJ2YWwgPSAxMF8wMDA7CiAgICAgICAg IHRoaXMuX3NuYXBzaG90SW50ZXJ2YWxJZGVudGlmaWVyID0gc2V0SW50ZXJ2YWwodGhpcy5fdGFr ZUhlYXBTbmFwc2hvdC5iaW5kKHRoaXMpLCBzbmFwc2hvdEludGVydmFsKTsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9m aWxlTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Q cm9maWxlTm9kZS5qcwppbmRleCBkMzFjMjQ0NzY1Ni4uODcxOTUyNDY4Y2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9maWxlTm9kZS5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvZmls ZU5vZGUuanMKQEAgLTE1OCw3ICsxNTgsNyBAQCBXSS5Qcm9maWxlTm9kZSA9IGNsYXNzIFByb2Zp bGVOb2RlCiAgICAgICAgICAgICAgICAgdGhpcy5fc2VsZlRpbWUgPSB0aGlzLl90b3RhbFRpbWUg LSBjaGlsZE5vZGVzVG90YWxUaW1lOwogICAgICAgICAgICAgICAgIC8vIHNlbGZUaW1lIGNhbiBu ZWdhdGl2ZSBvciB2ZXJ5IGNsb3NlIHRvIHplcm8gZHVlIHRvIGZsb2F0aW5nIHBvaW50IGVycm9y LgogICAgICAgICAgICAgICAgIC8vIFNpbmNlIHdlIHNob3cgYXQgbW9zdCBmb3VyIGRlY2ltYWwg cGxhY2VzLCB0cmVhdCBhbnl0aGluZyBsZXNzIGFzIHplcm8uCi0gICAgICAgICAgICAgICAgaWYg KHRoaXMuX3NlbGZUaW1lIDwgMC4wMDAxKQorICAgICAgICAgICAgICAgIGlmICh0aGlzLl9zZWxm VGltZSA8IDAuMDAwXzEpCiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3NlbGZUaW1lID0gMC4w OwogICAgICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKaW5kZXggY2Y1 NDAxM2NlYzkuLjNlNzQyMmI2MWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzCkBA IC01MzUsNyArNTM1LDcgQEAgV0kuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQgPSB7CiB9OwogCiBX SS5UaW1lbGluZVJlY29yZGluZy5pc0xlZ2FjeSA9IHVuZGVmaW5lZDsKLVdJLlRpbWVsaW5lUmVj b3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZvckxlZ2FjeVJlY29yZENvbnZlcnNpb24gPSAxMDAw MDAwMDsgLy8gU29tZSB2YWx1ZSBub3QgbmVhciB6ZXJvLgotV0kuVGltZWxpbmVSZWNvcmRpbmcu VGltZXN0YW1wVGhyZXNob2xkRm9yTGVnYWN5QXNzdW1lZE1pbGxpc2Vjb25kcyA9IDE0MjAwOTky MDAwMDA7IC8vIERhdGUucGFyc2UoIkphbiAxLCAyMDE1IikuIE1pbGxpc2Vjb25kcyBzaW5jZSBl cG9jaC4KK1dJLlRpbWVsaW5lUmVjb3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZvckxlZ2FjeVJl Y29yZENvbnZlcnNpb24gPSAxMF8wMDBfMDAwOyAvLyBTb21lIHZhbHVlIG5vdCBuZWFyIHplcm8u CitXSS5UaW1lbGluZVJlY29yZGluZy5UaW1lc3RhbXBUaHJlc2hvbGRGb3JMZWdhY3lBc3N1bWVk TWlsbGlzZWNvbmRzID0gMV80MjBfMDk5XzIwMF8wMDA7IC8vIERhdGUucGFyc2UoIkphbiAxLCAy MDE1IikuIE1pbGxpc2Vjb25kcyBzaW5jZSBlcG9jaC4KIAogV0kuVGltZWxpbmVSZWNvcmRpbmcu U2VyaWFsaXphdGlvblZlcnNpb24gPSAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0Nvbm5lY3Rpb24uanMKaW5kZXggMWJhNWM5 OTI5OTUuLjMwMmNkYmFlNDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9Db25uZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0Nvbm5lY3Rpb24uanMKQEAgLTEwMiw3ICsxMDIs NyBAQCBJbnNwZWN0b3JCYWNrZW5kLkNvbm5lY3Rpb24gPSBjbGFzcyBJbnNwZWN0b3JCYWNrZW5k Q29ubmVjdGlvbgogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fcGVuZGluZ1Jl c3BvbnNlcy5zaXplID49IDApOwogCi0gICAgICAgIGlmIChtZXNzYWdlT2JqZWN0LmVycm9yICYm IG1lc3NhZ2VPYmplY3QuZXJyb3IuY29kZSAhPT0gLTMyMDAwKQorICAgICAgICBpZiAobWVzc2Fn ZU9iamVjdC5lcnJvciAmJiBtZXNzYWdlT2JqZWN0LmVycm9yLmNvZGUgIT09IC0zMl8wMDApCiAg ICAgICAgICAgICBjb25zb2xlLmVycm9yKCJSZXF1ZXN0IHdpdGggaWQgPSAiICsgbWVzc2FnZU9i amVjdFsiaWQiXSArICIgZmFpbGVkLiAiICsgSlNPTi5zdHJpbmdpZnkobWVzc2FnZU9iamVjdC5l cnJvcikpOwogCiAgICAgICAgIGxldCBzZXF1ZW5jZUlkID0gbWVzc2FnZU9iamVjdFsiaWQiXTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eWVyczNEQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCmluZGV4IDYxYmMzNmRiMGE5Li4xYjI3M2Q2 YzEyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5ZXJzM0RDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCkBAIC0xNjMsNyArMTYzLDcg QEAgV0kuTGF5ZXJzM0RDb250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB3aW5kb3cubWF0Y2hNZWRpYSgiKHByZWZlcnMt Y29sb3Itc2NoZW1lOiBkYXJrKSIpLmFkZExpc3RlbmVyKHVwZGF0ZUJhY2tncm91bmQpOwogICAg ICAgICB1cGRhdGVCYWNrZ3JvdW5kKCk7CiAKLSAgICAgICAgdGhpcy5fY2FtZXJhID0gbmV3IFRI UkVFLlBlcnNwZWN0aXZlQ2FtZXJhKDQ1LCB0aGlzLmVsZW1lbnQub2Zmc2V0V2lkdGggLyB0aGlz LmVsZW1lbnQub2Zmc2V0SGVpZ2h0LCAxLCAxMDAwMDApOworICAgICAgICB0aGlzLl9jYW1lcmEg PSBuZXcgVEhSRUUuUGVyc3BlY3RpdmVDYW1lcmEoNDUsIHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0 aCAvIHRoaXMuZWxlbWVudC5vZmZzZXRIZWlnaHQsIDEsIDEwMF8wMDApOwogCiAgICAgICAgIHRo aXMuX2NvbnRyb2xzID0gbmV3IFRIUkVFLk9yYml0Q29udHJvbHModGhpcy5fY2FtZXJhLCB0aGlz Ll9yZW5kZXJlci5kb21FbGVtZW50KTsKICAgICAgICAgdGhpcy5fY29udHJvbHMuZW5hYmxlRGFt cGluZyA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMKaW5kZXggOTA4YzkzZDc3 ZmYuLjAyMTQ3ZDM5NWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3LmpzCkBAIC0zODks NyArMzg5LDcgQEAgV0kuTWVtb3J5VGltZWxpbmVWaWV3ID0gY2xhc3MgTWVtb3J5VGltZWxpbmVW aWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3CiAgICAgICAgIC8vIFRoZSBjaGFydCB3aWxsIG9u bHkgc2hvdyBhIHBlcmZlY3QgY2lyY2xlIGlmIHRoZSBjdXJyZW50IGFuZCBtYXggYXJlIHJlYWxs eSB0aGUgc2FtZSB2YWx1ZS4KICAgICAgICAgLy8gU28gZG8gYSBsaXR0bGUgbWFzc2FnaW5nIHRv IGVuc3VyZSAwLjk5OTUgZG9lc24ndCBnZXQgcm91bmRlZCB1cCB0byAxLgogICAgICAgICBsZXQg cGVyY2VudCA9IGN1cnJlbnRTaXplIC8gdGhpcy5fbWF4U2l6ZTsKLSAgICAgICAgdG90YWxFbGVt ZW50LnRleHRDb250ZW50ID0gTnVtYmVyLnBlcmNlbnRhZ2VTdHJpbmcocGVyY2VudCA9PT0gMSA/ IHBlcmNlbnQgOiAocGVyY2VudCAtIDAuMDAwNSkpOworICAgICAgICB0b3RhbEVsZW1lbnQudGV4 dENvbnRlbnQgPSBOdW1iZXIucGVyY2VudGFnZVN0cmluZyhwZXJjZW50ID09PSAxID8gcGVyY2Vu dCA6IChwZXJjZW50IC0gMC4wMDBfNSkpOwogICAgIH0KIAogICAgIF9pbml0aWFsaXplQ2F0ZWdv cnlWaWV3cyhyZWNvcmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmlu ZGV4IDkwNmM5NGY5YzhhLi5mN2MyMGJjYjkzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxl Q29udGVudFZpZXcuanMKQEAgLTIxNjcsMTIgKzIxNjcsMTIgQEAgV0kuTmV0d29ya1RhYmxlQ29u dGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWUKICAgICAgICAgbGV0IGR1cmF0aW9uID0gRGF0ZS5ub3coKSAtIGxvYWRUaW1lU3RhdGlz dGljLnN0YXJ0OwogCiAgICAgICAgIGxldCBkZWxheSA9IGxvYWRUaW1lU3RhdGlzdGljLmRlbGF5 OwotICAgICAgICBpZiAoZHVyYXRpb24gPj0gMTAwMCkgLy8gMSBzZWNvbmQKKyAgICAgICAgaWYg KGR1cmF0aW9uID49IDFfMDAwKSAvLyAxIHNlY29uZAogICAgICAgICAgICAgZGVsYXkgPSAxMDA7 Ci0gICAgICAgIGVsc2UgaWYgKGR1cmF0aW9uID49IDYwMDAwKSAvLyA2MCBzZWNvbmRzCi0gICAg ICAgICAgICBkZWxheSA9IDEwMDA7Ci0gICAgICAgIGVsc2UgaWYgKGR1cmF0aW9uID49IDM2MDAw MDApIC8vIDEgbWludXRlCi0gICAgICAgICAgICBkZWxheSA9IDEwMDAwOworICAgICAgICBlbHNl IGlmIChkdXJhdGlvbiA+PSA2MF8wMDApIC8vIDYwIHNlY29uZHMKKyAgICAgICAgICAgIGRlbGF5 ID0gMV8wMDA7CisgICAgICAgIGVsc2UgaWYgKGR1cmF0aW9uID49IDNfNjAwXzAwMCkgLy8gMSBt aW51dGUKKyAgICAgICAgICAgIGRlbGF5ID0gMTBfMDAwOwogCiAgICAgICAgIGlmIChkZWxheSAh PT0gbG9hZFRpbWVTdGF0aXN0aWMuZGVsYXkpIHsKICAgICAgICAgICAgIGxvYWRUaW1lU3RhdGlz dGljLmRlbGF5ID0gZGVsYXk7CkBAIC0yMTg5LDcgKzIxODksNyBAQCBXSS5OZXR3b3JrVGFibGVD b250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29u dGVudFZpZQogICAgICAgICAgICAgbG9hZFRpbWVTdGF0aXN0aWMuY29udGFpbmVyLmhpZGRlbiA9 ICF0aGlzLl9pc1Nob3dpbmdNYWluQ29sbGVjdGlvbigpOwogCiAgICAgICAgIGlmIChpc05hTiht YWluRnJhbWVTdGFydFRpbWUpIHx8IGlzTmFOKG1haW5GcmFtZUxvYWRFdmVudFRpbWUpKSB7Ci0g ICAgICAgICAgICB0aGlzLl91cGRhdGVTdGF0aXN0aWMoImxvYWQtdGltZSIsIFdJLlVJU3RyaW5n KCJMb2FkaW5nIGZvciAlcyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKGR1cmF0aW9uIC8gMTAw MCkpOworICAgICAgICAgICAgdGhpcy5fdXBkYXRlU3RhdGlzdGljKCJsb2FkLXRpbWUiLCBXSS5V SVN0cmluZygiTG9hZGluZyBmb3IgJXMiKSwgTnVtYmVyLnNlY29uZHNUb1N0cmluZyhkdXJhdGlv biAvIDFfMDAwKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAo= 395209 2020-04-01 15:13:37 -0700 2020-04-01 15:50:22 -0700 Patch patch.txt text/plain 8704 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi4zM2VkNTM2MWI0NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDQtMDEgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogVXNlIEVDTUFTY3JpcHQgTnVtZXJpYyBTZXBhcmF0b3JzIGZvciBudW1iZXJzIHdpdGggNSBv ciBtb3JlIGRpZ2l0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA5ODc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBgMTAwMDAwMGAgd3JpdGUgYDFfMDAwXzAwMGAgc28gaXQncyBlYXNp ZXIgdG8gcmVhZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGlu ZU1hbmFnZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQuanM6 CisgICAgICAgIChXSS5HcmFkaWVudC5wcm90b3R5cGUuc3RyaW5nRnJvbVN0b3BzKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9IZWFwQWxsb2NhdGlvbnNJbnN0cnVtZW50LmpzOgor ICAgICAgICAoV0kuSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5wcm90b3R5cGUuc3RhcnRJbnN0 cnVtZW50YXRpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlv bi5qczoKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmQuQ29ubmVjdGlvbi5wcm90b3R5cGUuX2Rp c3BhdGNoUmVzcG9uc2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBl LmluaXRpYWxMYXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YmxlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5w cm90b3R5cGUuX3VwZGF0ZUxvYWRUaW1lU3RhdGlzdGljKToKKwogMjAyMC0wMy0yNiAgRGV2aW4g Um91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRk IGtleWJvYXJkIHNob3J0Y3V0IHRvIHRvb2x0aXAgb2YgcGlubmVkIHRhYnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5k ZXggMDQ1OTYyMmE1MTEuLmY4MWFlZTZiZmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtMTM0OCwxMyArMTM0 OCwxMyBAQCBPYmplY3QuZGVmaW5lUHJvcGVydHkoTnVtYmVyLCAiYWJicmV2aWF0ZSIsCiAgICAg ICAgIGlmIChudW0gPCAxMDAwKQogICAgICAgICAgICAgcmV0dXJuIG51bS50b0xvY2FsZVN0cmlu ZygpOwogCi0gICAgICAgIGlmIChudW0gPCAxMDAwMDAwKQorICAgICAgICBpZiAobnVtIDwgMV8w MDBfMDAwKQogICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCIlLjFmSyIpLmZvcm1hdChN YXRoLnJvdW5kKG51bSAvIDEwMCkgLyAxMCk7CiAKLSAgICAgICAgaWYgKG51bSA8IDEwMDAwMDAw MDApCi0gICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIiUuMWZNIikuZm9ybWF0KE1hdGgu cm91bmQobnVtIC8gMTAwMDAwKSAvIDEwKTsKKyAgICAgICAgaWYgKG51bSA8IDFfMDAwXzAwMF8w MDApCisgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIiUuMWZNIikuZm9ybWF0KE1hdGgu cm91bmQobnVtIC8gMTAwXzAwMCkgLyAxMCk7CiAKLSAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5n KCIlLjFmQiIpLmZvcm1hdChNYXRoLnJvdW5kKG51bSAvIDEwMDAwMDAwMCkgLyAxMCk7CisgICAg ICAgIHJldHVybiBXSS5VSVN0cmluZygiJS4xZkIiKS5mb3JtYXQoTWF0aC5yb3VuZChudW0gLyAx MDBfMDAwXzAwMCkgLyAxMCk7CiAgICAgfQogfSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29u dHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwppbmRleCAxMDVmMjFjZmZhOS4uNzcy YjZmZWQzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmll d0NvbnRyb2xsZXIuanMKQEAgLTM2Miw1ICszNjIsNSBAQCBXSS5KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIgPSBjbGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0ZW5kcyBXSS5P YgogICAgIH0KIH07CiAKLVdJLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5DYWNoZWRQcm9w ZXJ0aWVzRHVyYXRpb24gPSAzMDAwMDsKK1dJLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5D YWNoZWRQcm9wZXJ0aWVzRHVyYXRpb24gPSAzMF8wMDA7CiBXSS5KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIuSWdub3JlZFJlcGVhdENvdW50ID0gU3ltYm9sKCJpZ25vcmVkLXJlcGVhdC1jb3Vu dCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IDcyOTY5NmYwNDFj Li5mZDFjNDQyZWFmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAt MTQ0MCw2ICsxNDQwLDYgQEAgV0kuVGltZWxpbmVNYW5hZ2VyLkV2ZW50ID0gewogICAgIFJlY29y ZGluZ0ltcG9ydGVkOiAidGltZWxpbmUtbWFuYWdlci1yZWNvcmRpbmctaW1wb3J0ZWQiLAogfTsK IAotV0kuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVjb3JkRHVyYXRpb24gPSA5MDAwMDsg Ly8gOTAgc2Vjb25kcwotV0kuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVjb3JkRHVyYXRp b25BZnRlckxvYWRFdmVudCA9IDEwMDAwOyAvLyAxMCBzZWNvbmRzCi1XSS5UaW1lbGluZU1hbmFn ZXIuRGVhZFRpbWVSZXF1aXJlZFRvU3RvcEF1dG9SZWNvcmRpbmdFYXJseSA9IDIwMDA7IC8vIDIg c2Vjb25kcworV0kuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVjb3JkRHVyYXRpb24gPSA5 MF8wMDA7IC8vIDkwIHNlY29uZHMKK1dJLlRpbWVsaW5lTWFuYWdlci5NYXhpbXVtQXV0b1JlY29y ZER1cmF0aW9uQWZ0ZXJMb2FkRXZlbnQgPSAxMF8wMDA7IC8vIDEwIHNlY29uZHMKK1dJLlRpbWVs aW5lTWFuYWdlci5EZWFkVGltZVJlcXVpcmVkVG9TdG9wQXV0b1JlY29yZGluZ0Vhcmx5ID0gMl8w MDA7IC8vIDIgc2Vjb25kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0dyYWRpZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0dyYWRpZW50LmpzCmluZGV4IGRmODljMTZlYTU0Li5mNzNkZTc1ZWVj YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L0dyYWRpZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9HcmFkaWVudC5qcwpAQCAtMTQyLDcgKzE0Miw3IEBAIFdJLkdyYWRpZW50ID0gY2xhc3Mg R3JhZGllbnQKICAgICAgICAgcmV0dXJuIHN0b3BzLm1hcChmdW5jdGlvbihzdG9wLCBpbmRleCkg ewogICAgICAgICAgICAgdmFyIHN0ciA9IHN0b3AuY29sb3I7CiAgICAgICAgICAgICBpZiAoc3Rv cC5vZmZzZXQgIT09IGluZGV4IC8gY291bnQpCi0gICAgICAgICAgICAgICAgc3RyICs9ICIgIiAr IE1hdGgucm91bmQoc3RvcC5vZmZzZXQgKiAxMDAwMCkgLyAxMDAgKyAiJSI7CisgICAgICAgICAg ICAgICAgc3RyICs9ICIgIiArIE1hdGgucm91bmQoc3RvcC5vZmZzZXQgKiAxMF8wMDApIC8gMTAw ICsgIiUiOwogICAgICAgICAgICAgcmV0dXJuIHN0cjsKICAgICAgICAgfSkuam9pbigiLCAiKTsK ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9IZWFwQWxsb2NhdGlvbnNJbnN0cnVtZW50LmpzCmluZGV4 IDEzYjA4ZDI4NzNiLi42YTY4MTMzZDNkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0hlYXBBbGxvY2F0aW9uc0luc3RydW1lbnQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0hlYXBBbGxvY2F0 aW9uc0luc3RydW1lbnQuanMKQEAgLTYwLDcgKzYwLDcgQEAgV0kuSGVhcEFsbG9jYXRpb25zSW5z dHJ1bWVudCA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc0luc3RydW1lbnQgZXh0ZW5kcyBXSS5JbnN0 cnUKICAgICAgICAgfQogCiAgICAgICAgIC8vIFBlcmlvZGljIHNuYXBzaG90cy4KLSAgICAgICAg Y29uc3Qgc25hcHNob3RJbnRlcnZhbCA9IDEwMDAwOworICAgICAgICBjb25zdCBzbmFwc2hvdElu dGVydmFsID0gMTBfMDAwOwogICAgICAgICB0aGlzLl9zbmFwc2hvdEludGVydmFsSWRlbnRpZmll ciA9IHNldEludGVydmFsKHRoaXMuX3Rha2VIZWFwU25hcHNob3QuYmluZCh0aGlzKSwgc25hcHNo b3RJbnRlcnZhbCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Qcm90b2NvbC9Db25uZWN0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5qcwppbmRleCAxYmE1Yzk5Mjk5 NS4uMzAyY2RiYWU0N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL0Nvbm5lY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5qcwpAQCAtMTAyLDcgKzEwMiw3IEBA IEluc3BlY3RvckJhY2tlbmQuQ29ubmVjdGlvbiA9IGNsYXNzIEluc3BlY3RvckJhY2tlbmRDb25u ZWN0aW9uCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9wZW5kaW5nUmVzcG9u c2VzLnNpemUgPj0gMCk7CiAKLSAgICAgICAgaWYgKG1lc3NhZ2VPYmplY3QuZXJyb3IgJiYgbWVz c2FnZU9iamVjdC5lcnJvci5jb2RlICE9PSAtMzIwMDApCisgICAgICAgIGlmIChtZXNzYWdlT2Jq ZWN0LmVycm9yICYmIG1lc3NhZ2VPYmplY3QuZXJyb3IuY29kZSAhPT0gLTMyXzAwMCkKICAgICAg ICAgICAgIGNvbnNvbGUuZXJyb3IoIlJlcXVlc3Qgd2l0aCBpZCA9ICIgKyBtZXNzYWdlT2JqZWN0 WyJpZCJdICsgIiBmYWlsZWQuICIgKyBKU09OLnN0cmluZ2lmeShtZXNzYWdlT2JqZWN0LmVycm9y KSk7CiAKICAgICAgICAgbGV0IHNlcXVlbmNlSWQgPSBtZXNzYWdlT2JqZWN0WyJpZCJdOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJz M0RDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xheWVyczNEQ29udGVudFZpZXcuanMKaW5kZXggNjFiYzM2ZGIwYTkuLjFiMjczZDZjMTJj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M YXllcnMzRENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xheWVyczNEQ29udGVudFZpZXcuanMKQEAgLTE2Myw3ICsxNjMsNyBAQCBX SS5MYXllcnMzRENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHdpbmRvdy5tYXRjaE1lZGlhKCIocHJlZmVycy1jb2xv ci1zY2hlbWU6IGRhcmspIikuYWRkTGlzdGVuZXIodXBkYXRlQmFja2dyb3VuZCk7CiAgICAgICAg IHVwZGF0ZUJhY2tncm91bmQoKTsKIAotICAgICAgICB0aGlzLl9jYW1lcmEgPSBuZXcgVEhSRUUu UGVyc3BlY3RpdmVDYW1lcmEoNDUsIHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aCAvIHRoaXMuZWxl bWVudC5vZmZzZXRIZWlnaHQsIDEsIDEwMDAwMCk7CisgICAgICAgIHRoaXMuX2NhbWVyYSA9IG5l dyBUSFJFRS5QZXJzcGVjdGl2ZUNhbWVyYSg0NSwgdGhpcy5lbGVtZW50Lm9mZnNldFdpZHRoIC8g dGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodCwgMSwgMTAwXzAwMCk7CiAKICAgICAgICAgdGhpcy5f Y29udHJvbHMgPSBuZXcgVEhSRUUuT3JiaXRDb250cm9scyh0aGlzLl9jYW1lcmEsIHRoaXMuX3Jl bmRlcmVyLmRvbUVsZW1lbnQpOwogICAgICAgICB0aGlzLl9jb250cm9scy5lbmFibGVEYW1waW5n ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKaW5kZXggOTA2 Yzk0ZjljOGEuLmY3YzIwYmNiOTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50 Vmlldy5qcwpAQCAtMjE2NywxMiArMjE2NywxMiBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50Vmll dyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQog ICAgICAgICBsZXQgZHVyYXRpb24gPSBEYXRlLm5vdygpIC0gbG9hZFRpbWVTdGF0aXN0aWMuc3Rh cnQ7CiAKICAgICAgICAgbGV0IGRlbGF5ID0gbG9hZFRpbWVTdGF0aXN0aWMuZGVsYXk7Ci0gICAg ICAgIGlmIChkdXJhdGlvbiA+PSAxMDAwKSAvLyAxIHNlY29uZAorICAgICAgICBpZiAoZHVyYXRp b24gPj0gMV8wMDApIC8vIDEgc2Vjb25kCiAgICAgICAgICAgICBkZWxheSA9IDEwMDsKLSAgICAg ICAgZWxzZSBpZiAoZHVyYXRpb24gPj0gNjAwMDApIC8vIDYwIHNlY29uZHMKLSAgICAgICAgICAg IGRlbGF5ID0gMTAwMDsKLSAgICAgICAgZWxzZSBpZiAoZHVyYXRpb24gPj0gMzYwMDAwMCkgLy8g MSBtaW51dGUKLSAgICAgICAgICAgIGRlbGF5ID0gMTAwMDA7CisgICAgICAgIGVsc2UgaWYgKGR1 cmF0aW9uID49IDYwXzAwMCkgLy8gNjAgc2Vjb25kcworICAgICAgICAgICAgZGVsYXkgPSAxXzAw MDsKKyAgICAgICAgZWxzZSBpZiAoZHVyYXRpb24gPj0gM182MDBfMDAwKSAvLyAxIG1pbnV0ZQor ICAgICAgICAgICAgZGVsYXkgPSAxMF8wMDA7CiAKICAgICAgICAgaWYgKGRlbGF5ICE9PSBsb2Fk VGltZVN0YXRpc3RpYy5kZWxheSkgewogICAgICAgICAgICAgbG9hZFRpbWVTdGF0aXN0aWMuZGVs YXkgPSBkZWxheTsKQEAgLTIxODksNyArMjE4OSw3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRW aWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmll CiAgICAgICAgICAgICBsb2FkVGltZVN0YXRpc3RpYy5jb250YWluZXIuaGlkZGVuID0gIXRoaXMu X2lzU2hvd2luZ01haW5Db2xsZWN0aW9uKCk7CiAKICAgICAgICAgaWYgKGlzTmFOKG1haW5GcmFt ZVN0YXJ0VGltZSkgfHwgaXNOYU4obWFpbkZyYW1lTG9hZEV2ZW50VGltZSkpIHsKLSAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVN0YXRpc3RpYygibG9hZC10aW1lIiwgV0kuVUlTdHJpbmcoIkxvYWRp bmcgZm9yICVzIiksIE51bWJlci5zZWNvbmRzVG9TdHJpbmcoZHVyYXRpb24gLyAxMDAwKSk7Cisg ICAgICAgICAgICB0aGlzLl91cGRhdGVTdGF0aXN0aWMoImxvYWQtdGltZSIsIFdJLlVJU3RyaW5n KCJMb2FkaW5nIGZvciAlcyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKGR1cmF0aW9uIC8gMV8w MDApKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCg==