152917 2016-01-08 12:22:05 -0800 Make v3 UI analysis task page is hard to understand 2016-02-16 13:50:02 -0800 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez jond kling koivisto rniwa slewis timothy oldest_to_newest 1153945 0 rniwa 2016-01-08 12:22:05 -0800 Chris and Stephanie told me that the new UI's visualization is rather confusing. Improve that and also add back the comparison between configurations (e.g. A to B) to the table view. 1153953 1 268571 rniwa 2016-01-08 12:47:53 -0800 Created attachment 268571 Fixes it 1153985 2 268571 koivisto 2016-01-08 13:30:49 -0800 Comment on attachment 268571 Fixes it r=me 1153998 3 rniwa 2016-01-08 13:57:46 -0800 Committed r194788: <http://trac.webkit.org/changeset/194788> 268571 2016-01-08 12:47:53 -0800 2016-01-08 13:30:49 -0800 Fixes it bug-152917-20160108124719.patch text/plain 23769 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0Nzc3KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDUzIEBACisyMDE2LTAxLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE1ha2UgdjMgVUkgYW5hbHlzaXMgdGFzayBwYWdlIGlzIGhhcmQgdG8gdW5kZXJz dGFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUy OTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGEgZGFyayBncmF5IGJvcmRlciBhcm91bmQgdGhlIHNlbGVjdGVkIGJsb2NrIGluIHRoZSBhbmFs eXNpcyByZXN1bHRzIHZpZXdlciBpbnN0ZWFkIG9mIHVzaW5nIGRhcmtlcgorICAgICAgICBzaGFk ZXMgc2luY2UgdGhhdCBsb29rcyBhcyBpZiB0aGV5IHdlcmUgYmlnZ2VyIHJlZ3Jlc3Npb24vcHJv Z3Jlc3Npb24uCisKKyAgICAgICAgRXhwbGljaXRseSBzaG93ICJGYWlsZWQiIGFzIHRoZSBsYWJl bCBpbnN0ZWFkIG9mIG9taXR0aW5nIHdpdGggIi0iIHdoZW4gYWxsIGJ1aWxkIHJlcXVlc3RzIGlu IGFuIEEvQgorICAgICAgICB0ZXN0aW5nIGdyb3VwIGZhaWxzLgorCisgICAgICAgICogcHVibGlj L3YzL2NvbXBvbmVudHMvYW5hbHlzaXMtcmVzdWx0cy12aWV3ZXIuanM6CisgICAgICAgIChBbmFs eXNpc1Jlc3VsdHNWaWV3ZXIuY3NzVGVtcGxhdGUpOiBUd2Vha2VkIHRoZSBzdHlsZSB0byB1bmRl cmxpbmUgdGV4dCBpbiB0aGUgaG92ZXJlZCBibG9ja3MgYW5kIHRoZQorICAgICAgICBzZWxlY3Rl ZCBibG9ja3MgYW5kIHNob3cgYSBkYXJrIGdyYXkgYm9yZGVyIGFyb3VuZCB0aGUgc2VsZWN0ZWQg YmxvY2tzLgorICAgICAgICAoQW5hbHlzaXNSZXN1bHRzVmlld2VyLlRlc3RHcm91cFN0YWNraW5n QmxvY2spOgorICAgICAgICAoQW5hbHlzaXNSZXN1bHRzVmlld2VyLlRlc3RHcm91cFN0YWNraW5n QmxvY2sucHJvdG90eXBlLmNyZWF0ZVN0YWNraW5nQ2VsbCk6IFVzZSB0aGlzLl90aXRsZSBmb3Ig dGl0bGUuCisgICAgICAgIChBbmFseXNpc1Jlc3VsdHNWaWV3ZXIuVGVzdEdyb3VwU3RhY2tpbmdC bG9jay5wcm90b3R5cGUuX2NvbXB1dGVUZXN0R3JvdXBTdGF0dXMpOgorICAgICAgICAoQW5hbHlz aXNSZXN1bHRzVmlld2VyLlRlc3RHcm91cFN0YWNraW5nQmxvY2sucHJvdG90eXBlLl92YWx1ZXNG b3JSb290U2V0KTogRGVsZXRlZC4KKworICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL3Jl c3VsdHMtdGFibGUuanM6CisgICAgICAgIChSZXN1bHRzVGFibGUucHJvdG90eXBlLnJlbmRlcik6 CisgICAgICAgIChSZXN1bHRzVGFibGUucHJvdG90eXBlLl9jcmVhdGVSZXZpc2lvbkxpc3RDZWxs cyk6IEV4dHJhY3RlZCBmcm9tIFJlc3VsdHNUYWJsZS5wcm90b3R5cGUucmVuZGVyLgorICAgICAg ICAoUmVzdWx0c1RhYmxlLmNzc1RlbXBsYXRlKTogVHdlYWtlZCB0aGUgc3R5bGUuCisgICAgICAg IChSZXN1bHRzVGFibGVSb3cpOgorICAgICAgICAoUmVzdWx0c1RhYmxlUm93LnByb3RvdHlwZS5j b25zdHJ1Y3Rvcik6IEFkZGVkIF9sYWJlbEZvcldob2xlUm93IHRvIHN0b3JlIHRoZSBsYWJlbCBm b3IgdGhlIGVudGlyZSByb3cuCisgICAgICAgIFRoaXMgaXMgdXNlZCB0byBzaG93IHRoZSBjb21w YXJpc29uIHJlc3VsdCBvZiB0d28gcm9vdCBzZXRzIChlLmcuIEEgdnMgQikuCisgICAgICAgIChS ZXN1bHRzVGFibGVSb3cucHJvdG90eXBlLnNldExhYmVsRm9yV2hvbGVSb3cpOiBBZGRlZC4KKyAg ICAgICAgKFJlc3VsdHNUYWJsZVJvdy5wcm90b3R5cGUubGFiZWxGb3JXaG9sZVJvdyk6IEFkZGVk LgorICAgICAgICAoUmVzdWx0c1RhYmxlUm93LnByb3RvdHlwZS5yZXN1bHRDb250ZW50KTogRXh0 cmFjdGVkIGZyb20gYnVpbGRIZWFkaW5nLiBDcmVhdGVzIGEgaHlwZXJsaW5rZWQgYmFyIGdyYXBo CisgICAgICAgIHVzZWQgZm9yIGVhY2ggQS9CIHRlc3RpbmcgcmVzdWx0LgorICAgICAgICAoUmVz dWx0c1RhYmxlUm93LnByb3RvdHlwZS5idWlsZEhlYWRpbmcpOiBEZWxldGVkIHNpbmNlIHdlIG5l ZWQgdG8gc2V0IGNvbHNwYW4gb24gdGhlIHNlY29uZCB0YWJsZSBjZWxsCisgICAgICAgIHdoZW4g d2UncmUgY3JlYXRpbmcgYSByb3cgd2l0aCBfbGFiZWxGb3JXaG9sZVJvdy4KKworICAgICAgICAq IHB1YmxpYy92My9jb21wb25lbnRzL3Rlc3QtZ3JvdXAtcmVzdWx0cy10YWJsZS5qczoKKyAgICAg ICAgKFRlc3RHcm91cFJlc3VsdHNUYWJsZS5wcm90b3R5cGUuYnVpbGRSb3dHcm91cHMpOiBBZGRl ZCByb3dzIHRvIHNob3cgcmVsYXRpdmUgZGlmZmVyZW5jZXMgYW5kIHN0YXRpc3RpY2FsCisgICAg ICAgIHNpZ25pZmljYW5jZSBiZXR3ZWVuIHJvb3Qgc2V0cyAoZS5nLiBBIHZzIEIpLgorCisgICAg ICAgICogcHVibGljL3YzL21vZGVscy9idWlsZC1yZXF1ZXN0LmpzOgorICAgICAgICAoQnVpbGRS ZXF1ZXN0LnByb3RvdHlwZS5oYXNDb21wbGV0ZWQpOiBBZGRlZC4KKworICAgICAgICAqIHB1Ymxp Yy92My9tb2RlbHMvdGVzdC1ncm91cC5qczoKKyAgICAgICAgKFRlc3RHcm91cC5wcm90b3R5cGUu Y29tcGFyZVRlc3RSZXN1bHRzKTogRXh0cmFjdGVkIGZyb20gQW5hbHlzaXNSZXN1bHRzVmlld2Vy LlRlc3RHcm91cFN0YWNraW5nQmxvY2sncworICAgICAgICBfY29tcHV0ZVRlc3RHcm91cFN0YXR1 cyBhbmQgZ2VuZXJhbGl6ZWQgdG8gYmUgcmV1c2VkIGluIFRlc3RHcm91cFJlc3VsdHNUYWJsZS4K KyAgICAgICAgKFRlc3RHcm91cC5wcm90b3R5cGUuX3ZhbHVlc0ZvclJvb3RTZXQpOiBNb3ZlZCBm cm9tIEFuYWx5c2lzUmVzdWx0c1ZpZXdlci5UZXN0R3JvdXBTdGFja2luZ0Jsb2NrLgorCisgICAg ICAgICogcHVibGljL3YzL3BhZ2VzL2FuYWx5c2lzLXRhc2stcGFnZS5qczoKKyAgICAgICAgKEFu YWx5c2lzVGFza1BhZ2UuY3NzVGVtcGxhdGUpOiBUd2Vha2VkIHRoZSBzdHlsZS4KKwogMjAxNi0w MS0wNyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQZXJmIGRh c2hib2FyZCBzaG91bGQgYXV0b21hdGljYWxseSBhZGQgYWdncmVnYXRvcnMKSW5kZXg6IFdlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9hbmFseXNpcy1yZXN1bHRz LXZpZXdlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL2NvbXBvbmVudHMvYW5hbHlzaXMtcmVzdWx0cy12aWV3ZXIuanMJKHJldmlzaW9uIDE5NDc3 NSkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9hbmFs eXNpcy1yZXN1bHRzLXZpZXdlci5qcwkod29ya2luZyBjb3B5KQpAQCAtMjM5LDYgKzIzOSw3IEBA IGNsYXNzIEFuYWx5c2lzUmVzdWx0c1ZpZXdlciBleHRlbmRzIFJlc3UKICAgICB7CiAgICAgICAg IHJldHVybiBSZXN1bHRzVGFibGUuY3NzVGVtcGxhdGUoKSArIGAKICAgICAgICAgICAgIC5hbmFs eXNpcy12aWV3IC5zdGFja2luZy1ibG9jayB7CisgICAgICAgICAgICAgICAgcG9zaXRpb246IHJl bGF0aXZlOwogICAgICAgICAgICAgICAgIGJvcmRlcjogc29saWQgMXB4ICNmZmY7CiAgICAgICAg ICAgICAgICAgY3Vyc29yOiBwb2ludGVyOwogICAgICAgICAgICAgfQpAQCAtMjQ5LDYyICsyNTAs NDMgQEAgY2xhc3MgQW5hbHlzaXNSZXN1bHRzVmlld2VyIGV4dGVuZHMgUmVzdQogICAgICAgICAg ICAgICAgIGNvbG9yOiBpbmhlcml0OwogICAgICAgICAgICAgICAgIGZvbnQtc2l6ZTogMC44cmVt OwogICAgICAgICAgICAgICAgIHBhZGRpbmc6IDAgMC4xcmVtOworICAgICAgICAgICAgICAgIG1h eC13aWR0aDogM3JlbTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLmFuYWx5c2lzLXZp ZXcgLnN0YWNraW5nLWJsb2NrOm5vdCguZmFpbGVkKSB7Ci0gICAgICAgICAgICAgICAgY29sb3I6 IHdoaXRlOworICAgICAgICAgICAgICAgIGNvbG9yOiBibGFjazsKICAgICAgICAgICAgICAgICBv cGFjaXR5OiAxOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAuYW5hbHlzaXMtdmlldyAu c3RhY2tpbmctYmxvY2suc2VsZWN0ZWQgeworICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0 YWNraW5nLWJsb2NrLnNlbGVjdGVkLAorICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNr aW5nLWJsb2NrOmhvdmVyIHsKKyAgICAgICAgICAgICAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVy bGluZTsKKyAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNr aW5nLWJsb2NrLnNlbGVjdGVkOmJlZm9yZSB7CisgICAgICAgICAgICAgICAgY29udGVudDogJyc7 CisgICAgICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgICAgIGxl ZnQ6IDBweDsKKyAgICAgICAgICAgICAgICB0b3A6IDBweDsKKyAgICAgICAgICAgICAgICB3aWR0 aDogY2FsYygxMDAlIC0gMnB4KTsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IGNhbGMoMTAwJSAt IDJweCk7CisgICAgICAgICAgICAgICAgYm9yZGVyOiBzb2xpZCAxcHggIzMzMzsKICAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNraW5nLWJsb2NrLmZhaWxl ZCB7Ci0gICAgICAgICAgICAgICAgYmFja2dyb3VuZDogcmdiYSgxMjgsIDUxLCAxMjgsIDAuNCk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAuYW5hbHlzaXMtdmlldyAuc3RhY2tpbmctYmxv Y2suZmFpbGVkOmhvdmVyIHsKLSAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiByZ2JhKDEyOCwg NTEsIDEyOCwgMC42KTsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiByZ2JhKDEyOCwgNTEs IDEyOCwgMC41KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIC5hbmFseXNpcy12aWV3IC5z dGFja2luZy1ibG9jay5mYWlsZWQuc2VsZWN0ZWQgewotICAgICAgICAgICAgICAgIGJhY2tncm91 bmQ6IHJnYmEoMTI4LCA1MSwgMTI4LCAxKTsKLSAgICAgICAgICAgICAgICBjb2xvcjogd2hpdGU7 Ci0gICAgICAgICAgICB9Ci0KICAgICAgICAgICAgIC5hbmFseXNpcy12aWV3IC5zdGFja2luZy1i bG9jay51bmNoYW5nZWQgewotICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IHJnYmEoMTI4LCAx MjgsIDEyOCwgMC4zKTsKLSAgICAgICAgICAgICAgICBjb2xvcjogYmxhY2s7CisgICAgICAgICAg ICAgICAgYmFja2dyb3VuZDogcmdiYSgxMjgsIDEyOCwgMTI4LCAwLjUpOwogICAgICAgICAgICAg fQotICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNraW5nLWJsb2NrLnVuY2hhbmdlZDpo b3ZlciB7Ci0gICAgICAgICAgICAgICAgYmFja2dyb3VuZDogcmdiYSgxMjgsIDEyOCwgMTI4LCAw LjYpOworICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNraW5nLWJsb2NrLmluY29tcGxl dGUgeworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IHJnYmEoMjA0LCAyMDQsIDUxLCAwLjUp OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNraW5nLWJs b2NrLnVuY2hhbmdlZC5zZWxlY3RlZCB7Ci0gICAgICAgICAgICAgICAgYmFja2dyb3VuZDogcmdi YSgxMjgsIDEyOCwgMTI4LCAxKTsKLSAgICAgICAgICAgICAgICBjb2xvcjogd2hpdGU7Ci0gICAg ICAgICAgICB9Ci0KICAgICAgICAgICAgIC5hbmFseXNpcy12aWV3IC5zdGFja2luZy1ibG9jay53 b3JzZSB7Ci0gICAgICAgICAgICAgICAgYmFja2dyb3VuZDogcmdiYSgyNTUsIDEwMiwgMTAyLCAw LjQpOwotICAgICAgICAgICAgICAgIGNvbG9yOiBibGFjazsKLSAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIC5hbmFseXNpcy12aWV3IC5zdGFja2luZy1ibG9jay53b3JzZTpob3ZlciB7Ci0gICAg ICAgICAgICAgICAgYmFja2dyb3VuZDogcmdiYSgyNTUsIDEwMiwgMTAyLCAwLjYpOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgLmFuYWx5c2lzLXZpZXcgLnN0YWNraW5nLWJsb2NrLndvcnNl LnNlbGVjdGVkIHsKLSAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiByZ2JhKDI1NSwgMTAyLCAx MDIsIDEpOwotICAgICAgICAgICAgICAgIGNvbG9yOiB3aGl0ZTsKKyAgICAgICAgICAgICAgICBi YWNrZ3JvdW5kOiByZ2JhKDI1NSwgMTAyLCAxMDIsIDAuNSk7CiAgICAgICAgICAgICB9Ci0KICAg ICAgICAgICAgIC5hbmFseXNpcy12aWV3IC5zdGFja2luZy1ibG9jay5iZXR0ZXIgewotICAgICAg ICAgICAgICAgIGJhY2tncm91bmQ6IHJnYmEoMTAyLCAxMDIsIDI1NSwgMC40KTsKLSAgICAgICAg ICAgICAgICBjb2xvcjogYmxhY2s7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAuYW5hbHlz aXMtdmlldyAuc3RhY2tpbmctYmxvY2suYmV0dGVyOmhvdmVyIHsKLSAgICAgICAgICAgICAgICBi YWNrZ3JvdW5kOiByZ2JhKDEwMiwgMTAyLCAyNTUsIDAuNik7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICAuYW5hbHlzaXMtdmlldyAuc3RhY2tpbmctYmxvY2suYmV0dGVyLnNlbGVjdGVkIHsK LSAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiByZ2JhKDEwMiwgMTAyLCAyNTUsIDEpOwotICAg ICAgICAgICAgICAgIGNvbG9yOiB3aGl0ZTsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBy Z2JhKDEwMiwgMTAyLCAyNTUsIDAuNSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIGA7CiAgICAg fQpAQCAtMzMyLDcgKzMxNCw4IEBAIEFuYWx5c2lzUmVzdWx0c1ZpZXdlci5UZXN0R3JvdXBTdGFj a2luZ0IKICAgICAgICAgdGhpcy5fc21hbGxlcklzQmV0dGVyID0gc21hbGxlcklzQmV0dGVyOwog ICAgICAgICB0aGlzLl9yb290U2V0SW5kZXhSb3dJbmRleE1hcCA9IFtdOwogICAgICAgICB0aGlz Ll9jbGFzc05hbWUgPSBjbGFzc05hbWU7Ci0gICAgICAgIHRoaXMuX2xhYmVsID0gJy0nOworICAg ICAgICB0aGlzLl9sYWJlbCA9IG51bGw7CisgICAgICAgIHRoaXMuX3RpdGxlID0gbnVsbDsKICAg ICAgICAgdGhpcy5fc3RhdHVzID0gbnVsbDsKICAgICAgICAgdGhpcy5fY2FsbGJhY2sgPSBjYWxs YmFjazsKICAgICB9CkBAIC0zNDksMTMgKzMzMiwxMiBAQCBBbmFseXNpc1Jlc3VsdHNWaWV3ZXIu VGVzdEdyb3VwU3RhY2tpbmdCCiAgICAgewogICAgICAgICB0aGlzLl9jb21wdXRlVGVzdEdyb3Vw U3RhdHVzKCk7CiAKLSAgICAgICAgdmFyIHRpdGxlID0gdGhpcy5fdGVzdEdyb3VwLmxhYmVsKCk7 CiAgICAgICAgIHJldHVybiBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQoJ3RkJywgewogICAg ICAgICAgICAgcm93c3BhbjogdGhpcy5lbmRSb3dJbmRleCgpIC0gdGhpcy5zdGFydFJvd0luZGV4 KCkgKyAxLAotICAgICAgICAgICAgdGl0bGU6IHRpdGxlLAorICAgICAgICAgICAgdGl0bGU6IHRo aXMuX3RpdGxlLAogICAgICAgICAgICAgY2xhc3M6ICdzdGFja2luZy1ibG9jayAnICsgdGhpcy5f Y2xhc3NOYW1lICsgJyAnICsgdGhpcy5fc3RhdHVzLAogICAgICAgICAgICAgb25jbGljazogdGhp cy5fY2FsbGJhY2ssCi0gICAgICAgIH0sIENvbXBvbmVudEJhc2UuY3JlYXRlTGluayh0aGlzLl9s YWJlbCwgdGl0bGUsIHRoaXMuX2NhbGxiYWNrKSk7CisgICAgICAgIH0sIENvbXBvbmVudEJhc2Uu Y3JlYXRlTGluayh0aGlzLl9sYWJlbCwgdGhpcy5fdGl0bGUsIHRoaXMuX2NhbGxiYWNrKSk7CiAg ICAgfQogCiAgICAgaXNDb21wbGV0ZSgpIHsgcmV0dXJuIHRoaXMuX3Jvb3RTZXRJbmRleFJvd0lu ZGV4TWFwLmxlbmd0aCA+PSAyOyB9CkBAIC0zNzUsMzIgKzM1NywxMiBAQCBBbmFseXNpc1Jlc3Vs dHNWaWV3ZXIuVGVzdEdyb3VwU3RhY2tpbmdCCiAKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhp cy5fcm9vdFNldEluZGV4Um93SW5kZXhNYXAubGVuZ3RoIDw9IDIpOyAvLyBGSVhNRTogU3VwcG9y dCBoYXZpbmcgbW9yZSByb290IHNldHMuCiAKLSAgICAgICAgdmFyIGJlZm9yZVZhbHVlcyA9IHRo aXMuX3ZhbHVlc0ZvclJvb3RTZXQodGhpcy5fcm9vdFNldEluZGV4Um93SW5kZXhNYXBbMF0ucm9v dFNldCk7Ci0gICAgICAgIHZhciBhZnRlclZhbHVlcyA9IHRoaXMuX3ZhbHVlc0ZvclJvb3RTZXQo dGhpcy5fcm9vdFNldEluZGV4Um93SW5kZXhNYXBbMV0ucm9vdFNldCk7Ci0KLSAgICAgICAgdmFy IHN0YXR1cyA9ICdmYWlsZWQnOwotICAgICAgICB2YXIgYmVmb3JlTWVhbiA9IFN0YXRpc3RpY3Mu c3VtKGJlZm9yZVZhbHVlcykgLyBiZWZvcmVWYWx1ZXMubGVuZ3RoOwotICAgICAgICB2YXIgYWZ0 ZXJNZWFuID0gU3RhdGlzdGljcy5zdW0oYWZ0ZXJWYWx1ZXMpIC8gYWZ0ZXJWYWx1ZXMubGVuZ3Ro OwotICAgICAgICBpZiAoYmVmb3JlVmFsdWVzLmxlbmd0aCAmJiBhZnRlclZhbHVlcy5sZW5ndGgp IHsKLSAgICAgICAgICAgIHZhciBkaWZmID0gYWZ0ZXJNZWFuIC0gYmVmb3JlTWVhbjsKLSAgICAg ICAgICAgIHRoaXMuX2xhYmVsID0gKGRpZmYgLyBiZWZvcmVNZWFuICogMTAwKS50b0ZpeGVkKDIp ICsgJyUnOwotICAgICAgICAgICAgc3RhdHVzID0gJ3VuY2hhbmdlZCc7Ci0gICAgICAgICAgICBp ZiAoU3RhdGlzdGljcy50ZXN0V2VsY2hzVChiZWZvcmVWYWx1ZXMsIGFmdGVyVmFsdWVzKSkKLSAg ICAgICAgICAgICAgICBzdGF0dXMgPSBkaWZmIDwgMCA9PSB0aGlzLl9zbWFsbGVySXNCZXR0ZXIg PyAnYmV0dGVyJyA6ICd3b3JzZSc7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLl9zdGF0dXMg PSBzdGF0dXM7Ci0gICAgfQorICAgICAgICB2YXIgcmVzdWx0ID0gdGhpcy5fdGVzdEdyb3VwLmNv bXBhcmVUZXN0UmVzdWx0cygKKyAgICAgICAgICAgIHRoaXMuX3Jvb3RTZXRJbmRleFJvd0luZGV4 TWFwWzBdLnJvb3RTZXQsIHRoaXMuX3Jvb3RTZXRJbmRleFJvd0luZGV4TWFwWzFdLnJvb3RTZXQp OwogCi0gICAgX3ZhbHVlc0ZvclJvb3RTZXQocm9vdFNldCkKLSAgICB7Ci0gICAgICAgIHZhciBy ZXF1ZXN0cyA9IHRoaXMuX3Rlc3RHcm91cC5yZXF1ZXN0c0ZvclJvb3RTZXQocm9vdFNldCk7Ci0g ICAgICAgIHZhciB2YWx1ZXMgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgcmVxdWVzdCBvZiByZXF1 ZXN0cykgewotICAgICAgICAgICAgaWYgKHJlcXVlc3QucmVzdWx0KCkpCi0gICAgICAgICAgICAg ICAgdmFsdWVzLnB1c2gocmVxdWVzdC5yZXN1bHQoKS52YWx1ZSk7Ci0gICAgICAgIH0KLSAgICAg ICAgcmV0dXJuIHZhbHVlczsKKyAgICAgICAgdGhpcy5fbGFiZWwgPSByZXN1bHQubGFiZWw7Cisg ICAgICAgIHRoaXMuX3RpdGxlID0gcmVzdWx0LmZ1bGxMYWJlbDsKKyAgICAgICAgdGhpcy5fc3Rh dHVzID0gcmVzdWx0LnN0YXR1czsKICAgICB9CiB9CiAKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9yZXN1bHRzLXRhYmxlLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9yZXN1bHRz LXRhYmxlLmpzCShyZXZpc2lvbiAxOTQ3NzUpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv cHVibGljL3YzL2NvbXBvbmVudHMvcmVzdWx0cy10YWJsZS5qcwkod29ya2luZyBjb3B5KQpAQCAt MjIsNTAgKzIyLDI0IEBAIGNsYXNzIFJlc3VsdHNUYWJsZSBleHRlbmRzIENvbXBvbmVudEJhc2UK IAogICAgICAgICB2YXIgYmFyR3JhcGhHcm91cCA9IG5ldyBCYXJHcmFwaEdyb3VwKHRoaXMuX3Zh bHVlRm9ybWF0dGVyKTsKICAgICAgICAgdmFyIGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0 ZUVsZW1lbnQ7Ci0gICAgICAgIHZhciBsaW5rID0gQ29tcG9uZW50QmFzZS5jcmVhdGVMaW5rOwor ICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CiAgICAgICAgIHZhciB0YWJsZUJvZGllcyA9IHJvd0dy b3Vwcy5tYXAoZnVuY3Rpb24gKGdyb3VwKSB7CiAgICAgICAgICAgICB2YXIgZ3JvdXBIZWFkaW5n ID0gZ3JvdXAuaGVhZGluZzsKICAgICAgICAgICAgIHZhciByZXZpc2lvblN1cHJlc3Npb25Db3Vu dCA9IHt9OwogCiAgICAgICAgICAgICByZXR1cm4gZWxlbWVudCgndGJvZHknLCBncm91cC5yb3dz Lm1hcChmdW5jdGlvbiAocm93LCByb3dJbmRleCkgewotICAgICAgICAgICAgICAgIHZhciBjZWxs cyA9IHJvdy5idWlsZEhlYWRpbmcoYmFyR3JhcGhHcm91cCk7Ci0KLSAgICAgICAgICAgICAgICBp ZiAoZ3JvdXBIZWFkaW5nICYmICFyb3dJbmRleCkKLSAgICAgICAgICAgICAgICAgICAgY2VsbHMu dW5zaGlmdChlbGVtZW50KCd0aCcsIHtyb3dzcGFuOiBncm91cC5yb3dzLmxlbmd0aH0sIGdyb3Vw SGVhZGluZykpOwotCi0gICAgICAgICAgICAgICAgdmFyIHJvb3RTZXQgPSByb3cucm9vdFNldCgp OwotICAgICAgICAgICAgICAgIHJlcG9zaXRvcnlMaXN0LmZvckVhY2goZnVuY3Rpb24gKHJlcG9z aXRvcnkpIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIGNvbW1pdCA9IHJvb3RTZXQgPyByb290 U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSkgOiBudWxsOwotCi0gICAgICAgICAg ICAgICAgICAgIGlmIChyZXZpc2lvblN1cHJlc3Npb25Db3VudFtyZXBvc2l0b3J5LmlkKCldKSB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvblN1cHJlc3Npb25Db3VudFtyZXBvc2l0 b3J5LmlkKCldLS07Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAg ICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgICAgICB2YXIgc3VjY2VlZGluZ1Jvd0luZGV4 ID0gcm93SW5kZXggKyAxOwotICAgICAgICAgICAgICAgICAgICB3aGlsZSAoc3VjY2VlZGluZ1Jv d0luZGV4IDwgZ3JvdXAucm93cy5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZh ciBzdWNjZWVkaW5nUm9vdFNldCA9IGdyb3VwLnJvd3Nbc3VjY2VlZGluZ1Jvd0luZGV4XS5yb290 U2V0KCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3VjY2VlZGluZ1Jvb3RTZXQgJiYg Y29tbWl0ICE9IHN1Y2NlZWRpbmdSb290U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9y eSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBzdWNjZWVkaW5nUm93SW5kZXgrKzsKLSAgICAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgICAgICB2YXIgcm93U3BhbiA9IHN1Y2NlZWRpbmdSb3dJbmRleCAtIHJvd0lu ZGV4OwotICAgICAgICAgICAgICAgICAgICB2YXIgYXR0cmlidXRlcyA9IHtjbGFzczogJ3Jldmlz aW9uJ307Ci0gICAgICAgICAgICAgICAgICAgIGlmIChyb3dTcGFuID4gMSkgewotICAgICAgICAg ICAgICAgICAgICAgICAgcmV2aXNpb25TdXByZXNzaW9uQ291bnRbcmVwb3NpdG9yeS5pZCgpXSA9 IHJvd1NwYW4gLSAxOwotICAgICAgICAgICAgICAgICAgICAgICAgYXR0cmlidXRlc1sncm93c3Bh biddID0gcm93U3BhbjsgICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICAgICAgICAgIGlmIChyb3dJbmRleCArIHJvd1NwYW4gPj0gZ3JvdXAu cm93cy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzWydjbGFzcydd ICs9ICcgbGFzdFJldmlzaW9uJzsKLQotICAgICAgICAgICAgICAgICAgICB2YXIgY29udGVudCA9 ICdNaXNzaW5nJzsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGNvbW1pdCkgewotICAgICAgICAg ICAgICAgICAgICAgICAgdmFyIHVybCA9IGNvbW1pdC51cmwoKTsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnRlbnQgPSB1cmwgPyBsaW5rKGNvbW1pdC5sYWJlbCgpLCB1cmwpIDogY29tbWl0 LmxhYmVsKCk7Ci0gICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB2YXIgY2Vs bHMgPSBbXTsKIAotICAgICAgICAgICAgICAgICAgICBjZWxscy5wdXNoKGVsZW1lbnQoJ3RkJywg YXR0cmlidXRlcywgY29udGVudCkpOwotICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAg ICAgIGlmIChncm91cEhlYWRpbmcgIT09IHVuZGVmaW5lZCAmJiAhcm93SW5kZXgpCisgICAgICAg ICAgICAgICAgICAgIGNlbGxzLnB1c2goZWxlbWVudCgndGgnLCB7cm93c3BhbjogZ3JvdXAucm93 cy5sZW5ndGh9LCBncm91cEhlYWRpbmcpKTsKKyAgICAgICAgICAgICAgICBjZWxscy5wdXNoKGVs ZW1lbnQoJ3RkJywgcm93LmhlYWRpbmcoKSkpOworCisgICAgICAgICAgICAgICAgaWYgKHJvdy5s YWJlbEZvcldob2xlUm93KCkpCisgICAgICAgICAgICAgICAgICAgIGNlbGxzLnB1c2goZWxlbWVu dCgndGQnLCB7Y2xhc3M6ICd3aG9sZS1yb3ctbGFiZWwnLCBjb2xzcGFuOiByZXBvc2l0b3J5TGlz dC5sZW5ndGggKyAxfSwgcm93LmxhYmVsRm9yV2hvbGVSb3coKSkpOworICAgICAgICAgICAgICAg IGVsc2UgeworICAgICAgICAgICAgICAgICAgICBjZWxscy5wdXNoKGVsZW1lbnQoJ3RkJywgcm93 LnJlc3VsdENvbnRlbnQoYmFyR3JhcGhHcm91cCkpKTsKKyAgICAgICAgICAgICAgICAgICAgY2Vs bHMucHVzaChzZWxmLl9jcmVhdGVSZXZpc2lvbkxpc3RDZWxscyhyZXBvc2l0b3J5TGlzdCwgcmV2 aXNpb25TdXByZXNzaW9uQ291bnQsIGdyb3VwLCByb3cucm9vdFNldCgpLCByb3dJbmRleCkpOwor ICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIHJldHVybiBlbGVtZW50KCd0cics IFtjZWxscywgcm93LmFkZGl0aW9uYWxDb2x1bW5zKCldKTsKICAgICAgICAgICAgIH0pKTsKQEAg LTg5LDYgKzYzLDQ2IEBAIGNsYXNzIFJlc3VsdHNUYWJsZSBleHRlbmRzIENvbXBvbmVudEJhc2UK ICAgICAgICAgSW5zdHJ1bWVudGF0aW9uLmVuZE1lYXN1cmluZ1RpbWUoJ1Jlc3VsdHNUYWJsZScs ICdyZW5kZXInKTsKICAgICB9CiAKKyAgICBfY3JlYXRlUmV2aXNpb25MaXN0Q2VsbHMocmVwb3Np dG9yeUxpc3QsIHJldmlzaW9uU3VwcmVzc2lvbkNvdW50LCB0ZXN0R3JvdXAsIHJvb3RTZXQsIHJv d0luZGV4KQorICAgIHsKKyAgICAgICAgdmFyIGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0 ZUVsZW1lbnQ7CisgICAgICAgIHZhciBsaW5rID0gQ29tcG9uZW50QmFzZS5jcmVhdGVMaW5rOwor ICAgICAgICB2YXIgY2VsbHMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgcmVwb3NpdG9yeSBvZiBy ZXBvc2l0b3J5TGlzdCkgeworICAgICAgICAgICAgdmFyIGNvbW1pdCA9IHJvb3RTZXQgPyByb290 U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSkgOiBudWxsOworCisgICAgICAgICAg ICBpZiAocmV2aXNpb25TdXByZXNzaW9uQ291bnRbcmVwb3NpdG9yeS5pZCgpXSkgeworICAgICAg ICAgICAgICAgIHJldmlzaW9uU3VwcmVzc2lvbkNvdW50W3JlcG9zaXRvcnkuaWQoKV0tLTsKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdmFy IHN1Y2NlZWRpbmdSb3dJbmRleCA9IHJvd0luZGV4ICsgMTsKKyAgICAgICAgICAgIHdoaWxlIChz dWNjZWVkaW5nUm93SW5kZXggPCB0ZXN0R3JvdXAucm93cy5sZW5ndGgpIHsKKyAgICAgICAgICAg ICAgICB2YXIgc3VjY2VlZGluZ1Jvb3RTZXQgPSB0ZXN0R3JvdXAucm93c1tzdWNjZWVkaW5nUm93 SW5kZXhdLnJvb3RTZXQoKTsKKyAgICAgICAgICAgICAgICBpZiAoc3VjY2VlZGluZ1Jvb3RTZXQg JiYgY29tbWl0ICE9IHN1Y2NlZWRpbmdSb290U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3Np dG9yeSkpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIHN1Y2Nl ZWRpbmdSb3dJbmRleCsrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIHJvd1NwYW4g PSBzdWNjZWVkaW5nUm93SW5kZXggLSByb3dJbmRleDsKKyAgICAgICAgICAgIHZhciBhdHRyaWJ1 dGVzID0ge2NsYXNzOiAncmV2aXNpb24nfTsKKyAgICAgICAgICAgIGlmIChyb3dTcGFuID4gMSkg eworICAgICAgICAgICAgICAgIHJldmlzaW9uU3VwcmVzc2lvbkNvdW50W3JlcG9zaXRvcnkuaWQo KV0gPSByb3dTcGFuIC0gMTsKKyAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzWydyb3dzcGFuJ10g PSByb3dTcGFuOyAgICAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICB9CisgICAgICAg ICAgICBpZiAocm93SW5kZXggKyByb3dTcGFuID49IHRlc3RHcm91cC5yb3dzLmxlbmd0aCkKKyAg ICAgICAgICAgICAgICBhdHRyaWJ1dGVzWydjbGFzcyddICs9ICcgbGFzdFJldmlzaW9uJzsKKwor ICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSAnTWlzc2luZyc7CisgICAgICAgICAgICBpZiAoY29t bWl0KSB7CisgICAgICAgICAgICAgICAgdmFyIHVybCA9IGNvbW1pdC51cmwoKTsKKyAgICAgICAg ICAgICAgICBjb250ZW50ID0gdXJsID8gbGluayhjb21taXQubGFiZWwoKSwgdXJsKSA6IGNvbW1p dC5sYWJlbCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjZWxscy5wdXNoKGVsZW1l bnQoJ3RkJywgYXR0cmlidXRlcywgY29udGVudCkpOworICAgICAgICB9CisgICAgICAgIHJldHVy biBjZWxsczsKKyAgICB9CisKICAgICBoZWFkaW5nKCkgeyB0aHJvdyAnTm90SW1wbGVtZW50ZWQn OyB9CiAgICAgYWRkaXRpb25hbEhlYWRpbmcoKSB7IHJldHVybiBbXTsgfQogICAgIGJ1aWxkUm93 R3JvdXBzKCkgeyB0aHJvdyAnTm90SW1wbGVtZW50ZWQnOyB9CkBAIC0xNTIsNyArMTY2LDExIEBA IGNsYXNzIFJlc3VsdHNUYWJsZSBleHRlbmRzIENvbXBvbmVudEJhc2UKICAgICAgICAgICAgICAg ICBoZWlnaHQ6IDEuNHJlbTsKICAgICAgICAgICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKworICAgICAgICAgICAgLnJlc3VsdHMtdGFibGUg dGQud2hvbGUtcm93LWxhYmVsIHsKKyAgICAgICAgICAgICAgICB0ZXh0LWFsaWduOiBsZWZ0Owor ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAucmVzdWx0cy10YWJsZSB0aGVhZCB7CiAgICAg ICAgICAgICAgICAgY29sb3I6ICNjOTM7CiAgICAgICAgICAgICB9CkBAIC0yMjgsMTAgKzI0Niwx MSBAQCBjbGFzcyBSZXN1bHRzVGFibGVSb3cgewogICAgICAgICB0aGlzLl9sYWJlbCA9ICctJzsK ICAgICAgICAgdGhpcy5fcm9vdFNldCA9IHJvb3RTZXQ7CiAgICAgICAgIHRoaXMuX2FkZGl0aW9u YWxDb2x1bW5zID0gW107CisgICAgICAgIHRoaXMuX2xhYmVsRm9yV2hvbGVSb3cgPSBudWxsOwog ICAgIH0KIAorICAgIGhlYWRpbmcoKSB7IHJldHVybiB0aGlzLl9oZWFkaW5nOyB9CiAgICAgcm9v dFNldCgpIHsgcmV0dXJuIHRoaXMuX3Jvb3RTZXQ7IH0KLQogICAgIHNldFJlc3VsdChyZXN1bHQp IHsgdGhpcy5fcmVzdWx0ID0gcmVzdWx0OyB9CiAgICAgc2V0TGluayhsaW5rLCBsYWJlbCkKICAg ICB7CkBAIC0yMzksMTggKzI1OCwxNSBAQCBjbGFzcyBSZXN1bHRzVGFibGVSb3cgewogICAgICAg ICB0aGlzLl9sYWJlbCA9IGxhYmVsOwogICAgIH0KIAorICAgIHNldExhYmVsRm9yV2hvbGVSb3co bGFiZWwpIHsgdGhpcy5fbGFiZWxGb3JXaG9sZVJvdyA9IGxhYmVsOyB9CisgICAgbGFiZWxGb3JX aG9sZVJvdygpIHsgcmV0dXJuIHRoaXMuX2xhYmVsRm9yV2hvbGVSb3c7IH0KKwogICAgIGFkZGl0 aW9uYWxDb2x1bW5zKCkgeyByZXR1cm4gdGhpcy5fYWRkaXRpb25hbENvbHVtbnM7IH0KICAgICBz ZXRBZGRpdGlvbmFsQ29sdW1ucyhhZGRpdGlvbmFsQ29sdW1ucykgeyB0aGlzLl9hZGRpdGlvbmFs Q29sdW1ucyA9IGFkZGl0aW9uYWxDb2x1bW5zOyB9CiAKLSAgICBidWlsZEhlYWRpbmcoYmFyR3Jh cGhHcm91cCkKKyAgICByZXN1bHRDb250ZW50KGJhckdyYXBoR3JvdXApCiAgICAgewotICAgICAg ICB2YXIgZWxlbWVudCA9IENvbXBvbmVudEJhc2UuY3JlYXRlRWxlbWVudDsKLSAgICAgICAgdmFy IGxpbmsgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUxpbms7Ci0KICAgICAgICAgdmFyIHJlc3VsdENv bnRlbnQgPSB0aGlzLl9yZXN1bHQgPyBiYXJHcmFwaEdyb3VwLmFkZEJhcih0aGlzLl9yZXN1bHQu dmFsdWUsIHRoaXMuX3Jlc3VsdC5pbnRlcnZhbCkgOiB0aGlzLl9sYWJlbDsKLSAgICAgICAgcmV0 dXJuIFsKLSAgICAgICAgICAgIGVsZW1lbnQoJ3RoJywgdGhpcy5faGVhZGluZyksCi0gICAgICAg ICAgICBlbGVtZW50KCd0ZCcsIHRoaXMuX2xpbmsgPyBsaW5rKHJlc3VsdENvbnRlbnQsIHRoaXMu X2xhYmVsLCB0aGlzLl9saW5rKSA6IHJlc3VsdENvbnRlbnQpLAotICAgICAgICBdOworICAgICAg ICByZXR1cm4gdGhpcy5fbGluayA/IENvbXBvbmVudEJhc2UuY3JlYXRlTGluayhyZXN1bHRDb250 ZW50LCB0aGlzLl9sYWJlbCwgdGhpcy5fbGluaykgOiByZXN1bHRDb250ZW50OwogICAgIH0KIH0K SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy90ZXN0 LWdyb3VwLXJlc3VsdHMtdGFibGUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL3Rlc3QtZ3JvdXAtcmVzdWx0cy10YWJsZS5qcwko cmV2aXNpb24gMTk0Nzc1KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9j b21wb25lbnRzL3Rlc3QtZ3JvdXAtcmVzdWx0cy10YWJsZS5qcwkod29ya2luZyBjb3B5KQpAQCAt MjksMTIgKzI5LDE0IEBAIGNsYXNzIFRlc3RHcm91cFJlc3VsdHNUYWJsZSBleHRlbmRzIFJlc3UK ICAgICAgICAgaWYgKCF0ZXN0R3JvdXApCiAgICAgICAgICAgICByZXR1cm4gW107CiAKLSAgICAg ICAgcmV0dXJuIHRoaXMuX3Rlc3RHcm91cC5yZXF1ZXN0ZWRSb290U2V0cygpLm1hcChmdW5jdGlv biAocm9vdFNldCwgc2V0SW5kZXgpIHsKKyAgICAgICAgdmFyIHJvb3RTZXRzID0gdGhpcy5fdGVz dEdyb3VwLnJlcXVlc3RlZFJvb3RTZXRzKCk7CisgICAgICAgIHZhciBncm91cHMgPSByb290U2V0 cy5tYXAoZnVuY3Rpb24gKHJvb3RTZXQsIHNldEluZGV4KSB7CiAgICAgICAgICAgICB2YXIgcm93 cyA9IFtuZXcgUmVzdWx0c1RhYmxlUm93KCdNZWFuJywgcm9vdFNldCldOwogICAgICAgICAgICAg dmFyIHJlc3VsdHMgPSBbXTsKIAogICAgICAgICAgICAgZm9yICh2YXIgcmVxdWVzdCBvZiB0ZXN0 R3JvdXAucmVxdWVzdHNGb3JSb290U2V0KHJvb3RTZXQpKSB7CiAgICAgICAgICAgICAgICAgdmFy IHJlc3VsdCA9IHJlcXVlc3QucmVzdWx0KCk7CisgICAgICAgICAgICAgICAgLy8gQ2FsbCByZXN1 bHQucm9vdFNldCgpIGZvciBlYWNoIHJlc3VsdCBzaW5jZSB0aGUgc2V0IG9mIHJldmlzaW9ucyB1 c2VkIGluIHRlc3RpbmcgbWF5YmUgZGlmZmVyZW50IGZyb20gcmVxdWVzdGVkIG9uZXMuCiAgICAg ICAgICAgICAgICAgdmFyIHJvdyA9IG5ldyBSZXN1bHRzVGFibGVSb3coMSArICtyZXF1ZXN0Lm9y ZGVyKCksIHJlc3VsdCA/IHJlc3VsdC5yb290U2V0KCkgOiBudWxsKTsKICAgICAgICAgICAgICAg ICByb3dzLnB1c2gocm93KTsKICAgICAgICAgICAgICAgICBpZiAocmVzdWx0KSB7CkBAIC01MCw3 ICs1MiwyNyBAQCBjbGFzcyBUZXN0R3JvdXBSZXN1bHRzVGFibGUgZXh0ZW5kcyBSZXN1CiAgICAg ICAgICAgICAgICAgcm93c1swXS5zZXRSZXN1bHQoYWdncmVnYXRlZFJlc3VsdCk7CiAKICAgICAg ICAgICAgIHJldHVybiB7aGVhZGluZzogU3RyaW5nLmZyb21DaGFyQ29kZSgnQScuY2hhckNvZGVB dCgwKSArIHNldEluZGV4KSwgcm93czpyb3dzfTsKLSAgICAgICAgfSkKKyAgICAgICAgfSk7CisK KyAgICAgICAgdmFyIGNvbXBhcmlzb25Sb3dzID0gW107CisgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgcm9vdFNldHMubGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIGZvciAodmFyIGogPSBp ICsgMTsgaiA8IHJvb3RTZXRzLmxlbmd0aDsgaisrKSB7CisgICAgICAgICAgICAgICAgdmFyIHN0 YXJ0Q29uZmlnID0gU3RyaW5nLmZyb21DaGFyQ29kZSgnQScuY2hhckNvZGVBdCgwKSArIGkpOwor ICAgICAgICAgICAgICAgIHZhciBlbmRDb25maWcgPSBTdHJpbmcuZnJvbUNoYXJDb2RlKCdBJy5j aGFyQ29kZUF0KDApICsgaik7CisKKyAgICAgICAgICAgICAgICB2YXIgcmVzdWx0ID0gdGhpcy5f dGVzdEdyb3VwLmNvbXBhcmVUZXN0UmVzdWx0cyhyb290U2V0c1tpXSwgcm9vdFNldHNbal0pOwor ICAgICAgICAgICAgICAgIGlmIChyZXN1bHQuc3RhdHVzID09ICdpbmNvbXBsZXRlJyB8fCByZXN1 bHQuc3RhdHVzID09ICdmYWlsZWQnKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKwor ICAgICAgICAgICAgICAgIHZhciByb3cgPSBuZXcgUmVzdWx0c1RhYmxlUm93KGAke3N0YXJ0Q29u ZmlnfSB0byAke2VuZENvbmZpZ31gLCBudWxsKTsKKyAgICAgICAgICAgICAgICByb3cuc2V0TGFi ZWxGb3JXaG9sZVJvdyhyZXN1bHQuZnVsbExhYmVsKTsKKyAgICAgICAgICAgICAgICBjb21wYXJp c29uUm93cy5wdXNoKHJvdyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBn cm91cHMucHVzaCh7aGVhZGluZzogJycsIHJvd3M6IGNvbXBhcmlzb25Sb3dzfSk7CisKKyAgICAg ICAgcmV0dXJuIGdyb3VwczsKICAgICB9CiB9CiAKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL2J1aWxkLXJlcXVlc3QuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvYnVpbGQtcmVxdWVzdC5qcwko cmV2aXNpb24gMTk0Nzc1KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9t b2RlbHMvYnVpbGQtcmVxdWVzdC5qcwkod29ya2luZyBjb3B5KQpAQCAtMjAsNiArMjAsNyBAQCBj bGFzcyBCdWlsZFJlcXVlc3QgZXh0ZW5kcyBEYXRhTW9kZWxPYmplCiAgICAgb3JkZXIoKSB7IHJl dHVybiB0aGlzLl9vcmRlcjsgfQogICAgIHJvb3RTZXQoKSB7IHJldHVybiB0aGlzLl9yb290U2V0 OyB9CiAKKyAgICBoYXNDb21wbGV0ZWQoKSB7IHJldHVybiB0aGlzLl9zdGF0dXMgPT0gJ2ZhaWxl ZCcgfHwgdGhpcy5fc3RhdHVzID09ICdjb21wbGV0ZWQnOyB9CiAgICAgc3RhdHVzTGFiZWwoKQog ICAgIHsKICAgICAgICAgc3dpdGNoICh0aGlzLl9zdGF0dXMpIHsKSW5kZXg6IFdlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3Rlc3QtZ3JvdXAuanMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGVzdC1ncm91cC5q cwkocmV2aXNpb24gMTk0Nzc1KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9tb2RlbHMvdGVzdC1ncm91cC5qcwkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksNTAgQEAg Y2xhc3MgVGVzdEdyb3VwIGV4dGVuZHMgTGFiZWxlZE9iamVjdCB7CiAgICAgICAgIHRoaXMuX2Fs bFJvb3RTZXRzID0gbnVsbDsKICAgICB9CiAKKyAgICBoYXNDb21wbGV0ZWQoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2J1aWxkUmVxdWVzdHMuZXZlcnkoZnVuY3Rpb24gKHJlcXVlc3Qp IHsgcmV0dXJuIHJlcXVlc3QuaGFzQ29tcGxldGVkKCk7IH0pOworICAgIH0KKworICAgIGNvbXBh cmVUZXN0UmVzdWx0cyhyb290U2V0QSwgcm9vdFNldEIpCisgICAgeworICAgICAgICB2YXIgYmVm b3JlVmFsdWVzID0gdGhpcy5fdmFsdWVzRm9yUm9vdFNldChyb290U2V0QSk7CisgICAgICAgIHZh ciBhZnRlclZhbHVlcyA9IHRoaXMuX3ZhbHVlc0ZvclJvb3RTZXQocm9vdFNldEIpOworICAgICAg ICB2YXIgYmVmb3JlTWVhbiA9IFN0YXRpc3RpY3Muc3VtKGJlZm9yZVZhbHVlcykgLyBiZWZvcmVW YWx1ZXMubGVuZ3RoOworICAgICAgICB2YXIgYWZ0ZXJNZWFuID0gU3RhdGlzdGljcy5zdW0oYWZ0 ZXJWYWx1ZXMpIC8gYWZ0ZXJWYWx1ZXMubGVuZ3RoOworCisgICAgICAgIHZhciByZXN1bHQgPSB7 Y2hhbmdlVHlwZTogbnVsbCwgc3RhdHVzOiAnZmFpbGVkJywgbGFiZWw6ICdGYWlsZWQnLCBmdWxs TGFiZWw6ICdGYWlsZWQnLCBpc1N0YXRpc3RpY2FsbHlTaWduaWZpY2FudDogZmFsc2V9OworICAg ICAgICBpZiAoYmVmb3JlVmFsdWVzLmxlbmd0aCAmJiBhZnRlclZhbHVlcy5sZW5ndGgpIHsKKyAg ICAgICAgICAgIHZhciBkaWZmID0gYWZ0ZXJNZWFuIC0gYmVmb3JlTWVhbjsKKyAgICAgICAgICAg IHJlc3VsdC5jaGFuZ2VUeXBlID0gZGlmZiA8IDAgPT0gdGhpcy5fc21hbGxlcklzQmV0dGVyID8g J2JldHRlcicgOiAnd29yc2UnOworICAgICAgICAgICAgcmVzdWx0LmxhYmVsID0gTWF0aC5hYnMo ZGlmZiAvIGJlZm9yZU1lYW4gKiAxMDApLnRvRml4ZWQoMikgKyAnJSAnICsgcmVzdWx0LmNoYW5n ZVR5cGU7CisgICAgICAgICAgICByZXN1bHQuaXNTdGF0aXN0aWNhbGx5U2lnbmlmaWNhbnQgPSBT dGF0aXN0aWNzLnRlc3RXZWxjaHNUKGJlZm9yZVZhbHVlcywgYWZ0ZXJWYWx1ZXMpOworICAgICAg ICAgICAgcmVzdWx0LnN0YXR1cyA9IHJlc3VsdC5pc1N0YXRpc3RpY2FsbHlTaWduaWZpY2FudCA/ IHJlc3VsdC5jaGFuZ2VUeXBlIDogJ3VuY2hhbmdlZCc7CisgICAgICAgIH0KKworICAgICAgICBp ZiAoIXRoaXMuaGFzQ29tcGxldGVkKCkpIHsKKyAgICAgICAgICAgIHJlc3VsdC5zdGF0dXMgPSAn aW5jb21wbGV0ZSc7CisgICAgICAgICAgICByZXN1bHQubGFiZWwgPSAnUnVubmluZyc7CisgICAg ICAgICAgICByZXN1bHQuZnVsbExhYmVsID0gJ1J1bm5pbmcnOworICAgICAgICB9IGVsc2UgaWYg KHJlc3VsdC5jaGFuZ2VUeXBlKSB7CisgICAgICAgICAgICB2YXIgc2lnbmlmaWNhbmNlID0gcmVz dWx0LmlzU3RhdGlzdGljYWxseVNpZ25pZmljYW50ID8gJ3NpZ25pZmljYW50JyA6ICdpbnNpZ25p ZmljYW50JzsKKyAgICAgICAgICAgIHJlc3VsdC5mdWxsTGFiZWwgPSBgJHtyZXN1bHQubGFiZWx9 IChzdGF0aXN0aWNhbGx5ICR7c2lnbmlmaWNhbmNlfSlgOworICAgICAgICB9CisKKyAgICAgICAg cmV0dXJuIHJlc3VsdDsKKyAgICB9CisKKyAgICBfdmFsdWVzRm9yUm9vdFNldChyb290U2V0KQor ICAgIHsKKyAgICAgICAgdmFyIHJlcXVlc3RzID0gdGhpcy5yZXF1ZXN0c0ZvclJvb3RTZXQocm9v dFNldCk7CisgICAgICAgIHZhciB2YWx1ZXMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgcmVxdWVz dCBvZiByZXF1ZXN0cykgeworICAgICAgICAgICAgaWYgKHJlcXVlc3QucmVzdWx0KCkpCisgICAg ICAgICAgICAgICAgdmFsdWVzLnB1c2gocmVxdWVzdC5yZXN1bHQoKS52YWx1ZSk7CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIHZhbHVlczsKKyAgICB9CisKICAgICBzdGF0aWMgZmV0Y2hCeVRh c2sodGFza0lkKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuY2FjaGVkRmV0Y2goJy4uL2Fw aS90ZXN0LWdyb3VwcycsIHt0YXNrOiB0YXNrSWR9KS50aGVuKGZ1bmN0aW9uIChkYXRhKSB7Cklu ZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2FuYWx5c2lzLXRh c2stcGFnZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL3BhZ2VzL2FuYWx5c2lzLXRhc2stcGFnZS5qcwkocmV2aXNpb24gMTk0Nzc1KQorKysgV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9hbmFseXNpcy10YXNrLXBhZ2Uu anMJKHdvcmtpbmcgY29weSkKQEAgLTIwNCwxMSArMjA0LDggQEAgY2xhc3MgQW5hbHlzaXNUYXNr UGFnZSBleHRlbmRzIFBhZ2VXaXRoSAogICAgIHsKICAgICAgICAgcmV0dXJuIGAKICAgICAgICAg ICAgIC5hbmFseXNpcy10YXNsLXBhZ2UtY29udGFpbmVyIHsKLSAgICAgICAgICAgICAgICB0ZXh0 LWFsaWduOiBjZW50ZXI7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAuYW5hbHlzaXMtdGFz bC1wYWdlIHsKLSAgICAgICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ci0gICAgICAg ICAgICAgICAgdGV4dC1hbGlnbjogbGVmdDsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg LmFuYWx5c2lzLXRhc2stbmFtZSB7CkBAIC0yNDUsMzQgKzI0MiwzNCBAQCBjbGFzcyBBbmFseXNp c1Rhc2tQYWdlIGV4dGVuZHMgUGFnZVdpdGhICiAgICAgICAgICAgICAgICAgbWFyZ2luOiAxcmVt OwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICAudGVzdC1jb25maWd1cmF0aW9uIGgzIHsK KyAgICAgICAgICAgICAgICBmb250LXNpemU6IDFyZW07CisgICAgICAgICAgICAgICAgZm9udC13 ZWlnaHQ6IGluaGVyaXQ7CisgICAgICAgICAgICAgICAgY29sb3I6IGluaGVyaXQ7CisgICAgICAg ICAgICAgICAgbWFyZ2luOiAwIDFyZW07CisgICAgICAgICAgICAgICAgcGFkZGluZzogMDsKKyAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgLnRlc3QtZ3JvdXAtdmlldyB7Ci0gICAgICAgICAg ICAgICAgZGlzcGxheTogZmxleDsKLSAgICAgICAgICAgICAgICBmbGV4LWRpcmVjdGlvbjogcm93 OwotICAgICAgICAgICAgICAgIGFsaWduLWl0ZW1zOiBzdHJldGNoOwotICAgICAgICAgICAgICAg IGFsaWduLWNvbnRlbnQ6IHN0cmV0Y2g7CisgICAgICAgICAgICAgICAgZGlzcGxheTogdGFibGU7 CiAgICAgICAgICAgICAgICAgbWFyZ2luOiAwIDFyZW07CiAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIC50ZXN0LWdyb3VwLWRldGFpbHMgewotICAgICAgICAgICAgICAgIGRpc3BsYXk6IGZs ZXg7Ci0gICAgICAgICAgICAgICAgZmxleC1ncm93OiAxOworICAgICAgICAgICAgICAgIGRpc3Bs YXk6IHRhYmxlLWNlbGw7CiAgICAgICAgICAgICAgICAgbWFyZ2luLWJvdHRvbTogMXJlbTsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgLnRlc3QtY29uZmlndXJhdGlvbiBoMyB7Ci0gICAg ICAgICAgICAgICAgZm9udC1zaXplOiAxcmVtOwotICAgICAgICAgICAgICAgIGZvbnQtd2VpZ2h0 OiBpbmhlcml0OwotICAgICAgICAgICAgICAgIGNvbG9yOiBpbmhlcml0OwotICAgICAgICAgICAg ICAgIG1hcmdpbjogMCAxcmVtOwotICAgICAgICAgICAgICAgIHBhZGRpbmc6IDA7CisgICAgICAg ICAgICAudGVzdC1ncm91cC1saXN0IHsKKyAgICAgICAgICAgICAgICBkaXNwbGF5OiB0YWJsZS1j ZWxsOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAudGVzdC1ncm91cC1saXN0Om5vdCg6 ZW1wdHkpIHsKICAgICAgICAgICAgICAgICBtYXJnaW46IDA7CiAgICAgICAgICAgICAgICAgcGFk ZGluZzogMC4ycmVtIDA7CiAgICAgICAgICAgICAgICAgbGlzdC1zdHlsZTogbm9uZTsKLSAgICAg ICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgICAgICAgICAgICAgICAgYm9yZGVy LXJpZ2h0OiBzb2xpZCAxcHggI2NjYzsKKyAgICAgICAgICAgICAgICB3aGl0ZS1zcGFjZTogbm93 cmFwOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAudGVzdC1ncm91cC1saXN0IGxpIHsK