172399 2017-05-19 16:32:15 -0700 Add a commit log viewer next to the analysis results viewer 2017-05-19 17:03:27 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez rniwa oldest_to_newest 1310855 0 rniwa 2017-05-19 16:32:15 -0700 Per Chris's request, add a commit log viewer for the analysis results viewer so that we can easily open a trac page per A/B testing. 1310870 1 310728 rniwa 2017-05-19 16:58:19 -0700 Created attachment 310728 Patch 1310872 2 310728 cdumez 2017-05-19 17:00:59 -0700 Comment on attachment 310728 Patch rs=me, Thanks! 1310875 3 310728 rniwa 2017-05-19 17:03:25 -0700 Comment on attachment 310728 Patch Clearing flags on attachment: 310728 Committed r217173: <http://trac.webkit.org/changeset/217173> 1310876 4 rniwa 2017-05-19 17:03:27 -0700 All reviewed patches have been landed. Closing bug. 310728 2017-05-19 16:58:19 -0700 2017-05-19 17:03:25 -0700 Patch bug-172399-20170519165818.patch text/plain 19177 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2OTQ5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA1NzUxMjY1NjBmMTMyOTIzMjVlYWU1Y2ViNjQ4ODg0ODM2ODFiZDUyLi5mZmVlMjZlMGU2 YjBjMWEzZTZlODUxZDgyYjJlZTI3OWRiNmMwOTE0IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSw2MSBAQAorMjAxNy0wNS0xOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgYSBjb21taXQgbG9nIHZpZXdlciBuZXh0IHRvIHRo ZSBhbmFseXNpcyByZXN1bHRzIHZpZXdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcyMzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGEgY29tbWl0IGxvZyB2aWV3ZXIgbmV4dCB0byB0aGUgYW5h bHlzaXMgcmVzdWx0cyB2aWV3ZXIsIHdoaWNoIHZpc3VhbGl6ZXMgdGhlIEEvQiB0ZXN0aW5nIHJl c3VsdHMuCisKKyAgICAgICAgQWxzbyBsaW5raWZ5IHRoZSByZXZpc2lvbnMgaW4gdGhlIHRhYmxl IHRoYXQgc2hvd3MgdGhlIHN0YXR1cyBvZiBlYWNoIEEvQiB0ZXN0aW5nIGpvYiwKKyAgICAgICAg YW5kIGFsbG93IHRoZSBwcmVmaXggb2YgInIiIHdoZW4gYXNzb2NpYXRpbmcgYSBTdWJ2ZXJzaW9u IHJldmlzaW9uLgorCisgICAgICAgIEZpbmFsbHksIEZpeGVkIGEgYnVnIHRoYXQgdGhlIGxpc3Qg b2YgY29tbWl0cyBhc3NvY2lhdGVkIHdpdGggdGhlIGFuYWx5c2lzIHRhc2sgd2VyZSBub3QgcmUt cmVuZGVyZWQKKyAgICAgICAgd2hlbiB0aGUgbGlzdCB3YXMgdXBkYXRlZCBieSB0aGUgdXNlci4K KworICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2FuYWx5c2lzLXJlc3VsdHMtdmlld2Vy LmpzOgorICAgICAgICAoQW5hbHlzaXNSZXN1bHRzVmlld2VyKTogQWRkZWQgX3NlbGVjdG9yUmFk aW9CdXR0b25MaXN0IGFzIGFuIGluc3RhbmNlIHZhcmlhYmxlLiBJdCdzIGEgbGlzdCBvZiByYWRp bworICAgICAgICBidXR0b25zIHRvIHNlbGVjdCBhIGNvbmZpZ3VyYXRpb24gKEEvQikgd2l0aCBh IGNvbW1pdCBzZXQuIEl0J3MgYWRkZWQgdG8gdXBkYXRlIHRoZSBjaGVja2VkIHN0YXR1cyBvZgor ICAgICAgICByYWRpbyBidXR0b25zIHVwb24gY2hhbmdpbmcgdGhlIGN1cnJlbnRseSBzZWxlY3Rl ZCB0ZXN0IGdyb3VwLgorICAgICAgICAoQW5hbHlzaXNSZXN1bHRzVmlld2VyLnByb3RvdHlwZS5z ZXRUZXN0R3JvdXBzKTogVXBkYXRlIHRoZSBzZWxlY3RlZCByYW5nZSB0byB0aGF0IG9mIHRoZSBj dXJyZW50bHkKKyAgICAgICAgc2VsZWN0ZWQgZ3JvdXAuCisgICAgICAgIChBbmFseXNpc1Jlc3Vs dHNWaWV3ZXIucHJvdG90eXBlLnJlbmRlcik6IEZpbGwgX3NlbGVjdG9yUmFkaW9CdXR0b25MaXN0 IHdpdGggcmFkaW8gYnV0dG9ucy4KKworICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2Nv bW1pdC1sb2ctdmlld2VyLmpzOgorICAgICAgICAoQ29tbWl0TG9nVmlld2VyKTogQWRkZWQgX3No b3dSZXBvc2l0b3J5TmFtZSBhcyBhbiBpbnN0YW5jZSB2YXJpYWJsZS4KKyAgICAgICAgKENvbW1p dExvZ1ZpZXdlci5wcm90b3R5cGUuc2V0U2hvd1JlcG9zaXRvcnlOYW1lKTogQWRkZWQuCisgICAg ICAgIChDb21taXRMb2dWaWV3ZXIucHJvdG90eXBlLnJlbmRlcik6IEhpZGUgdGhlIHJlcG9zaXRv cnkgbmFtZSB3aGVuIF9zaG93UmVwb3NpdG9yeU5hbWUgaXMgZmFsc2UuIFRoaXMKKyAgICAgICAg aXMgdXNlZCBpbiB0aGUgbmV3bHkgYWRkZWQgY29tbWl0IGxvZyB2aWV3ZXIgZm9yIHRoZSBhbmFs eXNpcyByZXN1bHRzIHNpbmNlIHdlJ3JlIHNob3dpbmcgYSBzZWxlY3QKKyAgICAgICAgZWxlbWVu dCB3aXRoIGFsbCB0aGUgbmFtZXMgb2YgcmVwb3NpdG9yaWVzIGFib3ZlIHRoaXMgY29tcG9uZW50 LgorCisgICAgICAgICogcHVibGljL3YzL2NvbXBvbmVudHMvdGVzdC1ncm91cC1yZXZpc2lvbi10 YWJsZS5qczoKKyAgICAgICAgKFRlc3RHcm91cFJldmlzaW9uVGFibGUucHJvdG90eXBlLl9idWls ZENvbW1pdENlbGwpOiBMaW5raWZ5IHRoZSByZXZpc2lvbnMgaWYgcG9zc2libGUuCisKKyAgICAg ICAgKiBwdWJsaWMvdjMvbW9kZWxzL2FuYWx5c2lzLXRhc2suanM6CisgICAgICAgIChBbmFseXNp c1Rhc2sucHJvdG90eXBlLmFzc29jaWF0ZUNvbW1pdCk6IFN0cmlwICJyIiBhdCB0aGUgYmVnaW5u aW5nIGZvciBhIFN1YnZlcnNpb24gbGlrZSByMTIzNDUKKyAgICAgICAgc2luY2UgdGhhdCdzIHRo ZSBmb3JtYXQgd2UgdXNlIHRvIHNob3cgdG8gdGhlIHVzZXIuIFRoaXMgbWFrZXMgY29weSAmIHBh c3RlIGVhc2llci4KKworICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9hbmFseXNpcy10YXNrLXBh Z2UuanM6CisgICAgICAgIChBbmFseXNpc1Rhc2tSZXN1bHRzUGFuZSk6IEFkZGVkIGEgYnVuY2gg b2YgbmV3IGluc3RhbmNlIHZhcmlhYmxlcyB0byBzaG93IGFuZCB1cGRhdGUgdGhlIGNvbW1pdCBs b2cKKyAgICAgICAgdmlld2VyIG5leHQgdG8gdGhlIGFuYWx5c2lzIHJlc3VsdHMgdmlld2VyLgor ICAgICAgICAoQW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUucHJvdG90eXBlLnNldFBvaW50cyk6IENy ZWF0ZSB0aGUgbGlzdCBvZiByZXBvc2l0b3JpZXMgdG8gc2hvdyBkZXRhaWxzLgorICAgICAgICAo QW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUucHJvdG90eXBlLmRpZENvbnN0cnVjdFNoYWRvd1RyZWUp OiBSZS1yZW5kZXIgd2hlbiB0aGUgY3VycmVudCBzZWxlY3RlZCB0ZXN0CisgICAgICAgIGdyb3Vw IGNoYW5nZXMgc2luY2UgdGhhdCBtYXkgaGF2ZSB1cGRhdGVkIHRoZSBzZWxlY3RlZCByYW5nZSBm b3IgQS9CIHRlc3RpbmcuIEFsc28gcmUtcmVuZGVyIHdoZW4KKyAgICAgICAgYSBuZXcgcmVwb3Np dG9yeSBpcyBzZWxlY3RlZCB0byBzaG93IGRldGFpbHMuCisgICAgICAgIChBbmFseXNpc1Rhc2tS ZXN1bHRzUGFuZS5wcm90b3R5cGUucmVuZGVyKTogVXBkYXRlIHRoZSBsaXN0IG9mIHJlcG9zaXRv cmllcyBhbmQgdGhlIGNvbW1pdCBsb2cgdmlld2VyLgorICAgICAgICAoQW5hbHlzaXNUYXNrUmVz dWx0c1BhbmUucHJvdG90eXBlLl9yZW5kZXJSZXBvc2l0b3J5TGlzdCk6IFJlbmRlcnMgdGhlIGxp c3Qgb2YgcmVwb3NpdG9yaWVzLgorICAgICAgICAoQW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUucHJv dG90eXBlLl91cGRhdGVDb21taXRWaWV3ZXIpOiBVcGRhdGVzIHRoZSBjb21taXQgbG9nIHZpZXdl ciBnaXZlbiB0aGUgcmFuZ2UKKyAgICAgICAgc2VsZWN0ZWQgaW4gdGhlIGFuYWx5c2lzIHJlc3Vs dHMgdmlld2VyLgorICAgICAgICAoQW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUuaHRtbFRlbXBsYXRl KTogVXBkYXRlZCB0aGUgdGVtcGxhdGUuCisgICAgICAgIChBbmFseXNpc1Rhc2tSZXN1bHRzUGFu ZS5jc3NUZW1wbGF0ZSk6IERpdHRvLgorICAgICAgICAoQW5hbHlzaXNUYXNrVGVzdEdyb3VwUGFu ZS5jc3NUZW1wbGF0ZSk6IEFkZCBhIGxpdHRsZSBzcGFjZSBiZXR3ZWVuIHRoZSBsaXN0IG9mIHJl c3VsdHMgYW5kIHRoZSB0YWJsZQorICAgICAgICBvZiBBL0IgdGVzdGluZyBqb2JzIHdpdGggcmV2 aXNpb25zLgorICAgICAgICAoQW5hbHlzaXNUYXNrUGFnZS5wcm90b3R5cGUucmVuZGVyKTogRml4 ZWQgdGhlIGJ1ZyB0aGF0IHRoZSBsaXN0IG9mIGNvbW1pdHMgYXNzb2NpYXRlZCB3aXRoIHRoZSB0 YXNrCisgICAgICAgIGlzIG5vdCB1cGRhdGVkIHdoZW4gdGhlIGxpc3QgY2hhbmdlcyB0aGUgdGFz ayBvciB0aGUgc3RhcnQgcG9pbnQgbmV2ZXIgY2hhbmdlZCB3aGVuIHRoZSBsaXN0IG9mIGNvbW1p dHMKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSB0YXNrIGNoYW5nZWQuIE1ha2UgdGhlIGxh emlseSBldmFsdWF0ZWQgZnVuY3Rpb24gY29tcGFyZSB0aGUgYWN0dWFsIGxpc3Qgb2YgY29tbWl0 cworICAgICAgICBzbyB0aGF0IGl0IHdpbGwgaW52b2tlIF9yZW5kZXJDYXVzZUFuZEZpeGVzIHdo ZW4gdGhlIGxpc3QgY2hhbmdlcy4KKyAgICAgICAgKEFuYWx5c2lzVGFza1BhZ2UucHJvdG90eXBl Ll9yZW5kZXJDYXVzZUFuZEZpeGVzKTogTm93IHJlbmRlcnMgYSBzcGVjaWZpYyBsaXN0LgorCiAy MDE3LTA1LTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFu b3RoZXIgYnVpbGQgZml4LiBBZGRlZCBhIG1pc3NpbmcgbnVsbCBjaGVjay4KZGlmZiAtLWdpdCBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9hbmFseXNpcy1y ZXN1bHRzLXZpZXdlci5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29t cG9uZW50cy9hbmFseXNpcy1yZXN1bHRzLXZpZXdlci5qcwppbmRleCBlM2M0MzE0YjcyYzAyODA2 Y2QzYTAwM2NlYjRhMGMwZGMwNTM1MWRmLi5kNzJjNWU1OWY4Njg1ODkyNTEwNTJhZmZhM2U1YWVk NTdlODI1NTcxIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yz L2NvbXBvbmVudHMvYW5hbHlzaXMtcmVzdWx0cy12aWV3ZXIuanMKKysrIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL2FuYWx5c2lzLXJlc3VsdHMtdmlld2Vy LmpzCkBAIC0xMiw2ICsxMiw3IEBAIGNsYXNzIEFuYWx5c2lzUmVzdWx0c1ZpZXdlciBleHRlbmRz IFJlc3VsdHNUYWJsZSB7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkUmFuZ2UgPSB7fTsKICAgICAg ICAgdGhpcy5fZXhwYW5kZWRQb2ludHMgPSBuZXcgU2V0OwogICAgICAgICB0aGlzLl9ncm91cFRv Q2VsbE1hcCA9IG5ldyBNYXA7CisgICAgICAgIHRoaXMuX3NlbGVjdG9yUmFkaW9CdXR0b25MaXN0 ID0ge307CiAKICAgICAgICAgdGhpcy5fcmVuZGVyVGVzdEdyb3Vwc0xhemlseSA9IG5ldyBMYXpp bHlFdmFsdWF0ZWRGdW5jdGlvbih0aGlzLnJlbmRlclRlc3RHcm91cHMuYmluZCh0aGlzKSk7CiAg ICAgfQpAQCAtMzQsNiArMzUsMTMgQEAgY2xhc3MgQW5hbHlzaXNSZXN1bHRzVmlld2VyIGV4dGVu ZHMgUmVzdWx0c1RhYmxlIHsKICAgICB7CiAgICAgICAgIHRoaXMuX3Rlc3RHcm91cHMgPSB0ZXN0 R3JvdXBzOwogICAgICAgICB0aGlzLl9jdXJyZW50VGVzdEdyb3VwID0gY3VycmVudFRlc3RHcm91 cDsKKyAgICAgICAgaWYgKGN1cnJlbnRUZXN0R3JvdXAgJiYgdGhpcy5fcmFuZ2VTZWxlY3Rvckxh YmVscy5sZW5ndGgpIHsKKyAgICAgICAgICAgIGNvbnN0IGNvbW1pdFNldHMgPSBjdXJyZW50VGVz dEdyb3VwLnJlcXVlc3RlZENvbW1pdFNldHMoKTsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVk UmFuZ2UgPSB7CisgICAgICAgICAgICAgICAgW3RoaXMuX3JhbmdlU2VsZWN0b3JMYWJlbHNbMF1d OiBjb21taXRTZXRzWzBdLAorICAgICAgICAgICAgICAgIFt0aGlzLl9yYW5nZVNlbGVjdG9yTGFi ZWxzWzFdXTogY29tbWl0U2V0c1sxXQorICAgICAgICAgICAgfTsKKyAgICAgICAgfQogICAgICAg ICB0aGlzLmVucXVldWVUb1JlbmRlcigpOwogICAgIH0KIApAQCAtNTIsNiArNjAsMTUgQEAgY2xh c3MgQW5hbHlzaXNSZXN1bHRzVmlld2VyIGV4dGVuZHMgUmVzdWx0c1RhYmxlIHsKICAgICAgICAg dGhpcy5fcmVuZGVyVGVzdEdyb3Vwc0xhemlseS5ldmFsdWF0ZSh0aGlzLl90ZXN0R3JvdXBzLAog ICAgICAgICAgICAgdGhpcy5fc3RhcnRQb2ludCwgdGhpcy5fZW5kUG9pbnQsIHRoaXMuX21ldHJp YywgdGhpcy5fYW5hbHlzaXNSZXN1bHRzVmlldywgdGhpcy5fZXhwYW5kZWRQb2ludHMpOwogCisg ICAgICAgIGZvciAoY29uc3QgbGFiZWwgb2YgdGhpcy5fcmFuZ2VTZWxlY3RvckxhYmVscykgewor ICAgICAgICAgICAgY29uc3QgY29tbWl0U2V0ID0gdGhpcy5fc2VsZWN0ZWRSYW5nZVtsYWJlbF07 CisgICAgICAgICAgICBjb25zdCBsaXN0ID0gdGhpcy5fc2VsZWN0b3JSYWRpb0J1dHRvbkxpc3Rb bGFiZWxdIHx8IFtdOworICAgICAgICAgICAgZm9yIChjb25zdCBpdGVtIG9mIGxpc3QpIHsKKyAg ICAgICAgICAgICAgICBpZiAoaXRlbS5jb21taXRTZXQuZXF1YWxzKGNvbW1pdFNldCkpCisgICAg ICAgICAgICAgICAgICAgIGl0ZW0ucmFkaW8uY2hlY2tlZCA9IHRydWU7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKwogICAgICAgICBjb25zdCBzZWxlY3RlZENlbGwgPSB0aGlzLmNvbnRlbnQo KS5xdWVyeVNlbGVjdG9yKCd0ZC5zZWxlY3RlZCcpOwogICAgICAgICBpZiAoc2VsZWN0ZWRDZWxs KQogICAgICAgICAgICAgc2VsZWN0ZWRDZWxsLmNsYXNzTGlzdC5yZW1vdmUoJ3NlbGVjdGVkJyk7 CkBAIC05OCw2ICsxMTUsOSBAQCBjbGFzcyBBbmFseXNpc1Jlc3VsdHNWaWV3ZXIgZXh0ZW5kcyBS ZXN1bHRzVGFibGUgewogCiAgICAgICAgIGNvbnN0IFthZGRpdGlvbmFsQ29sdW1uc0J5Um93LCBj b2x1bW5Db3VudF0gPSBBbmFseXNpc1Jlc3VsdHNWaWV3ZXIuX2xheW91dEJsb2Nrcyhyb3dzLmxl bmd0aCwgdGVzdEdyb3Vwcy5tYXAoKGdyb3VwKSA9PiB0ZXN0R3JvdXBMYXlvdXRNYXAuZ2V0KGdy b3VwKSkpOwogCisgICAgICAgIGZvciAoY29uc3QgbGFiZWwgb2YgdGhpcy5fcmFuZ2VTZWxlY3Rv ckxhYmVscykKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yUmFkaW9CdXR0b25MaXN0W2xhYmVs XSA9IFtdOworCiAgICAgICAgIGNvbnN0IGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUVs ZW1lbnQ7CiAgICAgICAgIGNvbnN0IGJ1aWxkSGVhZGVycyA9IChoZWFkZXJzKSA9PiB7CiAgICAg ICAgICAgICByZXR1cm4gWwpAQCAtMTExLDEyICsxMzEsMTIgQEAgY2xhc3MgQW5hbHlzaXNSZXN1 bHRzVmlld2VyIGV4dGVuZHMgUmVzdWx0c1RhYmxlIHsKICAgICAgICAgICAgICAgICB0aGlzLl9y YW5nZVNlbGVjdG9yTGFiZWxzLm1hcCgobGFiZWwpID0+IHsKICAgICAgICAgICAgICAgICAgICAg aWYgKCFyb3cuY29tbWl0U2V0KCkpCiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZWxl bWVudCgndGQnLCAnJyk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoZWNrZWQgPSB0aGlz Ll9zZWxlY3RlZFJhbmdlW2xhYmVsXSA9PSByb3cuY29tbWl0U2V0KCk7Ci0gICAgICAgICAgICAg ICAgICAgIGNvbnN0IG9uY2hhbmdlID0gKCkgPT4geworICAgICAgICAgICAgICAgICAgICBjb25z dCByYWRpbyA9IGVsZW1lbnQoJ2lucHV0Jywge3R5cGU6ICdyYWRpbycsIG5hbWU6IGxhYmVsLCBv bmNoYW5nZTogKCkgPT4gewogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRS YW5nZVtsYWJlbF0gPSByb3cuY29tbWl0U2V0KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB0 aGlzLmRpc3BhdGNoQWN0aW9uKCdyYW5nZVNlbGVjdG9yQ2xpY2snLCBsYWJlbCwgcm93KTsKLSAg ICAgICAgICAgICAgICAgICAgfTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQo J3RkJywgZWxlbWVudCgnaW5wdXQnLCB7dHlwZTogJ3JhZGlvJywgbmFtZTogbGFiZWwsIGNoZWNr ZWQsIG9uY2hhbmdlfSkpOworICAgICAgICAgICAgICAgICAgICB9fSk7CisgICAgICAgICAgICAg ICAgICAgIHRoaXMuX3NlbGVjdG9yUmFkaW9CdXR0b25MaXN0W2xhYmVsXS5wdXNoKHtyYWRpbywg Y29tbWl0U2V0OiByb3cuY29tbWl0U2V0KCl9KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGVsZW1lbnQoJ3RkJywgcmFkaW8pOwogICAgICAgICAgICAgICAgIH0pLAogICAgICAgICAgICAg ICAgIGNvbHVtbnMsCiAgICAgICAgICAgICAgICAgYWRkaXRpb25hbENvbHVtbnNCeVJvd1tyb3dJ bmRleF0sCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2Nv bXBvbmVudHMvY29tbWl0LWxvZy12aWV3ZXIuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv cHVibGljL3YzL2NvbXBvbmVudHMvY29tbWl0LWxvZy12aWV3ZXIuanMKaW5kZXggODFhNmUxNjRj OTcxYTYwMWYxM2IyMDYyNDBjYjkwMTgyZTIxOGI3ZC4uNGM3NmUyMTE5MGJiMjg5YmUyOWY0OWQ3 YWFiNGIzOTQyZWI5MzE1YSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9jb21wb25lbnRzL2NvbW1pdC1sb2ctdmlld2VyLmpzCisrKyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9jb21taXQtbG9nLXZpZXdlci5qcwpA QCAtOSw2ICs5LDEzIEBAIGNsYXNzIENvbW1pdExvZ1ZpZXdlciBleHRlbmRzIENvbXBvbmVudEJh c2UgewogICAgICAgICB0aGlzLl9mZXRjaGluZ1Byb21pc2UgPSBudWxsOwogICAgICAgICB0aGlz Ll9jb21taXRzID0gbnVsbDsKICAgICAgICAgdGhpcy5fcmVuZGVyQ29tbWl0TGlzdExhemlseSA9 IG5ldyBMYXppbHlFdmFsdWF0ZWRGdW5jdGlvbih0aGlzLl9yZW5kZXJDb21taXRMaXN0LmJpbmQo dGhpcykpOworICAgICAgICB0aGlzLl9zaG93UmVwb3NpdG9yeU5hbWUgPSB0cnVlOworICAgIH0K KworICAgIHNldFNob3dSZXBvc2l0b3J5TmFtZShzaG91bGRTaG93KQorICAgIHsKKyAgICAgICAg dGhpcy5fc2hvd1JlcG9zaXRvcnlOYW1lID0gc2hvdWxkU2hvdzsKKyAgICAgICAgdGhpcy5lbnF1 ZXVlVG9SZW5kZXIoKTsKICAgICB9CiAKICAgICB2aWV3KHJlcG9zaXRvcnksIHByZWNlZGluZ1Jl dmlzaW9uLCBsYXN0UmV2aXNpb24pCkBAIC01NSw3ICs2Miw3IEBAIGNsYXNzIENvbW1pdExvZ1Zp ZXdlciBleHRlbmRzIENvbXBvbmVudEJhc2UgewogCiAgICAgcmVuZGVyKCkKICAgICB7Ci0gICAg ICAgIGNvbnN0IHNob3VsZFNob3dSZXBvc2l0b3J5TmFtZSA9IHRoaXMuX3JlcG9zaXRvcnkgJiYg KHRoaXMuX2NvbW1pdHMgfHwgdGhpcy5fZmV0Y2hpbmdQcm9taXNlKTsKKyAgICAgICAgY29uc3Qg c2hvdWxkU2hvd1JlcG9zaXRvcnlOYW1lID0gdGhpcy5fcmVwb3NpdG9yeSAmJiAodGhpcy5fY29t bWl0cyB8fCB0aGlzLl9mZXRjaGluZ1Byb21pc2UpICYmIHRoaXMuX3Nob3dSZXBvc2l0b3J5TmFt ZTsKICAgICAgICAgdGhpcy5jb250ZW50KCdyZXBvc2l0b3J5LW5hbWUnKS50ZXh0Q29udGVudCA9 IHNob3VsZFNob3dSZXBvc2l0b3J5TmFtZSA/IHRoaXMuX3JlcG9zaXRvcnkubmFtZSgpIDogJyc7 CiAgICAgICAgIHRoaXMuY29udGVudCgnc3Bpbm5lci1jb250YWluZXInKS5zdHlsZS5kaXNwbGF5 ID0gdGhpcy5fZmV0Y2hpbmdQcm9taXNlID8gbnVsbCA6ICdub25lJzsKICAgICAgICAgdGhpcy5f cmVuZGVyQ29tbWl0TGlzdExhemlseS5ldmFsdWF0ZSh0aGlzLl9jb21taXRzKTsKZGlmZiAtLWdp dCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy90ZXN0LWdy b3VwLXJldmlzaW9uLXRhYmxlLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9jb21wb25lbnRzL3Rlc3QtZ3JvdXAtcmV2aXNpb24tdGFibGUuanMKaW5kZXggYzc1OWM5Nzky ZGU5NDQ0NjIwYTM2ZTk2MDdlZGJjNTk0M2IyZDk4ZS4uODUzMWRlYzllMzU4ZTY3MDQwOGJhMTFk ODQ2YmM2ZTdmYmVkNjM3ZCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9jb21wb25lbnRzL3Rlc3QtZ3JvdXAtcmV2aXNpb24tdGFibGUuanMKKysrIGIvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL3Rlc3QtZ3JvdXAtcmV2 aXNpb24tdGFibGUuanMKQEAgLTk5LDEwICs5OSwxOSBAQCBjbGFzcyBUZXN0R3JvdXBSZXZpc2lv blRhYmxlIGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7CiAKICAgICBfYnVpbGRDb21taXRDZWxsKGVu dHJ5LCByZXBvc2l0b3J5KQogICAgIHsKKyAgICAgICAgY29uc3QgZWxlbWVudCA9IENvbXBvbmVu dEJhc2UuY3JlYXRlRWxlbWVudDsKKyAgICAgICAgY29uc3QgbGluayA9IENvbXBvbmVudEJhc2Uu Y3JlYXRlTGluazsKKwogICAgICAgICBpZiAoZW50cnkucmVwb3NpdG9yaWVzVG9Ta2lwLmhhcyhy ZXBvc2l0b3J5KSkKICAgICAgICAgICAgIHJldHVybiBbXTsKICAgICAgICAgY29uc3QgY29tbWl0 ID0gZW50cnkuY29tbWl0U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7Ci0gICAg ICAgIHJldHVybiBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQoJ3RkJywge3Jvd3NwYW46IGVu dHJ5LnJvd0NvdW50QnlSZXBvc2l0b3J5LmdldChyZXBvc2l0b3J5KX0sIGNvbW1pdCA/IGNvbW1p dC5sYWJlbCgpIDogJycpOworICAgICAgICBsZXQgY29udGVudCA9ICcnOworICAgICAgICBpZiAo Y29tbWl0KSB7CisgICAgICAgICAgICBjb250ZW50ID0gY29tbWl0LmxhYmVsKCk7CisgICAgICAg ICAgICBpZiAoY29tbWl0LnVybCgpKQorICAgICAgICAgICAgICAgIGNvbnRlbnQgPSBsaW5rKGNv bnRlbnQsIGNvbW1pdC51cmwoKSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGVsZW1lbnQo J3RkJywge3Jvd3NwYW46IGVudHJ5LnJvd0NvdW50QnlSZXBvc2l0b3J5LmdldChyZXBvc2l0b3J5 KX0sIGNvbnRlbnQpOwogICAgIH0KIAogICAgIF9idWlsZEN1c3RvbVJvb3RzQ2VsbChlbnRyeSkK ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL2Fu YWx5c2lzLXRhc2suanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21vZGVs cy9hbmFseXNpcy10YXNrLmpzCmluZGV4IGIyOTNjNGJjZGEzMjVhNmJiZjIzZjZmZTU4OWZiOWRk ODdiNGIyZTguLjU3NGZhN2U5NzE3MTczZWQxOTE0OWZkMzNlNmQ5NzRhMWM5MmIxNmQgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL2FuYWx5c2lz LXRhc2suanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMv YW5hbHlzaXMtdGFzay5qcwpAQCAtMTI2LDE0ICsxMjYsMTYgQEAgY2xhc3MgQW5hbHlzaXNUYXNr IGV4dGVuZHMgTGFiZWxlZE9iamVjdCB7CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChr aW5kID09ICdjYXVzZScgfHwga2luZCA9PSAnZml4Jyk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHJlcG9zaXRvcnkgaW5zdGFuY2VvZiBSZXBvc2l0b3J5KTsKLSAgICAgICAgdmFyIGlkID0gdGhp cy5pZCgpOworICAgICAgICBpZiAocmV2aXNpb24uc3RhcnRzV2l0aCgncicpKQorICAgICAgICAg ICAgcmV2aXNpb24gPSByZXZpc2lvbi5zdWJzdHJpbmcoMSk7CisgICAgICAgIGNvbnN0IGlkID0g dGhpcy5pZCgpOwogICAgICAgICByZXR1cm4gUHJpdmlsZWdlZEFQSS5zZW5kUmVxdWVzdCgnYXNz b2NpYXRlLWNvbW1pdCcsIHsKICAgICAgICAgICAgIHRhc2s6IGlkLAogICAgICAgICAgICAgcmVw b3NpdG9yeTogcmVwb3NpdG9yeS5pZCgpLAogICAgICAgICAgICAgcmV2aXNpb246IHJldmlzaW9u LAogICAgICAgICAgICAga2luZDoga2luZCwKLSAgICAgICAgfSkudGhlbihmdW5jdGlvbiAoZGF0 YSkgewotICAgICAgICAgICAgcmV0dXJuIEFuYWx5c2lzVGFzay5jYWNoZWRGZXRjaCgnL2FwaS9h bmFseXNpcy10YXNrcycsIHtpZDogaWR9LCB0cnVlKQorICAgICAgICB9KS50aGVuKChkYXRhKSA9 PiB7CisgICAgICAgICAgICByZXR1cm4gQW5hbHlzaXNUYXNrLmNhY2hlZEZldGNoKCcvYXBpL2Fu YWx5c2lzLXRhc2tzJywge2lkfSwgdHJ1ZSkKICAgICAgICAgICAgICAgICAudGhlbihBbmFseXNp c1Rhc2suX2NvbnN0cnVjdEFuYWx5c2lzVGFza3NGcm9tUmF3RGF0YS5iaW5kKEFuYWx5c2lzVGFz aykpOwogICAgICAgICB9KTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvcHVibGljL3YzL3BhZ2VzL2FuYWx5c2lzLXRhc2stcGFnZS5qcyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpzCmluZGV4 IDQ0YTkyZmIxMTk3NmU0NzdmNDZlNmEzYTE5OTI2MWI0YjAyYmZkYTQuLmMzZGM3NTQwNGRjNDAx OTMzMzljZmU5MGFjNjVmMzRmNDQ0NGM4OTggMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpzCisrKyBiL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpz CkBAIC02MSwxMSArNjEsMTUgQEAgY2xhc3MgQW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUgZXh0ZW5k cyBDb21wb25lbnRCYXNlIHsKICAgICB7CiAgICAgICAgIHN1cGVyKCdhbmFseXNpcy10YXNrLXJl c3VsdHMtcGFuZScpOwogICAgICAgICB0aGlzLl9zaG93Rm9ybSA9IGZhbHNlOworICAgICAgICB0 aGlzLl9yZXBvc2l0b3J5TGlzdCA9IFtdOworICAgICAgICB0aGlzLl9yZW5kZXJSZXBvc2l0b3J5 TGlzdExhemlseSA9IG5ldyBMYXppbHlFdmFsdWF0ZWRGdW5jdGlvbih0aGlzLl9yZW5kZXJSZXBv c2l0b3J5TGlzdC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ29tbWl0Vmlld2Vy TGF6aWx5ID0gbmV3IExhemlseUV2YWx1YXRlZEZ1bmN0aW9uKHRoaXMuX3VwZGF0ZUNvbW1pdFZp ZXdlci5iaW5kKHRoaXMpKTsKICAgICB9CiAKICAgICBzZXRQb2ludHMoc3RhcnRQb2ludCwgZW5k UG9pbnQsIG1ldHJpYykKICAgICB7CiAgICAgICAgIGNvbnN0IHJlc3VsdHNWaWV3ZXIgPSB0aGlz LnBhcnQoJ3Jlc3VsdHMtdmlld2VyJyk7CisgICAgICAgIHRoaXMuX3JlcG9zaXRvcnlMaXN0ID0g c3RhcnRQb2ludCA/IFJlcG9zaXRvcnkuc29ydEJ5TmFtZVByZWZlcnJpbmdPbmVzV2l0aFVSTChz dGFydFBvaW50LmNvbW1pdFNldCgpLnJlcG9zaXRvcmllcygpKSA6IFtdOwogICAgICAgICByZXN1 bHRzVmlld2VyLnNldFBvaW50cyhzdGFydFBvaW50LCBlbmRQb2ludCwgbWV0cmljKTsKICAgICAg ICAgcmVzdWx0c1ZpZXdlci5lbnF1ZXVlVG9SZW5kZXIoKTsKICAgICB9CkBAIC05MSwxMCArOTUs MTcgQEAgY2xhc3MgQW5hbHlzaXNUYXNrUmVzdWx0c1BhbmUgZXh0ZW5kcyBDb21wb25lbnRCYXNl IHsKICAgICBkaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKCkKICAgICB7CiAgICAgICAgIGNvbnN0IHJl c3VsdHNWaWV3ZXIgPSB0aGlzLnBhcnQoJ3Jlc3VsdHMtdmlld2VyJyk7Ci0gICAgICAgIHJlc3Vs dHNWaWV3ZXIubGlzdGVuVG9BY3Rpb24oJ3Rlc3RHcm91cENsaWNrJywgKHRlc3RHcm91cCkgPT4g dGhpcy5kaXNwYXRjaEFjdGlvbignc2hvd1Rlc3RHcm91cCcsIHRlc3RHcm91cCkpOworICAgICAg ICByZXN1bHRzVmlld2VyLmxpc3RlblRvQWN0aW9uKCd0ZXN0R3JvdXBDbGljaycsICh0ZXN0R3Jv dXApID0+IHsKKyAgICAgICAgICAgIHRoaXMuZW5xdWV1ZVRvUmVuZGVyKCk7CisgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoQWN0aW9uKCdzaG93VGVzdEdyb3VwJywgdGVzdEdyb3VwKQorICAgICAg ICB9KTsKICAgICAgICAgcmVzdWx0c1ZpZXdlci5zZXRSYW5nZVNlbGVjdG9yTGFiZWxzKFsnQScs ICdCJ10pOwogICAgICAgICByZXN1bHRzVmlld2VyLmxpc3RlblRvQWN0aW9uKCdyYW5nZVNlbGVj dG9yQ2xpY2snLCAoKSA9PiB0aGlzLmVucXVldWVUb1JlbmRlcigpKTsKIAorICAgICAgICBjb25z dCByZXBvc2l0b3J5UGlja2VyID0gdGhpcy5jb250ZW50KCdjb21taXQtdmlld2VyLXJlcG9zaXRv cnknKTsKKyAgICAgICAgcmVwb3NpdG9yeVBpY2tlci5hZGRFdmVudExpc3RlbmVyKCdjaGFuZ2Un LCAoKSA9PiB0aGlzLmVucXVldWVUb1JlbmRlcigpKTsKKyAgICAgICAgdGhpcy5wYXJ0KCdjb21t aXQtdmlld2VyJykuc2V0U2hvd1JlcG9zaXRvcnlOYW1lKGZhbHNlKTsKKwogICAgICAgICB0aGlz LnBhcnQoJ2Zvcm0nKS5saXN0ZW5Ub0FjdGlvbignc3RhcnRUZXN0aW5nJywgKHJlcGV0aXRpb25D b3VudCwgbmFtZSwgY29tbWl0U2V0TWFwKSA9PiB7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo QWN0aW9uKCduZXdUZXN0R3JvdXAnLCBuYW1lLCByZXBldGl0aW9uQ291bnQsIGNvbW1pdFNldE1h cCk7CiAgICAgICAgIH0pOwpAQCAtMTAyLDcgKzExMywxMiBAQCBjbGFzcyBBbmFseXNpc1Rhc2tS ZXN1bHRzUGFuZSBleHRlbmRzIENvbXBvbmVudEJhc2UgewogCiAgICAgcmVuZGVyKCkKICAgICB7 Ci0gICAgICAgIHRoaXMucGFydCgncmVzdWx0cy12aWV3ZXInKS5lbnF1ZXVlVG9SZW5kZXIoKTsK KyAgICAgICAgY29uc3QgcmVzdWx0c1ZpZXdlciA9IHRoaXMucGFydCgncmVzdWx0cy12aWV3ZXIn KTsKKworICAgICAgICBjb25zdCByZXBvc2l0b3J5UGlja2VyID0gdGhpcy5fcmVuZGVyUmVwb3Np dG9yeUxpc3RMYXppbHkuZXZhbHVhdGUodGhpcy5fcmVwb3NpdG9yeUxpc3QpOworICAgICAgICBj b25zdCByZXBvc2l0b3J5ID0gUmVwb3NpdG9yeS5maW5kQnlJZChyZXBvc2l0b3J5UGlja2VyLnZh bHVlKTsKKyAgICAgICAgY29uc3QgcmFuZ2UgPSByZXN1bHRzVmlld2VyLnNlbGVjdGVkUmFuZ2Uo KTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ29tbWl0Vmlld2VyTGF6aWx5LmV2YWx1YXRlKHJlcG9z aXRvcnksIHJhbmdlWydBJ10sIHJhbmdlWydCJ10pOwogCiAgICAgICAgIHRoaXMuY29udGVudCgn Zm9ybScpLnN0eWxlLmRpc3BsYXkgPSB0aGlzLl9zaG93Rm9ybSA/IG51bGwgOiAnbm9uZSc7CiAg ICAgICAgIGlmICghdGhpcy5fc2hvd0Zvcm0pCkBAIC0xMTYsMTQgKzEzMiw1OCBAQCBjbGFzcyBB bmFseXNpc1Rhc2tSZXN1bHRzUGFuZSBleHRlbmRzIENvbXBvbmVudEJhc2UgewogICAgICAgICBm b3JtLmVucXVldWVUb1JlbmRlcigpOwogICAgIH0KIAorICAgIF9yZW5kZXJSZXBvc2l0b3J5TGlz dChyZXBvc2l0b3J5TGlzdCkKKyAgICB7CisgICAgICAgIGNvbnN0IGVsZW1lbnQgPSBDb21wb25l bnRCYXNlLmNyZWF0ZUVsZW1lbnQ7CisgICAgICAgIGNvbnN0IHNlbGVjdEVsZW1lbnQgPSB0aGlz LmNvbnRlbnQoJ2NvbW1pdC12aWV3ZXItcmVwb3NpdG9yeScpOworICAgICAgICB0aGlzLnJlbmRl clJlcGxhY2Uoc2VsZWN0RWxlbWVudCwKKyAgICAgICAgICAgIHJlcG9zaXRvcnlMaXN0Lm1hcCgo cmVwb3NpdG9yeSkgPT4geworICAgICAgICAgICAgICAgIHJldHVybiBlbGVtZW50KCdvcHRpb24n LCB7dmFsdWU6IHJlcG9zaXRvcnkuaWQoKX0sIHJlcG9zaXRvcnkubGFiZWwoKSk7CisgICAgICAg ICAgICB9KSk7CisgICAgICAgIHJldHVybiBzZWxlY3RFbGVtZW50OworICAgIH0KKworICAgIF91 cGRhdGVDb21taXRWaWV3ZXIocmVwb3NpdG9yeSwgcHJlY2VlZGluZ0NvbW1pdFNldCwgbGFzdENv bW1pdFNldCkKKyAgICB7CisgICAgICAgIGlmIChyZXBvc2l0b3J5ICYmIHByZWNlZWRpbmdDb21t aXRTZXQgJiYgbGFzdENvbW1pdFNldCAmJiAhcHJlY2VlZGluZ0NvbW1pdFNldC5lcXVhbHMobGFz dENvbW1pdFNldCkpIHsKKyAgICAgICAgICAgIGNvbnN0IHByZWNlZGluZ1JldmlzaW9uID0gcHJl Y2VlZGluZ0NvbW1pdFNldC5yZXZpc2lvbkZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7CisgICAg ICAgICAgICBjb25zdCBsYXN0UmV2aXNpb24gPSBsYXN0Q29tbWl0U2V0LnJldmlzaW9uRm9yUmVw b3NpdG9yeShyZXBvc2l0b3J5KTsKKyAgICAgICAgICAgIGlmIChwcmVjZWRpbmdSZXZpc2lvbiAm JiBsYXN0UmV2aXNpb24gJiYgcHJlY2VkaW5nUmV2aXNpb24gIT0gbGFzdFJldmlzaW9uKSB7Cisg ICAgICAgICAgICAgICAgdGhpcy5wYXJ0KCdjb21taXQtdmlld2VyJykudmlldyhyZXBvc2l0b3J5 LCBwcmVjZWRpbmdSZXZpc2lvbiwgbGFzdFJldmlzaW9uKTsKKyAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5wYXJ0KCdjb21taXQt dmlld2VyJykudmlldyhudWxsLCBudWxsLCBudWxsKTsKKyAgICB9CisKICAgICBzdGF0aWMgaHRt bFRlbXBsYXRlKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBgPGFuYWx5c2lzLXJlc3VsdHMtdmll d2VyIGlkPSJyZXN1bHRzLXZpZXdlciI+PC9hbmFseXNpcy1yZXN1bHRzLXZpZXdlcj48Y3VzdG9t aXphYmxlLXRlc3QtZ3JvdXAtZm9ybSBpZD0iZm9ybSI+PC9jdXN0b21pemFibGUtdGVzdC1ncm91 cC1mb3JtPmA7CisgICAgICAgIHJldHVybiBgCisgICAgICAgICAgICA8ZGl2IGlkPSJyZXN1bHRz LWNvbnRhaW5lciI+CisgICAgICAgICAgICAgICAgPGFuYWx5c2lzLXJlc3VsdHMtdmlld2VyIGlk PSJyZXN1bHRzLXZpZXdlciI+PC9hbmFseXNpcy1yZXN1bHRzLXZpZXdlcj4KKyAgICAgICAgICAg ICAgICA8ZGl2IGlkPSJjb21taXQtcGFuZSI+CisgICAgICAgICAgICAgICAgICAgIDxzZWxlY3Qg aWQ9ImNvbW1pdC12aWV3ZXItcmVwb3NpdG9yeSI+PC9zZWxlY3Q+CisgICAgICAgICAgICAgICAg ICAgIDxjb21taXQtbG9nLXZpZXdlciBpZD0iY29tbWl0LXZpZXdlciI+PC9jb21taXQtbG9nLXZp ZXdlcj4KKyAgICAgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAg ICAgICAgPGN1c3RvbWl6YWJsZS10ZXN0LWdyb3VwLWZvcm0gaWQ9ImZvcm0iPjwvY3VzdG9taXph YmxlLXRlc3QtZ3JvdXAtZm9ybT4KKyAgICAgICAgYDsKICAgICB9CiAKICAgICBzdGF0aWMgY3Nz VGVtcGxhdGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIGAKKyAgICAgICAgICAgICNyZXN1bHRz LWNvbnRhaW5lciB7CisgICAgICAgICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAg ICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICNjb21taXQtcGFuZSB7CisgICAgICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAg ICAgICAgICAgICAgIHdpZHRoOiAyMHJlbTsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDEwMCU7 CisgICAgICAgICAgICAgICAgdG9wOiAwOworICAgICAgICAgICAgICAgIHJpZ2h0OiAwOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgI2Zvcm0gewogICAgICAgICAgICAgICAgIG1hcmdpbjog MC41cmVtOwogICAgICAgICAgICAgfQpAQCAtMzU5LDcgKzQxOSw3IEBAIGNsYXNzIEFuYWx5c2lz VGFza1Rlc3RHcm91cFBhbmUgZXh0ZW5kcyBDb21wb25lbnRCYXNlIHsKICAgICAgICAgICAgICN0 ZXN0LWdyb3VwLWRldGFpbHMgewogICAgICAgICAgICAgICAgIGRpc3BsYXk6IHRhYmxlLWNlbGw7 CiAgICAgICAgICAgICAgICAgbWFyZ2luLWJvdHRvbTogMXJlbTsKLSAgICAgICAgICAgICAgICBw YWRkaW5nOiAwOworICAgICAgICAgICAgICAgIHBhZGRpbmc6IDAgMC41cmVtOwogICAgICAgICAg ICAgICAgIG1hcmdpbjogMDsKICAgICAgICAgICAgIH0KIApAQCAtNTY0LDcgKzYyNCw4IEBAIGNs YXNzIEFuYWx5c2lzVGFza1BhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICB0 aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuZXJyb3ItbWVzc2FnZScpLnRleHRDb250ZW50 ID0gdGhpcy5fZXJyb3JNZXNzYWdlIHx8ICcnOwogCiAgICAgICAgIHRoaXMuX3JlbmRlclRhc2tO YW1lQW5kU3RhdHVzTGF6aWx5LmV2YWx1YXRlKHRoaXMuX3Rhc2ssIHRoaXMuX3Rhc2sgPyB0aGlz Ll90YXNrLm5hbWUoKSA6IG51bGwsIHRoaXMuX3Rhc2sgPyB0aGlzLl90YXNrLmNoYW5nZVR5cGUo KSA6IG51bGwpOwotICAgICAgICB0aGlzLl9yZW5kZXJDYXVzZUFuZEZpeGVzTGF6aWx5LmV2YWx1 YXRlKHRoaXMuX3N0YXJ0UG9pbnQsIHRoaXMuX3Rhc2spOworICAgICAgICB0aGlzLl9yZW5kZXJD YXVzZUFuZEZpeGVzTGF6aWx5LmV2YWx1YXRlKHRoaXMuX3N0YXJ0UG9pbnQsIHRoaXMuX3Rhc2ss IHRoaXMucGFydCgnY2F1c2UtbGlzdCcpLCB0aGlzLl90YXNrID8gdGhpcy5fdGFzay5jYXVzZXMo KSA6IFtdKTsKKyAgICAgICAgdGhpcy5fcmVuZGVyQ2F1c2VBbmRGaXhlc0xhemlseS5ldmFsdWF0 ZSh0aGlzLl9zdGFydFBvaW50LCB0aGlzLl90YXNrLCB0aGlzLnBhcnQoJ2ZpeC1saXN0JyksIHRo aXMuX3Rhc2sgPyB0aGlzLl90YXNrLmZpeGVzKCkgOiBbXSk7CiAgICAgICAgIHRoaXMuX3JlbmRl clJlbGF0ZWRUYXNrc0xhemlseS5ldmFsdWF0ZSh0aGlzLl90YXNrLCB0aGlzLl9yZWxhdGVkVGFz a3MpOwogCiAgICAgICAgIHRoaXMuY29udGVudCgnY2hhcnQtcGFuZScpLnN0eWxlLmRpc3BsYXkg PSB0aGlzLl90YXNrICYmICF0aGlzLl90YXNrLmlzQ3VzdG9tKCkgPyBudWxsIDogJ25vbmUnOwpA QCAtNjA3LDcgKzY2OCw3IEBAIGNsYXNzIEFuYWx5c2lzVGFza1BhZ2UgZXh0ZW5kcyBQYWdlV2l0 aEhlYWRpbmcgewogICAgICAgICAgICAgfSkpOwogICAgIH0KIAotICAgIF9yZW5kZXJDYXVzZUFu ZEZpeGVzKHN0YXJ0UG9pbnQsIHRhc2spCisgICAgX3JlbmRlckNhdXNlQW5kRml4ZXMoc3RhcnRQ b2ludCwgdGFzaywgbGlzdCwgY29tbWl0cykKICAgICB7CiAgICAgICAgIGNvbnN0IGhhc0RhdGEg PSBzdGFydFBvaW50ICYmIHRhc2s7CiAgICAgICAgIHRoaXMuY29udGVudCgnY2F1c2UtZml4Jyku c3R5bGUuZGlzcGxheSA9IGhhc0RhdGEgPyBudWxsIDogJ25vbmUnOwpAQCAtNjIyLDEzICs2ODMs OCBAQCBjbGFzcyBBbmFseXNpc1Rhc2tQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAg ICAgICAgICAgICAgICAnRGlzYXNzb2NpYXRlIHRoaXMgY29tbWl0JywgdGhpcy5fZGlzc29jaWF0 ZUNvbW1pdC5iaW5kKHRoaXMsIGNvbW1pdCkpOwogICAgICAgICB9CiAKLSAgICAgICAgY29uc3Qg Y2F1c2VMaXN0ID0gdGhpcy5wYXJ0KCdjYXVzZS1saXN0Jyk7Ci0gICAgICAgIGNhdXNlTGlzdC5z ZXRLaW5kTGlzdChyZXBvc2l0b3J5TGlzdCk7Ci0gICAgICAgIGNhdXNlTGlzdC5zZXRMaXN0KHRh c2suY2F1c2VzKCkubWFwKChjb21taXQpID0+IG1ha2VJdGVtKGNvbW1pdCkpKTsKLQotICAgICAg ICBjb25zdCBmaXhMaXN0ID0gdGhpcy5wYXJ0KCdmaXgtbGlzdCcpOwotICAgICAgICBmaXhMaXN0 LnNldEtpbmRMaXN0KHJlcG9zaXRvcnlMaXN0KTsKLSAgICAgICAgZml4TGlzdC5zZXRMaXN0KHRh c2suZml4ZXMoKS5tYXAoKGNvbW1pdCkgPT4gbWFrZUl0ZW0oY29tbWl0KSkpOworICAgICAgICBs aXN0LnNldEtpbmRMaXN0KHJlcG9zaXRvcnlMaXN0KTsKKyAgICAgICAgbGlzdC5zZXRMaXN0KGNv bW1pdHMubWFwKChjb21taXQpID0+IG1ha2VJdGVtKGNvbW1pdCkpKTsKICAgICB9CiAKICAgICBf c2hvd1Rlc3RHcm91cCh0ZXN0R3JvdXApCg==