201103 2019-08-23 16:32:16 -0700 results.webkit.org: Allow clicking on the tooltip arrow 2019-08-26 12:19:20 -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 1564684 0 jbedard 2019-08-23 16:32:16 -0700 The tooltip arrow will intercept clicks destined for the underlying element. We rely on this behavior so that the user can move their mouse into the tooltip without the tooltip disappearing, but we still want users to be able to trigger the click action associated with an element. 1564715 1 377185 jbedard 2019-08-23 17:30:23 -0700 Created attachment 377185 Patch 1564995 2 zhifei_fang 2019-08-26 10:33:22 -0700 unofficially r=me 1564999 3 377185 aakash_jain 2019-08-26 10:37:48 -0700 Comment on attachment 377185 Patch rs=me 1565030 4 377258 jbedard 2019-08-26 11:59:07 -0700 Created attachment 377258 Patch 1565039 5 377258 commit-queue 2019-08-26 12:18:21 -0700 Comment on attachment 377258 Patch Clearing flags on attachment: 377258 Committed r249111: <https://trac.webkit.org/changeset/249111> 1565040 6 commit-queue 2019-08-26 12:18:22 -0700 All reviewed patches have been landed. Closing bug. 1565041 7 webkit-bug-importer 2019-08-26 12:19:20 -0700 <rdar://problem/54717072> 377185 2019-08-23 17:30:23 -0700 2019-08-26 11:59:06 -0700 Patch bug-201103-20190823173022.patch text/plain 5450 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTA3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE5LTA4LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEFsbG93IGNsaWNraW5nIG9uIHRoZSB0 b29sdGlwIGFycm93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDExMDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBCeSBkZXNpZ24sIHRoZSBhcnJvdyBzaXRzIGFib3ZlIHRoZSBjYW52YXMgYW5kIGludGVy Y2VwdHMgbW91c2UgZXZlbnRzIGZyb20gaXQuCisgICAgICAgIFRoaXMgd2lsbCBvZnRlbiBtYWtl IGFuIGVsZW1lbnQgdGhhdCBoYXMgYSB0b29sdGlwIHVuY2xpY2thYmxlLgorCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAg ICAgICh4QXhpc0Zyb21TY2FsZSk6CisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90 b3R5cGUucmVuZGVyLm9uRG90RW50ZXJGYWN0b3J5KToKKyAgICAgICAgKFRpbWVsaW5lRnJvbUVu ZHBvaW50LnByb3RvdHlwZS5yZW5kZXIpOgorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvc3RhdGljL2pzL3Rvb2x0aXAuanM6CisgICAgICAgIChfVG9vbFRpcCk6CisgICAg ICAgIChfVG9vbFRpcC5wcm90b3R5cGUudG9TdHJpbmcpOiBUcmlnZ2VyIG9uQ2xpY2sgY2FsbGJh Y2sgd2hlbiB0aGUgYXJyb3cgaXMgY2xpY2tlZC4KKyAgICAgICAgKF9Ub29sVGlwLnByb3RvdHlw ZS5zZXQpOiBTZXQgdGhlIG9uQ2xpY2sgY2FsbGJhY2suCisKIDIwMTktMDgtMjMgIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEluY3JlYXNlIGxvZyBsZXZl bCBmb3Igd2F0Y2hsaXN0IHJlc3VsdApJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2Ri cHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0 c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMJKHJldmlzaW9uIDI0 OTA3NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3Rp bWVsaW5lLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsMjEgKzIwNSwyMyBAQCBmdW5jdGlvbiB4 QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVwb3NpdG9yCiAgICAgICAgIH0pOwogICAgIH0KIAorICAg IGZ1bmN0aW9uIG9uU2NhbGVDbGljayhub2RlKSB7CisgICAgICAgIGlmICghbm9kZS5sYWJlbC5p ZCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgbGV0IHBhcmFtcyA9IHsKKyAgICAgICAg ICAgIGJyYW5jaDogbm9kZS5sYWJlbC5icmFuY2ggPyBbbm9kZS5sYWJlbC5icmFuY2hdIDogcXVl cnlUb1BhcmFtcyhkb2N1bWVudC5VUkwuc3BsaXQoJz8nKVsxXSkuYnJhbmNoLAorICAgICAgICAg ICAgdXVpZDogW25vZGUubGFiZWwudXVpZF0sCisgICAgICAgIH0KKyAgICAgICAgaWYgKCFwYXJh bXMuYnJhbmNoKQorICAgICAgICAgICAgZGVsZXRlIHBhcmFtcy5icmFuY2g7CisgICAgICAgIGNv bnN0IHF1ZXJ5ID0gcGFyYW1zVG9RdWVyeShwYXJhbXMpOworICAgICAgICB3aW5kb3cub3Blbihg L2NvbW1pdD8ke3F1ZXJ5fWAsICdfYmxhbmsnKTsKKyAgICB9CisKICAgICByZXR1cm4gVGltZWxp bmUuQ2FudmFzWEF4aXNDb21wb25lbnQoc2NhbGVGb3JSZXBvc2l0b3J5KHNjYWxlKSwgewogICAg ICAgICBpc1RvcDogaXNUb3AsCiAgICAgICAgIGhlaWdodDogMTMwLAotICAgICAgICBvblNjYWxl Q2xpY2s6IChub2RlKSA9PiB7Ci0gICAgICAgICAgICBpZiAoIW5vZGUubGFiZWwuaWQpCi0gICAg ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgbGV0IHBhcmFtcyA9IHsKLSAgICAgICAg ICAgICAgICBicmFuY2g6IG5vZGUubGFiZWwuYnJhbmNoID8gW25vZGUubGFiZWwuYnJhbmNoXSA6 IHF1ZXJ5VG9QYXJhbXMoZG9jdW1lbnQuVVJMLnNwbGl0KCc/JylbMV0pLmJyYW5jaCwKLSAgICAg ICAgICAgICAgICB1dWlkOiBbbm9kZS5sYWJlbC51dWlkXSwKLSAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIGlmICghcGFyYW1zLmJyYW5jaCkKLSAgICAgICAgICAgICAgICBkZWxldGUgcGFyYW1z LmJyYW5jaDsKLSAgICAgICAgICAgIGNvbnN0IHF1ZXJ5ID0gcGFyYW1zVG9RdWVyeShwYXJhbXMp OwotICAgICAgICAgICAgd2luZG93Lm9wZW4oYC9jb21taXQ/JHtxdWVyeX1gLCAnX2JsYW5rJyk7 Ci0gICAgICAgIH0sCisgICAgICAgIG9uU2NhbGVDbGljazogb25TY2FsZUNsaWNrLAogICAgICAg ICBvblNjYWxlRW50ZXI6IChub2RlLCBldmVudCwgY2FudmFzKSA9PiB7CiAgICAgICAgICAgICBj b25zdCBzY3JvbGxEZWx0YSA9IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5zY3JvbGxUb3AgfHwg ZG9jdW1lbnQuYm9keS5zY3JvbGxUb3A7CiAgICAgICAgICAgICBUb29sVGlwLnNldCgKQEAgLTIz MCw3ICsyMzIsOCBAQCBmdW5jdGlvbiB4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVwb3NpdG9yCiAg ICAgICAgICAgICAgICAgPC9kaXY+YCwKICAgICAgICAgICAgICAgICBub2RlLnRpcFBvaW50cy5t YXAoKHBvaW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7eDogY2FudmFzLngg KyBwb2ludC54LCB5OiBjYW52YXMueSArIHNjcm9sbERlbHRhICsgcG9pbnQueX07Ci0gICAgICAg ICAgICAgICAgfSkKKyAgICAgICAgICAgICAgICB9KSwKKyAgICAgICAgICAgICAgICAoZXZlbnQp ID0+IHtyZXR1cm4gb25TY2FsZUNsaWNrKG5vZGUpO30sCiAgICAgICAgICAgICApOwogICAgICAg ICB9LAogICAgICAgICBvblNjYWxlTGVhdmU6IChldmVudCwgY2FudmFzKSA9PiB7CkBAIC02MjAs NyArNjIzLDggQEAgY2xhc3MgVGltZWxpbmVGcm9tRW5kcG9pbnQgewogICAgICAgICAgICAgICAg ICAgICA8L2Rpdj5gLAogICAgICAgICAgICAgICAgICAgICBkYXRhLnRpcFBvaW50cy5tYXAoKHBv aW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4ge3g6IGNhbnZhcy54ICsg cG9pbnQueCwgeTogY2FudmFzLnkgKyBzY3JvbGxEZWx0YSArIHBvaW50Lnl9OwotICAgICAgICAg ICAgICAgICAgICB9KQorICAgICAgICAgICAgICAgICAgICB9KSwKKyAgICAgICAgICAgICAgICAg ICAgKGV2ZW50KSA9PiB7b25Eb3RDbGlja0ZhY3RvcnkoY29uZmlndXJhdGlvbikoZGF0YSk7fSwK ICAgICAgICAgICAgICAgICApOwogICAgICAgICAgICAgfQogICAgICAgICB9CkluZGV4OiBUb29s cy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90b29sdGlwLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3Rv b2x0aXAuanMJKHJldmlzaW9uIDI0OTA3NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvc3RhdGljL2pzL3Rvb2x0aXAuanMJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1 LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgICB0aGlz LnJlZiA9IG51bGw7CiAgICAgICAgIHRoaXMuYXJyb3cgPSBudWxsOworICAgICAgICB0aGlzLm9u QXJyb3dDbGljayA9IG51bGw7CiAgICAgfQogICAgIHRvU3RyaW5nKCkgewogICAgICAgICBjb25z dCBzZWxmID0gdGhpczsKQEAgLTk5LDkgKzEwMCwxOSBAQCBjbGFzcyBfVG9vbFRpcCB7CiAgICAg ICAgICAgICBvblN0YXRlVXBkYXRlOiAoZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSkgPT4gewog ICAgICAgICAgICAgICAgIGlmICghc3RhdGUuZGlyZWN0aW9uIHx8ICFzdGF0ZS5sb2NhdGlvbikg ewogICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmRpc3BsYXkgPSAnbm9uZSc7Cisg ICAgICAgICAgICAgICAgICAgIGVsZW1lbnQub25jbGljayA9IG51bGw7CisgICAgICAgICAgICAg ICAgICAgIGVsZW1lbnQuc3R5bGUuY3Vyc29yID0gbnVsbDsKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgICAgIGlmIChzZWxmLm9u QXJyb3dDbGljaykgeworICAgICAgICAgICAgICAgICAgICBlbGVtZW50Lm9uY2xpY2sgPSBzZWxm Lm9uQXJyb3dDbGljazsKKyAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS5jdXJzb3Ig PSAncG9pbnRlcic7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAg ICAgZWxlbWVudC5vbmNsaWNrID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5z dHlsZS5jdXJzb3IgPSBudWxsOworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAg IGVsZW1lbnQuY2xhc3NMaXN0ID0gW2B0b29sdGlwIGFycm93LSR7c3RhdGUuZGlyZWN0aW9ufWBd OwogICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUubGVmdCA9IGAke3N0YXRlLmxvY2F0aW9u LnggLSAxNX1weGA7CiAgICAgICAgICAgICAgICAgaWYgKHN0YXRlLmRpcmVjdGlvbiA9PSAnZG93 bicpCkBAIC0xMTYsNyArMTI3LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgPGRp diBjbGFzcz0idG9vbHRpcC1jb250ZW50IiByZWY9IiR7dGhpcy5yZWZ9Ij4KICAgICAgICAgICAg IDwvZGl2PmA7CiAgICAgfQotICAgIHNldChjb250ZW50LCBwb2ludHMpIHsKKyAgICBzZXQoY29u dGVudCwgcG9pbnRzLCBvbkFycm93Q2xpY2sgPSBudWxsKSB7CiAgICAgICAgIGlmICghdGhpcy5y ZWYpIHsKICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoJ0Nhbm5vdCBzZXQgVG9vbFRpcCBjb250 ZW50LCBubyB0b29sdGlwIG9uIHRoZSBwYWdlJyk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC0x MjUsNyArMTM2LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgY29uc29sZS5lcnJv cignVG9vbCB0aXBzIHJlcXVpcmUgYSBsb2NhdGlvbicpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIAorICAgICAgICB0aGlzLm9uQXJyb3dDbGljayA9IG9uQXJyb3dD bGljazsKICAgICAgICAgdGhpcy5yZWYuc2V0U3RhdGUoe2NvbnRlbnQ6IGNvbnRlbnQsIHBvaW50 czogcG9pbnRzfSk7CiAgICAgfQogICAgIHVuc2V0KCkgewo= 377258 2019-08-26 11:59:07 -0700 2019-08-26 12:18:21 -0700 Patch bug-201103-20190826115907.patch text/plain 5516 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTEwNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE5LTA4LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEFsbG93IGNsaWNraW5nIG9uIHRoZSB0 b29sdGlwIGFycm93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDExMDMKKworICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKwor ICAgICAgICBCeSBkZXNpZ24sIHRoZSBhcnJvdyBzaXRzIGFib3ZlIHRoZSBjYW52YXMgYW5kIGlu dGVyY2VwdHMgbW91c2UgZXZlbnRzIGZyb20gaXQuCisgICAgICAgIFRoaXMgd2lsbCBvZnRlbiBt YWtlIGFuIGVsZW1lbnQgdGhhdCBoYXMgYSB0b29sdGlwIHVuY2xpY2thYmxlLgorCisgICAgICAg ICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6Cisg ICAgICAgICh4QXhpc0Zyb21TY2FsZSk6CisgICAgICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5w cm90b3R5cGUucmVuZGVyLm9uRG90RW50ZXJGYWN0b3J5KToKKyAgICAgICAgKFRpbWVsaW5lRnJv bUVuZHBvaW50LnByb3RvdHlwZS5yZW5kZXIpOgorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2pzL3Rvb2x0aXAuanM6CisgICAgICAgIChfVG9vbFRpcCk6Cisg ICAgICAgIChfVG9vbFRpcC5wcm90b3R5cGUudG9TdHJpbmcpOiBUcmlnZ2VyIG9uQ2xpY2sgY2Fs bGJhY2sgd2hlbiB0aGUgYXJyb3cgaXMgY2xpY2tlZC4KKyAgICAgICAgKF9Ub29sVGlwLnByb3Rv dHlwZS5zZXQpOiBTZXQgdGhlIG9uQ2xpY2sgY2FsbGJhY2suCisKIDIwMTktMDgtMjYgIEFha2Fz aCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtFV1NdIERvIG5vdCBh cHBlbmQgYWRkaXRpb25hbCAnKGZhaWx1cmUpJyBzdHJpbmcgYXQgdGhlIGVuZCBvZiBjdXN0b20g ZmFpbHVyZSBtZXNzYWdlIGluIEVXUyBCdWlsZGJvdApJbmRleDogVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMJKHJl dmlzaW9uIDI0OTEwNSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3Rh dGljL2pzL3RpbWVsaW5lLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsMjEgKzIwNSwyMyBAQCBm dW5jdGlvbiB4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVwb3NpdG9yCiAgICAgICAgIH0pOwogICAg IH0KIAorICAgIGZ1bmN0aW9uIG9uU2NhbGVDbGljayhub2RlKSB7CisgICAgICAgIGlmICghbm9k ZS5sYWJlbC5pZCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgbGV0IHBhcmFtcyA9IHsK KyAgICAgICAgICAgIGJyYW5jaDogbm9kZS5sYWJlbC5icmFuY2ggPyBbbm9kZS5sYWJlbC5icmFu Y2hdIDogcXVlcnlUb1BhcmFtcyhkb2N1bWVudC5VUkwuc3BsaXQoJz8nKVsxXSkuYnJhbmNoLAor ICAgICAgICAgICAgdXVpZDogW25vZGUubGFiZWwudXVpZF0sCisgICAgICAgIH0KKyAgICAgICAg aWYgKCFwYXJhbXMuYnJhbmNoKQorICAgICAgICAgICAgZGVsZXRlIHBhcmFtcy5icmFuY2g7Cisg ICAgICAgIGNvbnN0IHF1ZXJ5ID0gcGFyYW1zVG9RdWVyeShwYXJhbXMpOworICAgICAgICB3aW5k b3cub3BlbihgL2NvbW1pdD8ke3F1ZXJ5fWAsICdfYmxhbmsnKTsKKyAgICB9CisKICAgICByZXR1 cm4gVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25lbnQoc2NhbGVGb3JSZXBvc2l0b3J5KHNjYWxl KSwgewogICAgICAgICBpc1RvcDogaXNUb3AsCiAgICAgICAgIGhlaWdodDogMTMwLAotICAgICAg ICBvblNjYWxlQ2xpY2s6IChub2RlKSA9PiB7Ci0gICAgICAgICAgICBpZiAoIW5vZGUubGFiZWwu aWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgbGV0IHBhcmFtcyA9IHsK LSAgICAgICAgICAgICAgICBicmFuY2g6IG5vZGUubGFiZWwuYnJhbmNoID8gW25vZGUubGFiZWwu YnJhbmNoXSA6IHF1ZXJ5VG9QYXJhbXMoZG9jdW1lbnQuVVJMLnNwbGl0KCc/JylbMV0pLmJyYW5j aCwKLSAgICAgICAgICAgICAgICB1dWlkOiBbbm9kZS5sYWJlbC51dWlkXSwKLSAgICAgICAgICAg IH0KLSAgICAgICAgICAgIGlmICghcGFyYW1zLmJyYW5jaCkKLSAgICAgICAgICAgICAgICBkZWxl dGUgcGFyYW1zLmJyYW5jaDsKLSAgICAgICAgICAgIGNvbnN0IHF1ZXJ5ID0gcGFyYW1zVG9RdWVy eShwYXJhbXMpOwotICAgICAgICAgICAgd2luZG93Lm9wZW4oYC9jb21taXQ/JHtxdWVyeX1gLCAn X2JsYW5rJyk7Ci0gICAgICAgIH0sCisgICAgICAgIG9uU2NhbGVDbGljazogb25TY2FsZUNsaWNr LAogICAgICAgICBvblNjYWxlRW50ZXI6IChub2RlLCBldmVudCwgY2FudmFzKSA9PiB7CiAgICAg ICAgICAgICBjb25zdCBzY3JvbGxEZWx0YSA9IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5zY3Jv bGxUb3AgfHwgZG9jdW1lbnQuYm9keS5zY3JvbGxUb3A7CiAgICAgICAgICAgICBUb29sVGlwLnNl dCgKQEAgLTIzMCw3ICsyMzIsOCBAQCBmdW5jdGlvbiB4QXhpc0Zyb21TY2FsZShzY2FsZSwgcmVw b3NpdG9yCiAgICAgICAgICAgICAgICAgPC9kaXY+YCwKICAgICAgICAgICAgICAgICBub2RlLnRp cFBvaW50cy5tYXAoKHBvaW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7eDog Y2FudmFzLnggKyBwb2ludC54LCB5OiBjYW52YXMueSArIHNjcm9sbERlbHRhICsgcG9pbnQueX07 Ci0gICAgICAgICAgICAgICAgfSkKKyAgICAgICAgICAgICAgICB9KSwKKyAgICAgICAgICAgICAg ICAoZXZlbnQpID0+IHtyZXR1cm4gb25TY2FsZUNsaWNrKG5vZGUpO30sCiAgICAgICAgICAgICAp OwogICAgICAgICB9LAogICAgICAgICBvblNjYWxlTGVhdmU6IChldmVudCwgY2FudmFzKSA9PiB7 CkBAIC02MjAsNyArNjIzLDggQEAgY2xhc3MgVGltZWxpbmVGcm9tRW5kcG9pbnQgewogICAgICAg ICAgICAgICAgICAgICA8L2Rpdj5gLAogICAgICAgICAgICAgICAgICAgICBkYXRhLnRpcFBvaW50 cy5tYXAoKHBvaW50KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4ge3g6IGNh bnZhcy54ICsgcG9pbnQueCwgeTogY2FudmFzLnkgKyBzY3JvbGxEZWx0YSArIHBvaW50Lnl9Owot ICAgICAgICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgICAgICAgICB9KSwKKyAgICAgICAg ICAgICAgICAgICAgKGV2ZW50KSA9PiB7b25Eb3RDbGlja0ZhY3RvcnkoY29uZmlndXJhdGlvbiko ZGF0YSk7fSwKICAgICAgICAgICAgICAgICApOwogICAgICAgICAgICAgfQogICAgICAgICB9Cklu ZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90b29sdGlw LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3Rh dGljL2pzL3Rvb2x0aXAuanMJKHJldmlzaW9uIDI0OTEwNSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5 L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3Rvb2x0aXAuanMJKHdvcmtpbmcgY29weSkKQEAg LTM1LDYgKzM1LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgIGNvbnN0cnVjdG9yKCkgewogICAg ICAgICB0aGlzLnJlZiA9IG51bGw7CiAgICAgICAgIHRoaXMuYXJyb3cgPSBudWxsOworICAgICAg ICB0aGlzLm9uQXJyb3dDbGljayA9IG51bGw7CiAgICAgfQogICAgIHRvU3RyaW5nKCkgewogICAg ICAgICBjb25zdCBzZWxmID0gdGhpczsKQEAgLTk5LDkgKzEwMCwxOSBAQCBjbGFzcyBfVG9vbFRp cCB7CiAgICAgICAgICAgICBvblN0YXRlVXBkYXRlOiAoZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0 ZSkgPT4gewogICAgICAgICAgICAgICAgIGlmICghc3RhdGUuZGlyZWN0aW9uIHx8ICFzdGF0ZS5s b2NhdGlvbikgewogICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnN0eWxlLmRpc3BsYXkgPSAn bm9uZSc7CisgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQub25jbGljayA9IG51bGw7CisgICAg ICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuY3Vyc29yID0gbnVsbDsKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgICAgIGlm IChzZWxmLm9uQXJyb3dDbGljaykgeworICAgICAgICAgICAgICAgICAgICBlbGVtZW50Lm9uY2xp Y2sgPSBzZWxmLm9uQXJyb3dDbGljazsKKyAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHls ZS5jdXJzb3IgPSAncG9pbnRlcic7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICAgICAgZWxlbWVudC5vbmNsaWNrID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAg ZWxlbWVudC5zdHlsZS5jdXJzb3IgPSBudWxsOworICAgICAgICAgICAgICAgIH0KKwogICAgICAg ICAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0ID0gW2B0b29sdGlwIGFycm93LSR7c3RhdGUuZGly ZWN0aW9ufWBdOwogICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUubGVmdCA9IGAke3N0YXRl LmxvY2F0aW9uLnggLSAxNX1weGA7CiAgICAgICAgICAgICAgICAgaWYgKHN0YXRlLmRpcmVjdGlv biA9PSAnZG93bicpCkBAIC0xMTYsNyArMTI3LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAg ICAgICAgPGRpdiBjbGFzcz0idG9vbHRpcC1jb250ZW50IiByZWY9IiR7dGhpcy5yZWZ9Ij4KICAg ICAgICAgICAgIDwvZGl2PmA7CiAgICAgfQotICAgIHNldChjb250ZW50LCBwb2ludHMpIHsKKyAg ICBzZXQoY29udGVudCwgcG9pbnRzLCBvbkFycm93Q2xpY2sgPSBudWxsKSB7CiAgICAgICAgIGlm ICghdGhpcy5yZWYpIHsKICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoJ0Nhbm5vdCBzZXQgVG9v bFRpcCBjb250ZW50LCBubyB0b29sdGlwIG9uIHRoZSBwYWdlJyk7CiAgICAgICAgICAgICByZXR1 cm47CkBAIC0xMjUsNyArMTM2LDcgQEAgY2xhc3MgX1Rvb2xUaXAgewogICAgICAgICAgICAgY29u c29sZS5lcnJvcignVG9vbCB0aXBzIHJlcXVpcmUgYSBsb2NhdGlvbicpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIAorICAgICAgICB0aGlzLm9uQXJyb3dDbGljayA9 IG9uQXJyb3dDbGljazsKICAgICAgICAgdGhpcy5yZWYuc2V0U3RhdGUoe2NvbnRlbnQ6IGNvbnRl bnQsIHBvaW50czogcG9pbnRzfSk7CiAgICAgfQogICAgIHVuc2V0KCkgewo=