203527 2019-10-28 15:37:01 -0700 results.webkit.org: Fix tooltip with drawer 2019-10-29 20:15:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue webkit-bug-importer zhifei_fang oldest_to_newest 1584678 0 jbedard 2019-10-28 15:37:01 -0700 Tooltips don't work well on the boundaries when a drawer is opened. 1584691 1 382123 jbedard 2019-10-28 15:49:39 -0700 Created attachment 382123 Patch 1584752 2 zhifei_fang 2019-10-28 16:58:18 -0700 unofficially r=me 1584755 3 382123 aakash_jain 2019-10-28 16:59:24 -0700 Comment on attachment 382123 Patch rs=me 1585216 4 382264 jbedard 2019-10-29 19:07:11 -0700 Created attachment 382264 Patch for landing 1585244 5 382264 commit-queue 2019-10-29 20:14:51 -0700 Comment on attachment 382264 Patch for landing Clearing flags on attachment: 382264 Committed r251763: <https://trac.webkit.org/changeset/251763> 1585245 6 commit-queue 2019-10-29 20:14:52 -0700 All reviewed patches have been landed. Closing bug. 1585248 7 webkit-bug-importer 2019-10-29 20:15:18 -0700 <rdar://problem/56732041> 382123 2019-10-28 15:49:39 -0700 2019-10-29 19:07:08 -0700 Patch bug-203527-20191028154938.patch text/plain 14168 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTY3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDE5LTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZpeCB0b29sdGlwIHdpdGggZHJhd2Vy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1MjcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaW50 ZXJhY3Rpb24gYmV0d2VlbiB0b29sdGlwcyBhbmQgZHJhd2VycyBuZWVkcyBpbXByb3ZlbWVudCwg dG9vbHRpcHMKKyAgICAgICAgYXJlIGluY29uc2lzdGVudGx5IHVuZGVyIHRoZSBkcmF3ZXIsIGRv IG5vdCB0cmVhdCB0aGUgZHJhd2VyIGFzIGEgYm91bmRhcnkuCisKKyAgICAgICAgKiByZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9jc3MvdG9vbHRpcC5jc3M6CisgICAgICAgICgu dG9vbHRpcCk6IFVzZSB0b3BaSW5kZXggdmFyaWFibGUuCisgICAgICAgICogcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAgICAgICh4QXhpc0Zy b21TY2FsZSk6IFBhc3Mgdmlld3BvcnQgdG8gVG9vbFRpcC4KKyAgICAgICAgKFRpbWVsaW5lRnJv bUVuZHBvaW50KTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5 cGUudXBkYXRlKTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5 cGUucmVuZGVyKTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5 cGUucmVuZGVyLm9uRG90RW50ZXJGYWN0b3J5KTogRGl0dG8uCisgICAgICAgICogcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdG9vbHRpcC5qczoKKyAgICAgICAgKF9Ub29s VGlwLnByb3RvdHlwZS50b1N0cmluZyk6IFVzZSBwYXNzZWQgdmlld3BvcnQgaW5zdGVhZCBvZiB0 aGUgZG9jdW1lbnQgc2l6ZS4KKyAgICAgICAgKF9Ub29sVGlwLnByb3RvdHlwZS5zZXRCeUVsZW1l bnQpOiBTZXQgdGhlIHZpZXdwb3J0IGJhc2VkIG9uIHRoZSBwYXNzZWQgdmlld3BvcnQuCisgICAg ICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvc2VhcmNoLmh0bWw6 IERlZmluZSB0aGUgdmlld3BvcnQgYXMgdGhlCisgICAgICAgIGNvbnRlbnQgZWxlbWVudC4KKyAg ICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9zdWl0ZV9yZXN1 bHRzLmh0bWw6IERpdHRvLgorCiAyMDE5LTEwLTI4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBfV0tQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24gU1BJCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92 aWV3L3N0YXRpYy9jc3MvdG9vbHRpcC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvY3NzL3Rvb2x0aXAuY3NzCShyZXZpc2lvbiAyNTE2 NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9jc3MvdG9v bHRpcC5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTI0LDcgKzI0LDcgQEAKICAqLwogIAogLnRvb2x0 aXAgewotICAgIHotaW5kZXg6IDUwOworICAgIHotaW5kZXg6IHZhcigtLXRvcFpJbmRleCk7CiAg ICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIG9wYWNpdHk6IDgwJTsKICAgICB3aWR0aDogMDsK SW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVs aW5lLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcv c3RhdGljL2pzL3RpbWVsaW5lLmpzCShyZXZpc2lvbiAyNTE2NjUpCisrKyBUb29scy9yZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwkod29ya2luZyBjb3B5 KQpAQCAtMTU1LDcgKzE1NSw3IEBAIGZ1bmN0aW9uIHJlcG9zaXRvcmllc0ZvckNvbW1pdHMoY29t bWl0cykKICAgICByZXR1cm4gcmVwb3NpdG9yaWVzOwogfQogCi1mdW5jdGlvbiB4QXhpc0Zyb21T Y2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdXBkYXRlc0FycmF5LCBpc1RvcD1mYWxzZSkKK2Z1bmN0 aW9uIHhBeGlzRnJvbVNjYWxlKHNjYWxlLCByZXBvc2l0b3J5LCB1cGRhdGVzQXJyYXksIGlzVG9w PWZhbHNlLCB2aWV3cG9ydD1udWxsKQogewogICAgIGZ1bmN0aW9uIHNjYWxlRm9yUmVwb3NpdG9y eShzY2FsZSkgewogICAgICAgICByZXR1cm4gc2NhbGUubWFwKG5vZGUgPT4gewpAQCAtMTk3LDYg KzE5Nyw3IEBAIGZ1bmN0aW9uIHhBeGlzRnJvbVNjYWxlKHNjYWxlLCByZXBvc2l0b3IKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHt4OiBjYW52YXMueCArIHBvaW50LngsIHk6IGNhbnZhcy55 ICsgc2Nyb2xsRGVsdGEgKyBwb2ludC55fTsKICAgICAgICAgICAgICAgICB9KSwKICAgICAgICAg ICAgICAgICAoZXZlbnQpID0+IHtyZXR1cm4gb25TY2FsZUNsaWNrKG5vZGUpO30sCisgICAgICAg ICAgICAgICAgdmlld3BvcnQsCiAgICAgICAgICAgICApOwogICAgICAgICB9LAogICAgICAgICBv blNjYWxlTGVhdmU6IChldmVudCwgY2FudmFzKSA9PiB7CkBAIC0zNDIsNyArMzQzLDcgQEAgZnVu Y3Rpb24gY29tYmluZVJlc3VsdHMoKSB7CiB9CiAKIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBvaW50 IHsKLSAgICBjb25zdHJ1Y3RvcihlbmRwb2ludCwgc3VpdGUgPSBudWxsKSB7CisgICAgY29uc3Ry dWN0b3IoZW5kcG9pbnQsIHN1aXRlID0gbnVsbCwgdmlld3BvcnQgPSBudWxsKSB7CiAgICAgICAg IHRoaXMuZW5kcG9pbnQgPSBlbmRwb2ludDsKICAgICAgICAgdGhpcy5kaXNwbGF5QWxsQ29tbWl0 cyA9IHRydWU7CiAKQEAgLTM1NSw2ICszNTYsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2lu dCB7CiAgICAgICAgIHRoaXMudGltZWxpbmVVcGRhdGUgPSBudWxsOwogICAgICAgICB0aGlzLm5v dGlmeVJlcmVuZGVyID0gKCkgPT4ge307CiAgICAgICAgIHRoaXMucmVwb3NpdG9yaWVzID0gW107 CisgICAgICAgIHRoaXMudmlld3BvcnQgPSB2aWV3cG9ydDsKIAogICAgICAgICBjb25zdCBzZWxm ID0gdGhpczsKIApAQCAtMzk4LDcgKzQwMCw3IEBAIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBvaW50 IHsKICAgICAgICAgICAgIGxldCBjb21wb25lbnRzID0gW107CiAKICAgICAgICAgICAgIG5ld1Jl cG9zaXRvcmllcy5mb3JFYWNoKHJlcG9zaXRvcnkgPT4gewotICAgICAgICAgICAgICAgIGNvbXBv bmVudHMucHVzaCh4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdGhpcy54YXhpc1Vw ZGF0ZXMsIHRvcCkpOworICAgICAgICAgICAgICAgIGNvbXBvbmVudHMucHVzaCh4QXhpc0Zyb21T Y2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdGhpcy54YXhpc1VwZGF0ZXMsIHRvcCwgdGhpcy52aWV3 cG9ydCkpOwogICAgICAgICAgICAgICAgIHRvcCA9IGZhbHNlOwogICAgICAgICAgICAgfSk7CiAK QEAgLTU5MSw2ICs1OTMsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAg ICAgICAgICAgICAgIGFncmVnYXRlRGF0YVtrZXldID0gZGF0YVtrZXldOwogICAgICAgICAgICAg ICAgIH0pOwogICAgICAgICAgICAgICAgIGFncmVnYXRlRGF0YVsnY29uZmlndXJhdGlvbiddID0g bmV3IENvbmZpZ3VyYXRpb24ocGFydGlhbENvbmZpZ3VyYXRpb24pOworICAgICAgICAgICAgICAg IFRvb2xUaXAudW5zZXQoKTsKICAgICAgICAgICAgICAgICBJbnZlc3RpZ2F0ZURyYXdlci5leHBh bmQoc2VsZi5zdWl0ZSwgYWdyZWdhdGVEYXRhLCBhbGxEYXRhKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgfQpAQCAtNjU4LDYgKzY2MSw3IEBAIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBvaW50IHsK ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7eDogY2FudmFzLnggKyBwb2ludC54LCB5 OiBjYW52YXMueSArIHNjcm9sbERlbHRhICsgcG9pbnQueX07CiAgICAgICAgICAgICAgICAgICAg IH0pLAogICAgICAgICAgICAgICAgICAgICAoZXZlbnQpID0+IHtvbkRvdENsaWNrRmFjdG9yeShj b25maWd1cmF0aW9uKShkYXRhKTt9LAorICAgICAgICAgICAgICAgICAgICBzZWxmLnZpZXdwb3J0 LAogICAgICAgICAgICAgICAgICk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTc3OCw3 ICs3ODIsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAgIHNlbGYueGF4 aXNVcGRhdGVzID0gW107CiAgICAgICAgIHRoaXMucmVwb3NpdG9yaWVzID0gcmVwb3NpdG9yaWVz Rm9yQ29tbWl0cyhjb21taXRzKTsKICAgICAgICAgdGhpcy5yZXBvc2l0b3JpZXMuZm9yRWFjaChy ZXBvc2l0b3J5ID0+IHsKLSAgICAgICAgICAgIGNvbnN0IHhBeGlzQ29tcG9uZW50ID0geEF4aXNG cm9tU2NhbGUoc2NhbGUsIHJlcG9zaXRvcnksIHNlbGYueGF4aXNVcGRhdGVzLCB0b3ApOworICAg ICAgICAgICAgY29uc3QgeEF4aXNDb21wb25lbnQgPSB4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVw b3NpdG9yeSwgc2VsZi54YXhpc1VwZGF0ZXMsIHRvcCwgc2VsZi52aWV3cG9ydCk7CiAgICAgICAg ICAgICBpZiAodG9wKQogICAgICAgICAgICAgICAgIGNoaWxkcmVuLnVuc2hpZnQoeEF4aXNDb21w b25lbnQpOwogICAgICAgICAgICAgZWxzZQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvdmlldy9zdGF0aWMvanMvdG9vbHRpcC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90b29sdGlwLmpzCShyZXZpc2lvbiAy NTE2NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90 b29sdGlwLmpzCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIF9Ub29sVGlw IHsKICAgICB0b1N0cmluZygpIHsKICAgICAgICAgY29uc3Qgc2VsZiA9IHRoaXM7CiAgICAgICAg IHRoaXMucmVmID0gUkVGLmNyZWF0ZVJlZih7Ci0gICAgICAgICAgICBzdGF0ZToge2NvbnRlbnQ6 IG51bGwsIHBvaW50czogbnVsbH0sCisgICAgICAgICAgICBzdGF0ZToge2NvbnRlbnQ6IG51bGws IHBvaW50czogbnVsbCwgdmlld3BvcnQ6IG51bGx9LAogICAgICAgICAgICAgb25FbGVtZW50TW91 bnQ6IChlbGVtZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCdtb3VzZWxlYXZlJywgKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChl bGVtZW50LnN0eWxlLmRpc3BsYXkgPT09ICdub25lJykKQEAgLTYxLDcgKzYxLDcgQEAgY2xhc3Mg X1Rvb2xUaXAgewogICAgICAgICAgICAgICAgICAgICBET00uaW5qZWN0KGVsZW1lbnQsICcnKTsK ICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnBvaW50 cykgeworICAgICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYucG9pbnRzIHx8IHN0YXRlRGlmZi52 aWV3cG9ydCkgewogICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQgPSAnMHB4 JzsKICAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS50b3AgPSAnMHB4JzsKIApAQCAt NjksOCArNjksNiBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IGxvd2VyUG9pbnQgPSBzdGF0ZURpZmYucG9pbnRzLmxlbmd0aCA+IDEgJiYgc3RhdGVEaWZmLnBv aW50c1sxXS55ID4gc3RhdGVEaWZmLnBvaW50c1swXS55ID8gc3RhdGVEaWZmLnBvaW50c1sxXSA6 IHN0YXRlRGlmZi5wb2ludHNbMF07CiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNjcm9sbERl bHRhID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LnNjcm9sbFRvcCB8fCBkb2N1bWVudC5ib2R5 LnNjcm9sbFRvcDsKICAgICAgICAgICAgICAgICAgICAgY29uc3QgYm91bmRzID0gZWxlbWVudC5n ZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgICAgICAgICAgICAgY29uc3Qgdmlld3Bv cnRXaXRkaCA9IE1hdGgubWF4KGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5jbGllbnRXaWR0aCwg d2luZG93LmlubmVyV2lkdGggfHwgMCk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IHZpZXdw b3J0SGVpZ2h0ID0gTWF0aC5tYXgoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdo dCwgd2luZG93LmlubmVySGVpZ2h0IHx8IDApOwogCiAgICAgICAgICAgICAgICAgICAgIGxldCBk aXJlY3Rpb24gPSAnZG93bic7CiAgICAgICAgICAgICAgICAgICAgIGxldCBwb2ludCA9IHVwcGVy UG9pbnQ7CkBAIC04Myw3ICs4MSw3IEBAIGNsYXNzIF9Ub29sVGlwIHsKICAgICAgICAgICAgICAg ICAgICAgICAgIGRpcmVjdGlvbiA9ICdsZWZ0JzsKICAgICAgICAgICAgICAgICAgICAgICAgIGxl dCB0aXBYID0gbGVmdFBvaW50LnggLSAxMiAtIGJvdW5kcy53aWR0aDsKICAgICAgICAgICAgICAg ICAgICAgICAgIHBvaW50ID0gcmlnaHRQb2ludDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm ICh0aXBYIDwgMCB8fCB0aXBYICsgYm91bmRzLndpZHRoICsgKHJpZ2h0UG9pbnQueCAtIGxlZnRQ b2ludC54KSAvIDIgPCB2aWV3cG9ydFdpdGRoIC8gMikgeworICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHRpcFggPCAwIHx8IHRpcFggKyBib3VuZHMud2lkdGggKyAocmlnaHRQb2ludC54IC0g bGVmdFBvaW50LngpIC8gMiA8IHN0YXRlRGlmZi52aWV3cG9ydC54ICsgc3RhdGVEaWZmLnZpZXdw b3J0LndpZHRoIC8gMikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcmVjdGlvbiA9 ICdyaWdodCc7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWCA9IHJpZ2h0UG9pbnQu eCArIDE2OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvaW50ID0gcmlnaHRQb2ludDsK QEAgLTkxLDggKzg5LDggQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgICAgICAgICAg ICAgZWxlbWVudC5zdHlsZS5sZWZ0ID0gYCR7dGlwWH1weGA7CiAKICAgICAgICAgICAgICAgICAg ICAgICAgIGxldCB0aXBZID0gcG9pbnQueSAtIGJvdW5kcy5oZWlnaHQgLyAyOwotICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKHRpcFkgKyBib3VuZHMuaGVpZ2h0ID4gc2Nyb2xsRGVsdGEgKyB2 aWV3cG9ydEhlaWdodCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aXBZID0gc2Nyb2xs RGVsdGEgKyB2aWV3cG9ydEhlaWdodCAtIGJvdW5kcy5oZWlnaHQ7CisgICAgICAgICAgICAgICAg ICAgICAgICBpZiAodGlwWSArIGJvdW5kcy5oZWlnaHQgPiBzY3JvbGxEZWx0YSArIHN0YXRlRGlm Zi52aWV3cG9ydC55ICsgc3RhdGVEaWZmLnZpZXdwb3J0LmhlaWdodCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB0aXBZID0gc2Nyb2xsRGVsdGEgKyBzdGF0ZURpZmYudmlld3BvcnQueSAr IHN0YXRlRGlmZi52aWV3cG9ydC5oZWlnaHQgLSBib3VuZHMuaGVpZ2h0OwogICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKHRpcFkgPCAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRp cFkgPSAwOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS50b3AgPSBgJHt0 aXBZfXB4YDsKQEAgLTEwMCw3ICs5OCw3IEBAIGNsYXNzIF9Ub29sVGlwIHsKICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIE1ha2UgYW4gZWZmb3J0IHRvIHBsYWNlIHRoZSB0b29sdGlwIGluIHRo ZSBjZW50ZXIgb2YgdGhlIHZpZXdwb3J0LgogICAgICAgICAgICAgICAgICAgICAgICAgbGV0IHRp cFkgPSB1cHBlclBvaW50LnkgLSA4IC0gYm91bmRzLmhlaWdodDsKICAgICAgICAgICAgICAgICAg ICAgICAgIHBvaW50ID0gdXBwZXJQb2ludDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmICh0 aXBZIDwgc2Nyb2xsRGVsdGEgfHwgdGlwWSArIGJvdW5kcy5oZWlnaHQgKyAobG93ZXJQb2ludC55 IC0gdXBwZXJQb2ludC55KSAvIDIgPCBzY3JvbGxEZWx0YSArIHZpZXdwb3J0SGVpZ2h0IC8gMikg eworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHRpcFkgPCBzY3JvbGxEZWx0YSB8fCB0aXBZ ICsgYm91bmRzLmhlaWdodCArIChsb3dlclBvaW50LnkgLSB1cHBlclBvaW50LnkpIC8gMiA8IHNj cm9sbERlbHRhICsgc3RhdGVEaWZmLnZpZXdwb3J0LnkgKyBzdGF0ZURpZmYudmlld3BvcnQuaGVp Z2h0IC8gMikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcmVjdGlvbiA9ICd1cCc7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWSA9IGxvd2VyUG9pbnQueSArIDE2Owog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvaW50ID0gbG93ZXJQb2ludDsKQEAgLTEwOCw4 ICsxMDYsOCBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICAgICAgICAgICAgICBlbGVt ZW50LnN0eWxlLnRvcCA9IGAke3RpcFl9cHhgOwogCiAgICAgICAgICAgICAgICAgICAgICAgICBs ZXQgdGlwWCA9IHBvaW50LnggLSBib3VuZHMud2lkdGggLyAyOwotICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHRpcFggKyBib3VuZHMud2lkdGggPiB2aWV3cG9ydFdpdGRoKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHRpcFggPSB2aWV3cG9ydFdpdGRoIC0gYm91bmRzLndpZHRoOwor ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHRpcFggKyBib3VuZHMud2lkdGggPiBzdGF0ZURp ZmYudmlld3BvcnQueCArIHN0YXRlRGlmZi52aWV3cG9ydC53aWR0aCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB0aXBYID0gc3RhdGVEaWZmLnZpZXdwb3J0LnggKyBzdGF0ZURpZmYudmll d3BvcnQud2lkdGggLSBib3VuZHMud2lkdGg7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo dGlwWCA8IDApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWCA9IDA7CiAgICAgICAg ICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQgPSBgJHt0aXBYfXB4YDsKQEAgLTE2 OCw3ICsxNjYsNyBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJ0 b29sdGlwLWNvbnRlbnQiIHJlZj0iJHt0aGlzLnJlZn0iPgogICAgICAgICAgICAgPC9kaXY+YDsK ICAgICB9Ci0gICAgc2V0KGNvbnRlbnQsIHBvaW50cywgb25BcnJvd0NsaWNrID0gbnVsbCkgewor ICAgIHNldChjb250ZW50LCBwb2ludHMsIG9uQXJyb3dDbGljayA9IG51bGwsIHZpZXdwb3J0ID0g bnVsbCkgewogICAgICAgICBpZiAoIXRoaXMucmVmKSB7CiAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKCdDYW5ub3Qgc2V0IFRvb2xUaXAgY29udGVudCwgbm8gdG9vbHRpcCBvbiB0aGUgcGFnZScp OwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTc4LDkgKzE3NiwyOSBAQCBjbGFzcyBfVG9vbFRp cCB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5vbkFycm93 Q2xpY2sgPSBvbkFycm93Q2xpY2s7Ci0gICAgICAgIHRoaXMucmVmLnNldFN0YXRlKHtjb250ZW50 OiBjb250ZW50LCBwb2ludHM6IHBvaW50c30pOworCisgICAgICAgIGNvbnN0IHdpbmRvd1dpZHRo ID0gTWF0aC5tYXgoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudFdpZHRoLCB3aW5kb3cu aW5uZXJXaWR0aCB8fCAwKTsKKyAgICAgICAgY29uc3Qgd2luZG93SGVpZ2h0ID0gTWF0aC5tYXgo ZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdodCwgd2luZG93LmlubmVySGVpZ2h0 IHx8IDApOworICAgICAgICBpZiAoIXZpZXdwb3J0KQorICAgICAgICAgICAgdmlld3BvcnQgPSB7 CisgICAgICAgICAgICAgICAgeDogMCwKKyAgICAgICAgICAgICAgICB5OiAwLAorICAgICAgICAg ICAgICAgIHdpZHRoOiB3aW5kb3dXaWR0aCwKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IHdpbmRv d0hlaWdodCwKKyAgICAgICAgICAgIH0KKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBsZXQg cmVjdCA9IHZpZXdwb3J0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICAgICAgdmll d3BvcnQgPSB7CisgICAgICAgICAgICAgICAgeDogMCwKKyAgICAgICAgICAgICAgICB5OiAwLAor ICAgICAgICAgICAgICAgIHdpZHRoOiBNYXRoLm1pbih3aW5kb3dXaWR0aCwgcmVjdC53aWR0aCks CisgICAgICAgICAgICAgICAgaGVpZ2h0OiBNYXRoLm1pbih3aW5kb3dIZWlnaHQsIHJlY3QuaGVp Z2h0KSwKKyAgICAgICAgICAgIH07CisgICAgICAgIH0KKyAgICAgICAgY29uc29sZS5sb2codmll d3BvcnQpOworICAgICAgICB0aGlzLnJlZi5zZXRTdGF0ZSh7Y29udGVudDogY29udGVudCwgcG9p bnRzOiBwb2ludHMsIHZpZXdwb3J0OiB2aWV3cG9ydH0pOwogICAgIH0KLSAgICBzZXRCeUVsZW1l bnQoY29udGVudCwgZWxlbWVudCwgb3B0aW9ucykgeworICAgIHNldEJ5RWxlbWVudChjb250ZW50 LCBlbGVtZW50LCBvcHRpb25zLCB2aWV3cG9ydCA9IG51bGwpIHsKICAgICAgICAgY29uc3QgYm91 bmQgPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgICAgICBjb25zdCBvcmll bnRhdGlvbiA9IG9wdGlvbnMub3JpZW50YXRpb24gPyBvcHRpb25zLm9yaWVudGF0aW9uIDogdGhp cy5WRVJUSUNBTDsKICAgICAgICAgY29uc3Qgb25BcnJvd0NsaWNrID0gb3B0aW9ucy5vbkFycm93 Q2xpY2sgPyBvcHRpb25zLm9uQXJyb3dDbGljayA6IG51bGw7CkBAIC0xOTQsMTIgKzIxMiwxMiBA QCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICB0aGlzLnNldChjb250ZW50LCBbCiAgICAg ICAgICAgICAgICAge3g6IGJvdW5kLnJpZ2h0LCB5OiAoYm91bmQudG9wICsgYm91bmQuYm90dG9t KSAvIDIgKyBzY3JvbGxEZWx0YX0sCiAgICAgICAgICAgICAgICAge3g6IGJvdW5kLmxlZnQsIHk6 IChib3VuZC50b3AgKyBib3VuZC5ib3R0b20pIC8gMiArIHNjcm9sbERlbHRhfSwKLSAgICAgICAg ICAgIF0sIG9uQXJyb3dDbGljayk7CisgICAgICAgICAgICBdLCBvbkFycm93Q2xpY2ssIHZpZXdw b3J0KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuc2V0KGNvbnRlbnQsIFsK ICAgICAgICAgICAgICAgICB7eDogKGJvdW5kLnJpZ2h0ICsgYm91bmQubGVmdCkgLyAyLCB5OiBi b3VuZC50b3AgKyBzY3JvbGxEZWx0YX0sCiAgICAgICAgICAgICAgICAge3g6IChib3VuZC5yaWdo dCArIGJvdW5kLmxlZnQpIC8gMiwgeTogYm91bmQuYm90dG9tICsgc2Nyb2xsRGVsdGF9LAotICAg ICAgICAgICAgXSwgb25BcnJvd0NsaWNrKTsKKyAgICAgICAgICAgIF0sIG9uQXJyb3dDbGljaywg dmlld3BvcnQpOwogICAgICAgICB9CiAgICAgfQogICAgIHVuc2V0KCkgewpJbmRleDogVG9vbHMv cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvc2VhcmNoLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvc2Vh cmNoLmh0bWwJKHJldmlzaW9uIDI1MTY2NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvdGVtcGxhdGVzL3NlYXJjaC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yMjIsNyAr MjIyLDcgQEAgb25MYXlvdXRDaGFuZ2UuYWN0aW9uKCgpID0+IHsKIHdpbmRvdy5vbnBvcHN0YXRl ID0gZXZlbnQgPT4ge3ZpZXcucmVsb2FkKCk7fTsKIHdpbmRvdy5vbnB1c2hzdGF0ZSA9IGV2ZW50 ID0+IHt2aWV3LnJlbG9hZCgpO307CiAKLQorbGV0IHZpZXdwb3J0ID0gbnVsbDsKIERPTS5pbmpl Y3QoCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2FwcCcpLAogICAgIGAke1Rvb2xUaXB9 CkBAIC0yNDIsNyArMjQyLDE0IEBAIERPTS5pbmplY3QoCiAgICAgXSwgKCkgPT4gb25MYXlvdXRD aGFuZ2UuYWRkKCkpfQogCiAgICAgPGRpdiBjbGFzcz0ibWFpbiByaWdodC1zaWRlYmFyIHVuZGVy LXRvcGJhci13aXRoLWFjdGlvbnMiPgotICAgICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4KKyAg ICAgICAgPGRpdiBjbGFzcz0iY29udGVudCIgcmVmPSR7UkVGLmNyZWF0ZVJlZih7CisgICAgICAg ICAgICAgICAgb25FbGVtZW50TW91bnQ6IChlbGVtZW50KSA9PiB7CisgICAgICAgICAgICAgICAg ICAgIHZpZXcucmVmLnN0YXRlLmNoaWxkcmVuLmZvckVhY2goKGNoaWxkKSA9PiB7CisgICAgICAg ICAgICAgICAgICAgICAgICBjaGlsZC50aW1lbGluZS52aWV3cG9ydCA9IGVsZW1lbnQ7CisgICAg ICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICB2aWV3cG9ydCA9IGVsZW1l bnQ7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSl9PgogICAgICAgICAgICAgJHtT ZWFyY2hCYXIoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgICAgIGNvbnN0IHNwbGl0VVJMID0g ZG9jdW1lbnQuVVJMLnNwbGl0KCc/Jyk7CiAgICAgICAgICAgICAgICAgbGV0IHBhcmFtcyA9IHF1 ZXJ5VG9QYXJhbXMoc3BsaXRVUkxbMV0pOwpAQCAtMjU5LDcgKzI2Niw3IEBAIERPTS5pbmplY3Qo CiAgICAgICAgICAgICAgICAgICAgIGxldCBjaGlsZCA9IHsKICAgICAgICAgICAgICAgICAgICAg ICAgIHN1aXRlOiBhcmd1bWVudHNbaV0uc3VpdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICB0 ZXN0OiBhcmd1bWVudHNbaV0udGVzdCwKLSAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVsaW5l OiBuZXcgVGltZWxpbmVGcm9tRW5kcG9pbnQoYGFwaS9yZXN1bHRzLyR7YXJndW1lbnRzW2ldLnN1 aXRlfS8ke2FyZ3VtZW50c1tpXS50ZXN0fWApLAorICAgICAgICAgICAgICAgICAgICAgICAgdGlt ZWxpbmU6IG5ldyBUaW1lbGluZUZyb21FbmRwb2ludChgYXBpL3Jlc3VsdHMvJHthcmd1bWVudHNb aV0uc3VpdGV9LyR7YXJndW1lbnRzW2ldLnRlc3R9YCwgbnVsbCwgdmlld3BvcnQpLAogICAgICAg ICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgdmlldy5yZWYuc2V0U3RhdGUo e3ByZXBlbmRpbmc6IFtjaGlsZF19KTsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvdGVtcGxhdGVzL3N1aXRlX3Jlc3VsdHMuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9zdWl0ZV9yZXN1bHRzLmh0 bWwJKHJldmlzaW9uIDI1MTY2NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvdGVtcGxhdGVzL3N1aXRlX3Jlc3VsdHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTg0LDcg KzE4NCwxMyBAQCAke0RyYXdlcihbCiAgICAgQ29uZmlndXJhdGlvblNlbGVjdG9ycygoKSA9PiB7 dmlldy5yZWxvYWQoKX0pLAogXSwgKCkgPT4gb25MYXlvdXRDaGFuZ2UuYWRkKCkpfQogPGRpdiBj bGFzcz0ibWFpbiByaWdodC1zaWRlYmFyIHVuZGVyLXRvcGJhci13aXRoLWFjdGlvbnMiPgotICAg IDxkaXYgY2xhc3M9ImNvbnRlbnQiPgorICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiIHJlZj0ke1JF Ri5jcmVhdGVSZWYoeworICAgICAgICAgICAgb25FbGVtZW50TW91bnQ6IChlbGVtZW50KSA9PiB7 CisgICAgICAgICAgICAgICAgZm9yIChsZXQgc3VpdGUgaW4gdmlldy5jaGlsZHJlbikgeworICAg ICAgICAgICAgICAgICAgICB2aWV3LmNoaWxkcmVuW3N1aXRlXS52aWV3cG9ydCA9IGVsZW1lbnQ7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9KX0+CiAgICAgICAg ICR7dmlld30KICAgICA8L2Rpdj4KIDwvZGl2PmApOwo= 382264 2019-10-29 19:07:11 -0700 2019-10-29 20:14:51 -0700 Patch for landing bug-203527-20191029190710.patch text/plain 14171 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTY3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDE5LTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZpeCB0b29sdGlwIHdpdGggZHJhd2Vy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM1MjcK KworICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICBUaGUg aW50ZXJhY3Rpb24gYmV0d2VlbiB0b29sdGlwcyBhbmQgZHJhd2VycyBuZWVkcyBpbXByb3ZlbWVu dCwgdG9vbHRpcHMKKyAgICAgICAgYXJlIGluY29uc2lzdGVudGx5IHVuZGVyIHRoZSBkcmF3ZXIs IGRvIG5vdCB0cmVhdCB0aGUgZHJhd2VyIGFzIGEgYm91bmRhcnkuCisKKyAgICAgICAgKiByZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9jc3MvdG9vbHRpcC5jc3M6CisgICAgICAg ICgudG9vbHRpcCk6IFVzZSB0b3BaSW5kZXggdmFyaWFibGUuCisgICAgICAgICogcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAgICAgICh4QXhp c0Zyb21TY2FsZSk6IFBhc3Mgdmlld3BvcnQgdG8gVG9vbFRpcC4KKyAgICAgICAgKFRpbWVsaW5l RnJvbUVuZHBvaW50KTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90 b3R5cGUudXBkYXRlKTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90 b3R5cGUucmVuZGVyKTogRGl0dG8uCisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90 b3R5cGUucmVuZGVyLm9uRG90RW50ZXJGYWN0b3J5KTogRGl0dG8uCisgICAgICAgICogcmVzdWx0 c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdG9vbHRpcC5qczoKKyAgICAgICAgKF9U b29sVGlwLnByb3RvdHlwZS50b1N0cmluZyk6IFVzZSBwYXNzZWQgdmlld3BvcnQgaW5zdGVhZCBv ZiB0aGUgZG9jdW1lbnQgc2l6ZS4KKyAgICAgICAgKF9Ub29sVGlwLnByb3RvdHlwZS5zZXRCeUVs ZW1lbnQpOiBTZXQgdGhlIHZpZXdwb3J0IGJhc2VkIG9uIHRoZSBwYXNzZWQgdmlld3BvcnQuCisg ICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvc2VhcmNoLmh0 bWw6IERlZmluZSB0aGUgdmlld3BvcnQgYXMgdGhlCisgICAgICAgIGNvbnRlbnQgZWxlbWVudC4K KyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9zdWl0ZV9y ZXN1bHRzLmh0bWw6IERpdHRvLgorCiAyMDE5LTEwLTI4ICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBfV0tQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24gU1BJCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9jc3MvdG9vbHRpcC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0 c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvY3NzL3Rvb2x0aXAuY3NzCShyZXZpc2lvbiAy NTE2NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9jc3Mv dG9vbHRpcC5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTI0LDcgKzI0LDcgQEAKICAqLwogIAogLnRv b2x0aXAgewotICAgIHotaW5kZXg6IDUwOworICAgIHotaW5kZXg6IHZhcigtLXRvcFpJbmRleCk7 CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIG9wYWNpdHk6IDgwJTsKICAgICB3aWR0aDog MDsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3Rp bWVsaW5lLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCShyZXZpc2lvbiAyNTE2NjUpCisrKyBUb29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwkod29ya2luZyBj b3B5KQpAQCAtMTU1LDcgKzE1NSw3IEBAIGZ1bmN0aW9uIHJlcG9zaXRvcmllc0ZvckNvbW1pdHMo Y29tbWl0cykKICAgICByZXR1cm4gcmVwb3NpdG9yaWVzOwogfQogCi1mdW5jdGlvbiB4QXhpc0Zy b21TY2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdXBkYXRlc0FycmF5LCBpc1RvcD1mYWxzZSkKK2Z1 bmN0aW9uIHhBeGlzRnJvbVNjYWxlKHNjYWxlLCByZXBvc2l0b3J5LCB1cGRhdGVzQXJyYXksIGlz VG9wPWZhbHNlLCB2aWV3cG9ydD1udWxsKQogewogICAgIGZ1bmN0aW9uIHNjYWxlRm9yUmVwb3Np dG9yeShzY2FsZSkgewogICAgICAgICByZXR1cm4gc2NhbGUubWFwKG5vZGUgPT4gewpAQCAtMTk3 LDYgKzE5Nyw3IEBAIGZ1bmN0aW9uIHhBeGlzRnJvbVNjYWxlKHNjYWxlLCByZXBvc2l0b3IKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHt4OiBjYW52YXMueCArIHBvaW50LngsIHk6IGNhbnZh cy55ICsgc2Nyb2xsRGVsdGEgKyBwb2ludC55fTsKICAgICAgICAgICAgICAgICB9KSwKICAgICAg ICAgICAgICAgICAoZXZlbnQpID0+IHtyZXR1cm4gb25TY2FsZUNsaWNrKG5vZGUpO30sCisgICAg ICAgICAgICAgICAgdmlld3BvcnQsCiAgICAgICAgICAgICApOwogICAgICAgICB9LAogICAgICAg ICBvblNjYWxlTGVhdmU6IChldmVudCwgY2FudmFzKSA9PiB7CkBAIC0zNDIsNyArMzQzLDcgQEAg ZnVuY3Rpb24gY29tYmluZVJlc3VsdHMoKSB7CiB9CiAKIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBv aW50IHsKLSAgICBjb25zdHJ1Y3RvcihlbmRwb2ludCwgc3VpdGUgPSBudWxsKSB7CisgICAgY29u c3RydWN0b3IoZW5kcG9pbnQsIHN1aXRlID0gbnVsbCwgdmlld3BvcnQgPSBudWxsKSB7CiAgICAg ICAgIHRoaXMuZW5kcG9pbnQgPSBlbmRwb2ludDsKICAgICAgICAgdGhpcy5kaXNwbGF5QWxsQ29t bWl0cyA9IHRydWU7CiAKQEAgLTM1NSw2ICszNTYsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRw b2ludCB7CiAgICAgICAgIHRoaXMudGltZWxpbmVVcGRhdGUgPSBudWxsOwogICAgICAgICB0aGlz Lm5vdGlmeVJlcmVuZGVyID0gKCkgPT4ge307CiAgICAgICAgIHRoaXMucmVwb3NpdG9yaWVzID0g W107CisgICAgICAgIHRoaXMudmlld3BvcnQgPSB2aWV3cG9ydDsKIAogICAgICAgICBjb25zdCBz ZWxmID0gdGhpczsKIApAQCAtMzk4LDcgKzQwMCw3IEBAIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBv aW50IHsKICAgICAgICAgICAgIGxldCBjb21wb25lbnRzID0gW107CiAKICAgICAgICAgICAgIG5l d1JlcG9zaXRvcmllcy5mb3JFYWNoKHJlcG9zaXRvcnkgPT4gewotICAgICAgICAgICAgICAgIGNv bXBvbmVudHMucHVzaCh4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdGhpcy54YXhp c1VwZGF0ZXMsIHRvcCkpOworICAgICAgICAgICAgICAgIGNvbXBvbmVudHMucHVzaCh4QXhpc0Zy b21TY2FsZShzY2FsZSwgcmVwb3NpdG9yeSwgdGhpcy54YXhpc1VwZGF0ZXMsIHRvcCwgdGhpcy52 aWV3cG9ydCkpOwogICAgICAgICAgICAgICAgIHRvcCA9IGZhbHNlOwogICAgICAgICAgICAgfSk7 CiAKQEAgLTU5MSw2ICs1OTMsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAg ICAgICAgICAgICAgICAgIGFncmVnYXRlRGF0YVtrZXldID0gZGF0YVtrZXldOwogICAgICAgICAg ICAgICAgIH0pOwogICAgICAgICAgICAgICAgIGFncmVnYXRlRGF0YVsnY29uZmlndXJhdGlvbidd ID0gbmV3IENvbmZpZ3VyYXRpb24ocGFydGlhbENvbmZpZ3VyYXRpb24pOworICAgICAgICAgICAg ICAgIFRvb2xUaXAudW5zZXQoKTsKICAgICAgICAgICAgICAgICBJbnZlc3RpZ2F0ZURyYXdlci5l eHBhbmQoc2VsZi5zdWl0ZSwgYWdyZWdhdGVEYXRhLCBhbGxEYXRhKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQpAQCAtNjU4LDYgKzY2MSw3IEBAIGNsYXNzIFRpbWVsaW5lRnJvbUVuZHBvaW50 IHsKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7eDogY2FudmFzLnggKyBwb2ludC54 LCB5OiBjYW52YXMueSArIHNjcm9sbERlbHRhICsgcG9pbnQueX07CiAgICAgICAgICAgICAgICAg ICAgIH0pLAogICAgICAgICAgICAgICAgICAgICAoZXZlbnQpID0+IHtvbkRvdENsaWNrRmFjdG9y eShjb25maWd1cmF0aW9uKShkYXRhKTt9LAorICAgICAgICAgICAgICAgICAgICBzZWxmLnZpZXdw b3J0LAogICAgICAgICAgICAgICAgICk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTc3 OCw3ICs3ODIsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAgIHNlbGYu eGF4aXNVcGRhdGVzID0gW107CiAgICAgICAgIHRoaXMucmVwb3NpdG9yaWVzID0gcmVwb3NpdG9y aWVzRm9yQ29tbWl0cyhjb21taXRzKTsKICAgICAgICAgdGhpcy5yZXBvc2l0b3JpZXMuZm9yRWFj aChyZXBvc2l0b3J5ID0+IHsKLSAgICAgICAgICAgIGNvbnN0IHhBeGlzQ29tcG9uZW50ID0geEF4 aXNGcm9tU2NhbGUoc2NhbGUsIHJlcG9zaXRvcnksIHNlbGYueGF4aXNVcGRhdGVzLCB0b3ApOwor ICAgICAgICAgICAgY29uc3QgeEF4aXNDb21wb25lbnQgPSB4QXhpc0Zyb21TY2FsZShzY2FsZSwg cmVwb3NpdG9yeSwgc2VsZi54YXhpc1VwZGF0ZXMsIHRvcCwgc2VsZi52aWV3cG9ydCk7CiAgICAg ICAgICAgICBpZiAodG9wKQogICAgICAgICAgICAgICAgIGNoaWxkcmVuLnVuc2hpZnQoeEF4aXND b21wb25lbnQpOwogICAgICAgICAgICAgZWxzZQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy9zdGF0aWMvanMvdG9vbHRpcC5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9y ZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90b29sdGlwLmpzCShyZXZpc2lv biAyNTE2NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9q cy90b29sdGlwLmpzCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIF9Ub29s VGlwIHsKICAgICB0b1N0cmluZygpIHsKICAgICAgICAgY29uc3Qgc2VsZiA9IHRoaXM7CiAgICAg ICAgIHRoaXMucmVmID0gUkVGLmNyZWF0ZVJlZih7Ci0gICAgICAgICAgICBzdGF0ZToge2NvbnRl bnQ6IG51bGwsIHBvaW50czogbnVsbH0sCisgICAgICAgICAgICBzdGF0ZToge2NvbnRlbnQ6IG51 bGwsIHBvaW50czogbnVsbCwgdmlld3BvcnQ6IG51bGx9LAogICAgICAgICAgICAgb25FbGVtZW50 TW91bnQ6IChlbGVtZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCdtb3VzZWxlYXZlJywgKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIGlm IChlbGVtZW50LnN0eWxlLmRpc3BsYXkgPT09ICdub25lJykKQEAgLTYxLDcgKzYxLDcgQEAgY2xh c3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgICAgICAgICBET00uaW5qZWN0KGVsZW1lbnQsICcn KTsKICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnBv aW50cykgeworICAgICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYucG9pbnRzIHx8IHN0YXRlRGlm Zi52aWV3cG9ydCkgewogICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQgPSAn MHB4JzsKICAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS50b3AgPSAnMHB4JzsKIApA QCAtNjksOCArNjksNiBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICAgICAgICAgIGNv bnN0IGxvd2VyUG9pbnQgPSBzdGF0ZURpZmYucG9pbnRzLmxlbmd0aCA+IDEgJiYgc3RhdGVEaWZm LnBvaW50c1sxXS55ID4gc3RhdGVEaWZmLnBvaW50c1swXS55ID8gc3RhdGVEaWZmLnBvaW50c1sx XSA6IHN0YXRlRGlmZi5wb2ludHNbMF07CiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNjcm9s bERlbHRhID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LnNjcm9sbFRvcCB8fCBkb2N1bWVudC5i b2R5LnNjcm9sbFRvcDsKICAgICAgICAgICAgICAgICAgICAgY29uc3QgYm91bmRzID0gZWxlbWVu dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgICAgICAgICAgICAgY29uc3Qgdmll d3BvcnRXaXRkaCA9IE1hdGgubWF4KGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5jbGllbnRXaWR0 aCwgd2luZG93LmlubmVyV2lkdGggfHwgMCk7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IHZp ZXdwb3J0SGVpZ2h0ID0gTWF0aC5tYXgoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhl aWdodCwgd2luZG93LmlubmVySGVpZ2h0IHx8IDApOwogCiAgICAgICAgICAgICAgICAgICAgIGxl dCBkaXJlY3Rpb24gPSAnZG93bic7CiAgICAgICAgICAgICAgICAgICAgIGxldCBwb2ludCA9IHVw cGVyUG9pbnQ7CkBAIC04Myw3ICs4MSw3IEBAIGNsYXNzIF9Ub29sVGlwIHsKICAgICAgICAgICAg ICAgICAgICAgICAgIGRpcmVjdGlvbiA9ICdsZWZ0JzsKICAgICAgICAgICAgICAgICAgICAgICAg IGxldCB0aXBYID0gbGVmdFBvaW50LnggLSAxMiAtIGJvdW5kcy53aWR0aDsKICAgICAgICAgICAg ICAgICAgICAgICAgIHBvaW50ID0gcmlnaHRQb2ludDsKLSAgICAgICAgICAgICAgICAgICAgICAg IGlmICh0aXBYIDwgMCB8fCB0aXBYICsgYm91bmRzLndpZHRoICsgKHJpZ2h0UG9pbnQueCAtIGxl ZnRQb2ludC54KSAvIDIgPCB2aWV3cG9ydFdpdGRoIC8gMikgeworICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHRpcFggPCAwIHx8IHRpcFggKyBib3VuZHMud2lkdGggKyAocmlnaHRQb2ludC54 IC0gbGVmdFBvaW50LngpIC8gMiA8IHN0YXRlRGlmZi52aWV3cG9ydC54ICsgc3RhdGVEaWZmLnZp ZXdwb3J0LndpZHRoIC8gMikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcmVjdGlv biA9ICdyaWdodCc7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWCA9IHJpZ2h0UG9p bnQueCArIDE2OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvaW50ID0gcmlnaHRQb2lu dDsKQEAgLTkxLDggKzg5LDggQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgICAgICAg ICAgICAgZWxlbWVudC5zdHlsZS5sZWZ0ID0gYCR7dGlwWH1weGA7CiAKICAgICAgICAgICAgICAg ICAgICAgICAgIGxldCB0aXBZID0gcG9pbnQueSAtIGJvdW5kcy5oZWlnaHQgLyAyOwotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKHRpcFkgKyBib3VuZHMuaGVpZ2h0ID4gc2Nyb2xsRGVsdGEg KyB2aWV3cG9ydEhlaWdodCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aXBZID0gc2Ny b2xsRGVsdGEgKyB2aWV3cG9ydEhlaWdodCAtIGJvdW5kcy5oZWlnaHQ7CisgICAgICAgICAgICAg ICAgICAgICAgICBpZiAodGlwWSArIGJvdW5kcy5oZWlnaHQgPiBzY3JvbGxEZWx0YSArIHN0YXRl RGlmZi52aWV3cG9ydC55ICsgc3RhdGVEaWZmLnZpZXdwb3J0LmhlaWdodCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0aXBZID0gc2Nyb2xsRGVsdGEgKyBzdGF0ZURpZmYudmlld3BvcnQu eSArIHN0YXRlRGlmZi52aWV3cG9ydC5oZWlnaHQgLSBib3VuZHMuaGVpZ2h0OwogICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKHRpcFkgPCAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRpcFkgPSAwOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS50b3AgPSBg JHt0aXBZfXB4YDsKQEAgLTEwMCw3ICs5OCw3IEBAIGNsYXNzIF9Ub29sVGlwIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIE1ha2UgYW4gZWZmb3J0IHRvIHBsYWNlIHRoZSB0b29sdGlwIGlu IHRoZSBjZW50ZXIgb2YgdGhlIHZpZXdwb3J0LgogICAgICAgICAgICAgICAgICAgICAgICAgbGV0 IHRpcFkgPSB1cHBlclBvaW50LnkgLSA4IC0gYm91bmRzLmhlaWdodDsKICAgICAgICAgICAgICAg ICAgICAgICAgIHBvaW50ID0gdXBwZXJQb2ludDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm ICh0aXBZIDwgc2Nyb2xsRGVsdGEgfHwgdGlwWSArIGJvdW5kcy5oZWlnaHQgKyAobG93ZXJQb2lu dC55IC0gdXBwZXJQb2ludC55KSAvIDIgPCBzY3JvbGxEZWx0YSArIHZpZXdwb3J0SGVpZ2h0IC8g MikgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHRpcFkgPCBzY3JvbGxEZWx0YSB8fCB0 aXBZICsgYm91bmRzLmhlaWdodCArIChsb3dlclBvaW50LnkgLSB1cHBlclBvaW50LnkpIC8gMiA8 IHNjcm9sbERlbHRhICsgc3RhdGVEaWZmLnZpZXdwb3J0LnkgKyBzdGF0ZURpZmYudmlld3BvcnQu aGVpZ2h0IC8gMikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcmVjdGlvbiA9ICd1 cCc7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWSA9IGxvd2VyUG9pbnQueSArIDE2 OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvaW50ID0gbG93ZXJQb2ludDsKQEAgLTEw OCw4ICsxMDYsOCBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICAgICAgICAgICAgICBl bGVtZW50LnN0eWxlLnRvcCA9IGAke3RpcFl9cHhgOwogCiAgICAgICAgICAgICAgICAgICAgICAg ICBsZXQgdGlwWCA9IHBvaW50LnggLSBib3VuZHMud2lkdGggLyAyOwotICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKHRpcFggKyBib3VuZHMud2lkdGggPiB2aWV3cG9ydFdpdGRoKQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRpcFggPSB2aWV3cG9ydFdpdGRoIC0gYm91bmRzLndpZHRo OworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHRpcFggKyBib3VuZHMud2lkdGggPiBzdGF0 ZURpZmYudmlld3BvcnQueCArIHN0YXRlRGlmZi52aWV3cG9ydC53aWR0aCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0aXBYID0gc3RhdGVEaWZmLnZpZXdwb3J0LnggKyBzdGF0ZURpZmYu dmlld3BvcnQud2lkdGggLSBib3VuZHMud2lkdGg7CiAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAodGlwWCA8IDApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlwWCA9IDA7CiAgICAg ICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQgPSBgJHt0aXBYfXB4YDsKQEAg LTE2OCw3ICsxNjYsNyBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICA8ZGl2IGNsYXNz PSJ0b29sdGlwLWNvbnRlbnQiIHJlZj0iJHt0aGlzLnJlZn0iPgogICAgICAgICAgICAgPC9kaXY+ YDsKICAgICB9Ci0gICAgc2V0KGNvbnRlbnQsIHBvaW50cywgb25BcnJvd0NsaWNrID0gbnVsbCkg eworICAgIHNldChjb250ZW50LCBwb2ludHMsIG9uQXJyb3dDbGljayA9IG51bGwsIHZpZXdwb3J0 ID0gbnVsbCkgewogICAgICAgICBpZiAoIXRoaXMucmVmKSB7CiAgICAgICAgICAgICBjb25zb2xl LmVycm9yKCdDYW5ub3Qgc2V0IFRvb2xUaXAgY29udGVudCwgbm8gdG9vbHRpcCBvbiB0aGUgcGFn ZScpOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTc4LDkgKzE3NiwyOSBAQCBjbGFzcyBfVG9v bFRpcCB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5vbkFy cm93Q2xpY2sgPSBvbkFycm93Q2xpY2s7Ci0gICAgICAgIHRoaXMucmVmLnNldFN0YXRlKHtjb250 ZW50OiBjb250ZW50LCBwb2ludHM6IHBvaW50c30pOworCisgICAgICAgIGNvbnN0IHdpbmRvd1dp ZHRoID0gTWF0aC5tYXgoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudFdpZHRoLCB3aW5k b3cuaW5uZXJXaWR0aCB8fCAwKTsKKyAgICAgICAgY29uc3Qgd2luZG93SGVpZ2h0ID0gTWF0aC5t YXgoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdodCwgd2luZG93LmlubmVySGVp Z2h0IHx8IDApOworICAgICAgICBpZiAoIXZpZXdwb3J0KQorICAgICAgICAgICAgdmlld3BvcnQg PSB7CisgICAgICAgICAgICAgICAgeDogMCwKKyAgICAgICAgICAgICAgICB5OiAwLAorICAgICAg ICAgICAgICAgIHdpZHRoOiB3aW5kb3dXaWR0aCwKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IHdp bmRvd0hlaWdodCwKKyAgICAgICAgICAgIH0KKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBs ZXQgcmVjdCA9IHZpZXdwb3J0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICAgICAg dmlld3BvcnQgPSB7CisgICAgICAgICAgICAgICAgeDogMCwKKyAgICAgICAgICAgICAgICB5OiAw LAorICAgICAgICAgICAgICAgIHdpZHRoOiBNYXRoLm1pbih3aW5kb3dXaWR0aCwgcmVjdC53aWR0 aCksCisgICAgICAgICAgICAgICAgaGVpZ2h0OiBNYXRoLm1pbih3aW5kb3dIZWlnaHQsIHJlY3Qu aGVpZ2h0KSwKKyAgICAgICAgICAgIH07CisgICAgICAgIH0KKyAgICAgICAgY29uc29sZS5sb2co dmlld3BvcnQpOworICAgICAgICB0aGlzLnJlZi5zZXRTdGF0ZSh7Y29udGVudDogY29udGVudCwg cG9pbnRzOiBwb2ludHMsIHZpZXdwb3J0OiB2aWV3cG9ydH0pOwogICAgIH0KLSAgICBzZXRCeUVs ZW1lbnQoY29udGVudCwgZWxlbWVudCwgb3B0aW9ucykgeworICAgIHNldEJ5RWxlbWVudChjb250 ZW50LCBlbGVtZW50LCBvcHRpb25zLCB2aWV3cG9ydCA9IG51bGwpIHsKICAgICAgICAgY29uc3Qg Ym91bmQgPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgICAgICBjb25zdCBv cmllbnRhdGlvbiA9IG9wdGlvbnMub3JpZW50YXRpb24gPyBvcHRpb25zLm9yaWVudGF0aW9uIDog dGhpcy5WRVJUSUNBTDsKICAgICAgICAgY29uc3Qgb25BcnJvd0NsaWNrID0gb3B0aW9ucy5vbkFy cm93Q2xpY2sgPyBvcHRpb25zLm9uQXJyb3dDbGljayA6IG51bGw7CkBAIC0xOTQsMTIgKzIxMiwx MiBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAgICAgICAgICB0aGlzLnNldChjb250ZW50LCBbCiAg ICAgICAgICAgICAgICAge3g6IGJvdW5kLnJpZ2h0LCB5OiAoYm91bmQudG9wICsgYm91bmQuYm90 dG9tKSAvIDIgKyBzY3JvbGxEZWx0YX0sCiAgICAgICAgICAgICAgICAge3g6IGJvdW5kLmxlZnQs IHk6IChib3VuZC50b3AgKyBib3VuZC5ib3R0b20pIC8gMiArIHNjcm9sbERlbHRhfSwKLSAgICAg ICAgICAgIF0sIG9uQXJyb3dDbGljayk7CisgICAgICAgICAgICBdLCBvbkFycm93Q2xpY2ssIHZp ZXdwb3J0KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuc2V0KGNvbnRlbnQs IFsKICAgICAgICAgICAgICAgICB7eDogKGJvdW5kLnJpZ2h0ICsgYm91bmQubGVmdCkgLyAyLCB5 OiBib3VuZC50b3AgKyBzY3JvbGxEZWx0YX0sCiAgICAgICAgICAgICAgICAge3g6IChib3VuZC5y aWdodCArIGJvdW5kLmxlZnQpIC8gMiwgeTogYm91bmQuYm90dG9tICsgc2Nyb2xsRGVsdGF9LAot ICAgICAgICAgICAgXSwgb25BcnJvd0NsaWNrKTsKKyAgICAgICAgICAgIF0sIG9uQXJyb3dDbGlj aywgdmlld3BvcnQpOwogICAgICAgICB9CiAgICAgfQogICAgIHVuc2V0KCkgewpJbmRleDogVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvc2VhcmNoLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMv c2VhcmNoLmh0bWwJKHJldmlzaW9uIDI1MTY2NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvdGVtcGxhdGVzL3NlYXJjaC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yMjIs NyArMjIyLDcgQEAgb25MYXlvdXRDaGFuZ2UuYWN0aW9uKCgpID0+IHsKIHdpbmRvdy5vbnBvcHN0 YXRlID0gZXZlbnQgPT4ge3ZpZXcucmVsb2FkKCk7fTsKIHdpbmRvdy5vbnB1c2hzdGF0ZSA9IGV2 ZW50ID0+IHt2aWV3LnJlbG9hZCgpO307CiAKLQorbGV0IHZpZXdwb3J0ID0gbnVsbDsKIERPTS5p bmplY3QoCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2FwcCcpLAogICAgIGAke1Rvb2xU aXB9CkBAIC0yNDIsNyArMjQyLDE0IEBAIERPTS5pbmplY3QoCiAgICAgXSwgKCkgPT4gb25MYXlv dXRDaGFuZ2UuYWRkKCkpfQogCiAgICAgPGRpdiBjbGFzcz0ibWFpbiByaWdodC1zaWRlYmFyIHVu ZGVyLXRvcGJhci13aXRoLWFjdGlvbnMiPgotICAgICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4K KyAgICAgICAgPGRpdiBjbGFzcz0iY29udGVudCIgcmVmPSR7UkVGLmNyZWF0ZVJlZih7CisgICAg ICAgICAgICAgICAgb25FbGVtZW50TW91bnQ6IChlbGVtZW50KSA9PiB7CisgICAgICAgICAgICAg ICAgICAgIHZpZXcucmVmLnN0YXRlLmNoaWxkcmVuLmZvckVhY2goKGNoaWxkKSA9PiB7CisgICAg ICAgICAgICAgICAgICAgICAgICBjaGlsZC50aW1lbGluZS52aWV3cG9ydCA9IGVsZW1lbnQ7Cisg ICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICB2aWV3cG9ydCA9IGVs ZW1lbnQ7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSl9PgogICAgICAgICAgICAg JHtTZWFyY2hCYXIoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgICAgIGNvbnN0IHNwbGl0VVJM ID0gZG9jdW1lbnQuVVJMLnNwbGl0KCc/Jyk7CiAgICAgICAgICAgICAgICAgbGV0IHBhcmFtcyA9 IHF1ZXJ5VG9QYXJhbXMoc3BsaXRVUkxbMV0pOwpAQCAtMjU5LDcgKzI2Niw3IEBAIERPTS5pbmpl Y3QoCiAgICAgICAgICAgICAgICAgICAgIGxldCBjaGlsZCA9IHsKICAgICAgICAgICAgICAgICAg ICAgICAgIHN1aXRlOiBhcmd1bWVudHNbaV0uc3VpdGUsCiAgICAgICAgICAgICAgICAgICAgICAg ICB0ZXN0OiBhcmd1bWVudHNbaV0udGVzdCwKLSAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVs aW5lOiBuZXcgVGltZWxpbmVGcm9tRW5kcG9pbnQoYGFwaS9yZXN1bHRzLyR7YXJndW1lbnRzW2ld LnN1aXRlfS8ke2FyZ3VtZW50c1tpXS50ZXN0fWApLAorICAgICAgICAgICAgICAgICAgICAgICAg dGltZWxpbmU6IG5ldyBUaW1lbGluZUZyb21FbmRwb2ludChgYXBpL3Jlc3VsdHMvJHthcmd1bWVu dHNbaV0uc3VpdGV9LyR7YXJndW1lbnRzW2ldLnRlc3R9YCwgbnVsbCwgdmlld3BvcnQpLAogICAg ICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgdmlldy5yZWYuc2V0U3Rh dGUoe3ByZXBlbmRpbmc6IFtjaGlsZF19KTsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvdGVtcGxhdGVzL3N1aXRlX3Jlc3VsdHMuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9zdWl0ZV9yZXN1bHRz Lmh0bWwJKHJldmlzaW9uIDI1MTY2NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5 L3ZpZXcvdGVtcGxhdGVzL3N1aXRlX3Jlc3VsdHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTg0 LDcgKzE4NCwxMyBAQCAke0RyYXdlcihbCiAgICAgQ29uZmlndXJhdGlvblNlbGVjdG9ycygoKSA9 PiB7dmlldy5yZWxvYWQoKX0pLAogXSwgKCkgPT4gb25MYXlvdXRDaGFuZ2UuYWRkKCkpfQogPGRp diBjbGFzcz0ibWFpbiByaWdodC1zaWRlYmFyIHVuZGVyLXRvcGJhci13aXRoLWFjdGlvbnMiPgot ICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPgorICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiIHJlZj0k e1JFRi5jcmVhdGVSZWYoeworICAgICAgICAgICAgb25FbGVtZW50TW91bnQ6IChlbGVtZW50KSA9 PiB7CisgICAgICAgICAgICAgICAgZm9yIChsZXQgc3VpdGUgaW4gdmlldy5jaGlsZHJlbikgewor ICAgICAgICAgICAgICAgICAgICB2aWV3LmNoaWxkcmVuW3N1aXRlXS52aWV3cG9ydCA9IGVsZW1l bnQ7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9KX0+CiAgICAg ICAgICR7dmlld30KICAgICA8L2Rpdj4KIDwvZGl2PmApOwo=