223145 2021-03-12 16:14:35 -0800 Adopt DDMacAction instead of DDAction on macOS 2021-03-13 01:03:12 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton benjamin cdumez cmarcelo darin ews-watchlist megan_gardner webkit-bug-importer oldest_to_newest 1739057 0 thorton 2021-03-12 16:14:35 -0800 Adopt DDMacAction instead of DDAction on macOS 1739058 1 423090 thorton 2021-03-12 16:15:06 -0800 Created attachment 423090 Patch 1739059 2 thorton 2021-03-12 16:15:08 -0800 <rdar://problem/70127512> 1739063 3 423090 darin 2021-03-12 16:38:21 -0800 Comment on attachment 423090 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423090&action=review > Source/WebCore/PAL/pal/spi/mac/DataDetectorsSPI.h:108 > @property (readonly) NSString *actionUTI; Do we need something that declares -[DDMacAction actionUTI] for the non-Apple-internal-SDK case? 1739067 4 thorton 2021-03-12 16:52:51 -0800 (In reply to Darin Adler from comment #3) > Comment on attachment 423090 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=423090&action=review > > > Source/WebCore/PAL/pal/spi/mac/DataDetectorsSPI.h:108 > > @property (readonly) NSString *actionUTI; > > Do we need something that declares -[DDMacAction actionUTI] for the > non-Apple-internal-SDK case? We do... eventually, when we need to support HAVE_DATA_DETECTORS_MAC_ACTION in open source builds. See 70127512 for why this is currently not possible. 1739108 5 ews-feeder 2021-03-12 21:26:03 -0800 commit-queue failed to commit attachment 423090 to WebKit repository. To retry, please set cq+ flag again. 1739123 6 ews-feeder 2021-03-13 01:03:09 -0800 Committed r274380: <https://commits.webkit.org/r274380> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423090. 423090 2021-03-12 16:15:06 -0800 2021-03-13 01:03:11 -0800 Patch bug-223145-20210312161505.patch text/plain 7672 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNjOTg1Mjg4N2MyY2JkNjJhZDhmZWY3 ZGNhMGMxZTZhMmQwNzYzMjAuLjc5MmZkMDUyNjIxMzk1ZmY0OTY0ZTc1OGEzOTRjMWQ0Y2RhOGI4 NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMTIgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRvcHQgRERNYWNBY3Rpb24gaW5zdGVhZCBv ZiBEREFjdGlvbiBvbiBtYWNPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MDEyNzUxMj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0 Zm9ybUhhdmUuaDoKKwogMjAyMS0wMy0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlZHVjZSBtYXhpbXVtIEhhc2hUYWJsZSBlbnRyeSBz aXplIHRvIDQwMCBieXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggZGNlYzYwMjMyMWNlNDBlYzFi MzgyNTAzMjg3OTNjMDZmZjJlMTE5Yy4uNTdiZjc0OTNjN2E4NTFhOGFhMTZjNDI4ZjBlMTRlN2Jk YWU2ZDQ5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMTIg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRvcHQg RERNYWNBY3Rpb24gaW5zdGVhZCBvZiBEREFjdGlvbiBvbiBtYWNPUworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTQ1CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS83MDEyNzUxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBhbC9zcGkvbWFjL0RhdGFEZXRlY3RvcnNTUEkuaDoKKwogMjAyMS0wMy0x MCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHBsdW1i aW5nIGZvciBgZGVmYXVsdFBsYXliYWNrUmF0ZWAgdG8gQVZLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNzMwN2Qx ZTliN2ZkZTNhMmZlZWY3NjJhMTY5NDNlZDg4MjVlZmEyYi4uYmUwOGYwNzM5YTg1MWMxMmZlMDM4 YTUzMTllMGM5ZDQwOThlODA2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wMy0x MiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBBZG9w dCBERE1hY0FjdGlvbiBpbnN0ZWFkIG9mIEREQWN0aW9uIG9uIG1hY09TCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMxNDUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzcwMTI3NTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogUGxhdGZvcm0vbWFjL01lbnVVdGlsaXRpZXMubW06CisgICAgICAgIChX ZWJLaXQ6OmFjdGlvbkZvck1lbnVJdGVtKToKKyAgICAgICAgKFdlYktpdDo6bWVudUl0ZW1Gb3JU ZWxlcGhvbmVOdW1iZXIpOgorICAgICAgICAoV2ViS2l0OjptZW51Rm9yVGVsZXBob25lTnVtYmVy KToKKyAgICAgICAgQWRvcHQgdGhlIG5ldyBjbGFzcyBuYW1lLCB3aGVuIGF2YWlsYWJsZS4KKwog MjAyMS0wMy0xMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIGZpeCBkZWJ1ZyBhc3NlcnRpb24gb24gYm90cyBhZnRlciByMjc0MzIzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9Q bGF0Zm9ybUhhdmUuaAppbmRleCA1YjBmNDRhMzlkMTU3OTc1ODgyNjc1NjM5NWM0MzIxNTFjMjlh ZjEyLi4zNDE3MTgzM2UzY2MxNDY2ODgwZjI0YThiZTVjZjIwODY4ZTcwOTZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybUhhdmUuaApAQCAtOTE2LDYgKzkxNiw3IEBACiAKICNpZiBQTEFURk9STShNQUMpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTIwMDAwCiAjZGVmaW5lIEhBVkVfU1RB VElDX0ZPTlRfUkVHSVNUUlkgMQorI2RlZmluZSBIQVZFX0RBVEFfREVURUNUT1JTX01BQ19BQ1RJ T04gMQogI2VuZGlmCiAKICNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEyMDAwMCkgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9zcGkvbWFjL0RhdGFEZXRlY3RvcnNTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv c3BpL21hYy9EYXRhRGV0ZWN0b3JzU1BJLmgKaW5kZXggMDJhOTgyOGU3ZmZhNDQzNDNhZDdiYzIw NTJlNDJhODM3MjA1YTZiMy4uZDVmNzViYTc1NjM0MGI2OTk2MGI3YTYxYjQ5NzZlYjNmM2I4NDZj ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL0RhdGFEZXRlY3Rv cnNTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvRGF0YURldGVjdG9y c1NQSS5oCkBAIC0zOSw2ICszOSwxMCBAQAogI2ltcG9ydCA8RGF0YURldGVjdG9ycy9EREFjdGlv bnNNYW5hZ2VyLmg+CiAjaW1wb3J0IDxEYXRhRGV0ZWN0b3JzL0RESGlnaGxpZ2h0RHJhd2luZy5o PgogCisjaWYgSEFWRShEQVRBX0RFVEVDVE9SU19NQUNfQUNUSU9OKQorI2ltcG9ydCA8RGF0YURl dGVjdG9ycy9ERE1hY0FjdGlvbi5oPgorI2VuZGlmCisKICNlbHNlIC8vICFVU0UoQVBQTEVfSU5U RVJOQUxfU0RLKQogCiBAaW50ZXJmYWNlIEREQWN0aW9uQ29udGV4dCA6IE5TT2JqZWN0IDxOU0Nv cHlpbmcsIE5TU2VjdXJlQ29kaW5nPgpAQCAtOTgsMTkgKzEwMiwyNiBAQCBXVEZfRVhURVJOX0Nf RU5ECiB0eXBlZGVmIHN0cnVjdCBfX0RESGlnaGxpZ2h0ICpEREhpZ2hsaWdodFJlZjsKIHR5cGVk ZWYgTlNVSW50ZWdlciBEREhpZ2hsaWdodFN0eWxlOwogCisjaWYgIUhBVkUoREFUQV9ERVRFQ1RP UlNfTUFDX0FDVElPTikKIEBpbnRlcmZhY2UgRERBY3Rpb24gOiBOU09iamVjdAogCiBAcHJvcGVy dHkgKHJlYWRvbmx5KSBOU1N0cmluZyAqYWN0aW9uVVRJOwogCiBAZW5kCisjZW5kaWYKIAogU09G VF9MSU5LX1BSSVZBVEVfRlJBTUVXT1JLX09QVElPTkFMKERhdGFEZXRlY3RvcnMpCiBTT0ZUX0xJ TktfUFJJVkFURV9GUkFNRVdPUktfT1BUSU9OQUwoRGF0YURldGVjdG9yc0NvcmUpCiAKLVNPRlRf TElOS19DTEFTU19PUFRJT05BTChEYXRhRGV0ZWN0b3JzLCBEREFjdGlvbikKIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChEYXRhRGV0ZWN0b3JzLCBEREFjdGlvbkNvbnRleHQpCiBTT0ZUX0xJTktf Q0xBU1NfT1BUSU9OQUwoRGF0YURldGVjdG9ycywgRERBY3Rpb25zTWFuYWdlcikKIAorI2lmIEhB VkUoREFUQV9ERVRFQ1RPUlNfTUFDX0FDVElPTikKK1NPRlRfTElOS19DTEFTU19PUFRJT05BTChE YXRhRGV0ZWN0b3JzLCBERE1hY0FjdGlvbikKKyNlbHNlCitTT0ZUX0xJTktfQ0xBU1NfT1BUSU9O QUwoRGF0YURldGVjdG9ycywgRERBY3Rpb24pCisjZW5kaWYKKwogU09GVF9MSU5LX0NPTlNUQU5U KERhdGFEZXRlY3RvcnNDb3JlLCBEREJpbmRlclBob25lTnVtYmVyS2V5LCBDRlN0cmluZ1JlZikK ICNpZiBIQVZFKEREX0hJR0hMSUdIVF9DUkVBVEVfV0lUSF9TQ0FMRSkKIFNPRlRfTElOSyhEYXRh RGV0ZWN0b3JzLCBEREhpZ2hsaWdodENyZWF0ZVdpdGhSZWN0c0luVmlzaWJsZVJlY3RXaXRoU3R5 bGVTY2FsZUFuZERpcmVjdGlvbiwgRERIaWdobGlnaHRSZWYsIChDRkFsbG9jYXRvclJlZiBhbGxv Y2F0b3IsIENHUmVjdCogcmVjdHMsIENGSW5kZXggY291bnQsIENHUmVjdCBnbG9iYWxWaXNpYmxl UmVjdCwgRERIaWdobGlnaHRTdHlsZSBzdHlsZSwgQm9vbGVhbiB3aXRoQnV0dG9uLCBOU1dyaXRp bmdEaXJlY3Rpb24gd3JpdGluZ0RpcmVjdGlvbiwgQm9vbGVhbiBlbmRzV2l0aEVPTCwgQm9vbGVh biBmbGlwcGVkLCBDR0Zsb2F0IHNjYWxlKSwgKGFsbG9jYXRvciwgcmVjdHMsIGNvdW50LCBnbG9i YWxWaXNpYmxlUmVjdCwgc3R5bGUsIHdpdGhCdXR0b24sIHdyaXRpbmdEaXJlY3Rpb24sIGVuZHNX aXRoRU9MLCBmbGlwcGVkLCBzY2FsZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtL21hYy9NZW51VXRpbGl0aWVzLm1tIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9tYWMvTWVu dVV0aWxpdGllcy5tbQppbmRleCBjZGE4YjBlOTAyYzY0ZmM0NGZjN2M4YzMwMGU1Y2I5NGJiN2Ri OTZmLi4xMmY1ZDIyYTY5MDllN2VlOTM4ZjdmZDljMjZkZjdlNjc3MWNkMTNkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vbWFjL01lbnVVdGlsaXRpZXMubW0KQEAgLTQ5LDYgKzQ5LDI5IEBA IE5TU3RyaW5nICptZW51SXRlbVRpdGxlRm9yVGVsZXBob25lTnVtYmVyR3JvdXAoKQogICAgIHJl dHVybiBbZ2V0VFVDYWxsQ2xhc3MoKSBzdXBwbGVtZW50YWxEaWFsVGVsZXBob255Q2FsbFN0cmlu Z107CiB9CiAKKyNpZiBIQVZFKERBVEFfREVURUNUT1JTX01BQ19BQ1RJT04pCitzdGF0aWMgRERN YWNBY3Rpb24gKmFjdGlvbkZvck1lbnVJdGVtKE5TTWVudUl0ZW0gKml0ZW0pCisjZWxzZQorc3Rh dGljIEREQWN0aW9uICphY3Rpb25Gb3JNZW51SXRlbShOU01lbnVJdGVtICppdGVtKQorI2VuZGlm Cit7CisgICAgTlNEaWN0aW9uYXJ5ICpyZXByZXNlbnRlZE9iamVjdCA9IGl0ZW0ucmVwcmVzZW50 ZWRPYmplY3Q7CisgICAgaWYgKCFbcmVwcmVzZW50ZWRPYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNE aWN0aW9uYXJ5IGNsYXNzXV0pCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBpZCBhY3Rpb24g PSBbcmVwcmVzZW50ZWRPYmplY3Qgb2JqZWN0Rm9yS2V5OkAiRERBY3Rpb24iXTsKKworI2lmIEhB VkUoREFUQV9ERVRFQ1RPUlNfTUFDX0FDVElPTikKKyAgICBpZiAoIVthY3Rpb24gaXNLaW5kT2ZD bGFzczpnZXRERE1hY0FjdGlvbkNsYXNzKCldKQorICAgICAgICByZXR1cm4gbmlsOworI2Vsc2UK KyAgICBpZiAoIVthY3Rpb24gaXNLaW5kT2ZDbGFzczpnZXREREFjdGlvbkNsYXNzKCldKQorICAg ICAgICByZXR1cm4gbmlsOworI2VuZGlmCisKKyAgICByZXR1cm4gYWN0aW9uOworfQorCiBOU01l bnVJdGVtICptZW51SXRlbUZvclRlbGVwaG9uZU51bWJlcihjb25zdCBTdHJpbmcmIHRlbGVwaG9u ZU51bWJlcikKIHsKICAgICBpZiAoIURhdGFEZXRlY3RvcnNMaWJyYXJ5KCkpCkBAIC01OSwxNSAr ODIsOCBAQCBOU01lbnVJdGVtICptZW51SXRlbUZvclRlbGVwaG9uZU51bWJlcihjb25zdCBTdHJp bmcmIHRlbGVwaG9uZU51bWJlcikKIAogICAgIE5TQXJyYXkgKnByb3Bvc2VkTWVudUl0ZW1zID0g W1tnZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JW YWx1ZTooTlNTdHJpbmcgKil0ZWxlcGhvbmVOdW1iZXIgdHlwZTpnZXREREJpbmRlclBob25lTnVt YmVyS2V5KCkgc2VydmljZTpuaWwgY29udGV4dDphY3Rpb25Db250ZXh0LmdldCgpXTsKICAgICBm b3IgKE5TTWVudUl0ZW0gKml0ZW0gaW4gcHJvcG9zZWRNZW51SXRlbXMpIHsKLSAgICAgICAgTlNE aWN0aW9uYXJ5ICpyZXByZXNlbnRlZE9iamVjdCA9IGl0ZW0ucmVwcmVzZW50ZWRPYmplY3Q7Ci0g ICAgICAgIGlmICghW3JlcHJlc2VudGVkT2JqZWN0IGlzS2luZE9mQ2xhc3M6W05TRGljdGlvbmFy eSBjbGFzc11dKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgRERBY3Rpb24gKmFj dGlvbk9iamVjdCA9IFtyZXByZXNlbnRlZE9iamVjdCBvYmplY3RGb3JLZXk6QCJEREFjdGlvbiJd OwotICAgICAgICBpZiAoIVthY3Rpb25PYmplY3QgaXNLaW5kT2ZDbGFzczpnZXREREFjdGlvbkNs YXNzKCldKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgaWYgKFthY3Rpb25PYmpl Y3QuYWN0aW9uVVRJIGhhc1ByZWZpeDpAImNvbS5hcHBsZS5kaWFsIl0pIHsKKyAgICAgICAgYXV0 byBhY3Rpb24gPSBhY3Rpb25Gb3JNZW51SXRlbShpdGVtKTsKKyAgICAgICAgaWYgKFthY3Rpb24u YWN0aW9uVVRJIGhhc1ByZWZpeDpAImNvbS5hcHBsZS5kaWFsIl0pIHsKICAgICAgICAgICAgIGl0 ZW0udGl0bGUgPSBmb3JtYXR0ZWRQaG9uZU51bWJlclN0cmluZyh0ZWxlcGhvbmVOdW1iZXIpOwog ICAgICAgICAgICAgcmV0dXJuIGl0ZW07CiAgICAgICAgIH0KQEAgLTkwLDE3ICsxMDYsMTAgQEAg UmV0YWluUHRyPE5TTWVudT4gbWVudUZvclRlbGVwaG9uZU51bWJlcihjb25zdCBTdHJpbmcmIHRl bGVwaG9uZU51bWJlcikKIAogICAgIE5TQXJyYXkgKnByb3Bvc2VkTWVudUl0ZW1zID0gW1tnZXRE REFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JWYWx1ZToo TlNTdHJpbmcgKil0ZWxlcGhvbmVOdW1iZXIgdHlwZTpnZXREREJpbmRlclBob25lTnVtYmVyS2V5 KCkgc2VydmljZTpuaWwgY29udGV4dDphY3Rpb25Db250ZXh0LmdldCgpXTsKICAgICBmb3IgKE5T TWVudUl0ZW0gKml0ZW0gaW4gcHJvcG9zZWRNZW51SXRlbXMpIHsKLSAgICAgICAgTlNEaWN0aW9u YXJ5ICpyZXByZXNlbnRlZE9iamVjdCA9IGl0ZW0ucmVwcmVzZW50ZWRPYmplY3Q7Ci0gICAgICAg IGlmICghW3JlcHJlc2VudGVkT2JqZWN0IGlzS2luZE9mQ2xhc3M6W05TRGljdGlvbmFyeSBjbGFz c11dKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgRERBY3Rpb24gKmFjdGlvbk9i amVjdCA9IFtyZXByZXNlbnRlZE9iamVjdCBvYmplY3RGb3JLZXk6QCJEREFjdGlvbiJdOwotICAg ICAgICBpZiAoIVthY3Rpb25PYmplY3QgaXNLaW5kT2ZDbGFzczpnZXREREFjdGlvbkNsYXNzKCld KQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgaWYgKFthY3Rpb25PYmplY3QuYWN0 aW9uVVRJIGhhc1ByZWZpeDpAImNvbS5hcHBsZS5kaWFsIl0pCisgICAgICAgIGF1dG8gYWN0aW9u ID0gYWN0aW9uRm9yTWVudUl0ZW0oaXRlbSk7CisgICAgICAgIGlmIChbYWN0aW9uLmFjdGlvblVU SSBoYXNQcmVmaXg6QCJjb20uYXBwbGUuZGlhbCJdKQogICAgICAgICAgICAgZGlhbEl0ZW0gPSBp dGVtOwotICAgICAgICBlbHNlIGlmIChbYWN0aW9uT2JqZWN0LmFjdGlvblVUSSBoYXNQcmVmaXg6 QCJjb20uYXBwbGUuZmFjZXRpbWUiXSkKKyAgICAgICAgZWxzZSBpZiAoW2FjdGlvbi5hY3Rpb25V VEkgaGFzUHJlZml4OkAiY29tLmFwcGxlLmZhY2V0aW1lIl0pCiAgICAgICAgICAgICBbZmFjZVRp bWVJdGVtcyBhZGRPYmplY3Q6aXRlbV07CiAgICAgfQogCg==