182219 2018-01-27 19:53:46 -0800 Web Inspector: Replace Object.shallowMerge with ES2018 spread operator 2018-01-30 16:40:18 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev hi bburg commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1393896 0 nvasilyev 2018-01-27 19:53:46 -0800 Object.shallowMerge defined in Utilities.js is no longer needed with ES2018 spread operator. Object.shallowMerge(a, b) can be replaced with: {...a, ...b} 1393902 1 332488 hi 2018-01-27 22:13:38 -0800 Created attachment 332488 Patch My only hesitation to this is that we might get collisions between keys (such as if we chain an options variable between functions), but I think that will be very rare 1394579 2 332488 bburg 2018-01-30 09:30:52 -0800 Comment on attachment 332488 Patch r=me 1394614 3 332488 joepeck 2018-01-30 10:34:26 -0800 Comment on attachment 332488 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332488&action=review > Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js:68 > - return WI.linkifyNodeReferenceElement(node, link, Object.shallowMerge(options, {displayName})); > + return WI.linkifyNodeReferenceElement(node, link, {...options, displayName}); I find this a little harder to read / understand, but I suppose its fine. 1394827 4 332488 commit-queue 2018-01-30 16:39:24 -0800 Comment on attachment 332488 Patch Clearing flags on attachment: 332488 Committed r227864: <https://trac.webkit.org/changeset/227864> 1394828 5 commit-queue 2018-01-30 16:39:25 -0800 All reviewed patches have been landed. Closing bug. 1394829 6 webkit-bug-importer 2018-01-30 16:40:18 -0800 <rdar://problem/37048353> 332488 2018-01-27 22:13:38 -0800 2018-01-30 16:39:24 -0800 Patch bug-182219-20180127221337.patch text/plain 8067 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZiZWM1OTY4ZTI1NTlkMDBlYTVhZmQzMjIzM2Qx YzFkNzU5YjdhYjYuLjY1OTA5ZjZhOTIwYzQ3NThjNDc3ODQ2YzQ2NWZlYzA4NmYyOGJhOWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTAxLTI3ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlcGxhY2UgT2JqZWN0LnNoYWxsb3dNZXJnZSB3aXRoIEVTMjAxOCBzcHJlYWQgb3BlcmF0 b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjIx OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qczoKKyAgICAgICAgKE9iamVjdC5zaGFsbG93TWVy Z2UpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9ET01VdGlsaXRpZXMu anM6CisgICAgICAgIChXSS5saW5raWZ5Tm9kZVJlZmVyZW5jZSk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5oYW5kbGVQb3NzaWJsZUxpbmtDbGlj ayk6CisgICAgICAgIChXSS5vcGVuVVJMKToKKyAgICAgICAgKFdJLnNob3dTb3VyY2VDb2RlTG9j YXRpb24pOgorICAgICAgICAoV0kuc2hvd09yaWdpbmFsVW5mb3JtYXR0ZWRTb3VyY2VDb2RlTG9j YXRpb24pOgorICAgICAgICAoV0kuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9j YXRpb24pOgorICAgICAgICAoV0kuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlVGV4 dFJhbmdlKToKKyAgICAgICAgKFdJLmxpbmtpZnlMb2NhdGlvbik6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkRPTVRyZWVFbGVt ZW50LnByb3RvdHlwZS5faW5zZXJ0QWRqYWNlbnRIVE1MKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1dlYlNvY2tldENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuV2ViU29ja2V0 Q29udGVudFZpZXcucHJvdG90eXBlLl9hZGRSb3cpOgorCiAyMDE4LTAxLTI2ICBNYXR0IEJha2Vy ICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lbGlu ZXMgY29udGVudCBicm93c2VyIE5hdmlnYXRpb25CYXIgaXMgc3F1YXNoZWQgYXQgbmFycm93IGhl aWdodHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvRE9NVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9ET01VdGlsaXRpZXMuanMKaW5kZXggOWYzMjkwNmRkMzk0Y2Q2ZmZmN2Y1N2ZhZGY4YzEz OGIyNTg5OTU0OC4uNWJiNTIxZDU4NmI4N2I4Y2ZhODMxNTMzNGUzZTQ2ZWJlNzA4MTAyMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9ET01VdGls aXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9E T01VdGlsaXRpZXMuanMKQEAgLTY1LDcgKzY1LDcgQEAgV0kubGlua2lmeU5vZGVSZWZlcmVuY2Ug PSBmdW5jdGlvbihub2RlLCBvcHRpb25zID0ge30pCiAKICAgICBsZXQgbGluayA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICBsaW5rLmFwcGVuZChkaXNwbGF5TmFtZSk7Ci0g ICAgcmV0dXJuIFdJLmxpbmtpZnlOb2RlUmVmZXJlbmNlRWxlbWVudChub2RlLCBsaW5rLCBPYmpl Y3Quc2hhbGxvd01lcmdlKG9wdGlvbnMsIHtkaXNwbGF5TmFtZX0pKTsKKyAgICByZXR1cm4gV0ku bGlua2lmeU5vZGVSZWZlcmVuY2VFbGVtZW50KG5vZGUsIGxpbmssIHsuLi5vcHRpb25zLCBkaXNw bGF5TmFtZX0pOwogfTsKIAogV0kubGlua2lmeU5vZGVSZWZlcmVuY2VFbGVtZW50ID0gZnVuY3Rp b24obm9kZSwgZWxlbWVudCwgb3B0aW9ucyA9IHt9KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDZkZjFjMDc3MGRhMWFkYmI1YzBl ZDY2MTAyMTI0ZjAxNWM0MzhiOWUuLjI4MzcxZjZhM2ZlZWYzZDU5ZjAwMzdkYmVlZDYzMzY1YzEx NTk2NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKQEAgLTc3MywxMCArNzczLDExIEBAIFdJLmhhbmRsZVBvc3NpYmxlTGlua0NsaWNr ID0gZnVuY3Rpb24oZXZlbnQsIGZyYW1lLCBvcHRpb25zID0ge30pCiAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKIAotICAgIHRoaXMub3Bl blVSTChhbmNob3JFbGVtZW50LmhyZWYsIGZyYW1lLCBPYmplY3Quc2hhbGxvd01lcmdlKG9wdGlv bnMsIHsKKyAgICB0aGlzLm9wZW5VUkwoYW5jaG9yRWxlbWVudC5ocmVmLCBmcmFtZSwgeworICAg ICAgICAuLi5vcHRpb25zLAogICAgICAgICBsaW5lTnVtYmVyOiBhbmNob3JFbGVtZW50LmxpbmVO dW1iZXIsCiAgICAgICAgIGlnbm9yZVNlYXJjaFRhYjogIVdJLmlzU2hvd2luZ1NlYXJjaFRhYigp LAotICAgIH0pKTsKKyAgICB9KTsKIAogICAgIHJldHVybiB0cnVlOwogfTsKQEAgLTgxNCw3ICs4 MTUsNyBAQCBXSS5vcGVuVVJMID0gZnVuY3Rpb24odXJsLCBmcmFtZSwgb3B0aW9ucyA9IHt9KQog CiAgICAgaWYgKHJlc291cmNlKSB7CiAgICAgICAgIGxldCBwb3NpdGlvblRvUmV2ZWFsID0gbmV3 IFdJLlNvdXJjZUNvZGVQb3NpdGlvbihvcHRpb25zLmxpbmVOdW1iZXIsIDApOwotICAgICAgICB0 aGlzLnNob3dTb3VyY2VDb2RlKHJlc291cmNlLCBPYmplY3Quc2hhbGxvd01lcmdlKG9wdGlvbnMs IHtwb3NpdGlvblRvUmV2ZWFsfSkpOworICAgICAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHJlc291 cmNlLCB7Li4ub3B0aW9ucywgcG9zaXRpb25Ub1JldmVhbH0pOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC0xMTU1LDMzICsxMTU2LDM3IEBAIFdJLnNob3dTb3VyY2VDb2RlID0gZnVuY3Rp b24oc291cmNlQ29kZSwgb3B0aW9ucyA9IHt9KQogCiBXSS5zaG93U291cmNlQ29kZUxvY2F0aW9u ID0gZnVuY3Rpb24oc291cmNlQ29kZUxvY2F0aW9uLCBvcHRpb25zID0ge30pCiB7Ci0gICAgdGhp cy5zaG93U291cmNlQ29kZShzb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVNvdXJjZUNvZGUsIE9i amVjdC5zaGFsbG93TWVyZ2Uob3B0aW9ucywgeworICAgIHRoaXMuc2hvd1NvdXJjZUNvZGUoc291 cmNlQ29kZUxvY2F0aW9uLmRpc3BsYXlTb3VyY2VDb2RlLCB7CisgICAgICAgIC4uLm9wdGlvbnMs CiAgICAgICAgIHBvc2l0aW9uVG9SZXZlYWw6IHNvdXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5UG9z aXRpb24oKSwKLSAgICB9KSk7CisgICAgfSk7CiB9OwogCiBXSS5zaG93T3JpZ2luYWxVbmZvcm1h dHRlZFNvdXJjZUNvZGVMb2NhdGlvbiA9IGZ1bmN0aW9uKHNvdXJjZUNvZGVMb2NhdGlvbiwgb3B0 aW9ucyA9IHt9KQogewotICAgIHRoaXMuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZUxvY2F0aW9u LnNvdXJjZUNvZGUsIE9iamVjdC5zaGFsbG93TWVyZ2Uob3B0aW9ucywgeworICAgIHRoaXMuc2hv d1NvdXJjZUNvZGUoc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUsIHsKKyAgICAgICAgLi4u b3B0aW9ucywKICAgICAgICAgcG9zaXRpb25Ub1JldmVhbDogc291cmNlQ29kZUxvY2F0aW9uLnBv c2l0aW9uKCksCiAgICAgICAgIGZvcmNlVW5mb3JtYXR0ZWQ6IHRydWUsCi0gICAgfSkpOworICAg IH0pOwogfTsKIAogV0kuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24g PSBmdW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24sIG9wdGlvbnMgPSB7fSkKIHsKLSAgICB0aGlz LnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlLCBPYmplY3Quc2hh bGxvd01lcmdlKG9wdGlvbnMsIHsKKyAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVM b2NhdGlvbi5zb3VyY2VDb2RlLCB7CisgICAgICAgIC4uLm9wdGlvbnMsCiAgICAgICAgIHBvc2l0 aW9uVG9SZXZlYWw6IHNvdXJjZUNvZGVMb2NhdGlvbi5mb3JtYXR0ZWRQb3NpdGlvbigpLAotICAg IH0pKTsKKyAgICB9KTsKIH07CiAKIFdJLnNob3dPcmlnaW5hbE9yRm9ybWF0dGVkU291cmNlQ29k ZVRleHRSYW5nZSA9IGZ1bmN0aW9uKHNvdXJjZUNvZGVUZXh0UmFuZ2UsIG9wdGlvbnMgPSB7fSkK IHsKICAgICB2YXIgdGV4dFJhbmdlVG9TZWxlY3QgPSBzb3VyY2VDb2RlVGV4dFJhbmdlLmZvcm1h dHRlZFRleHRSYW5nZTsKLSAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVUZXh0UmFu Z2Uuc291cmNlQ29kZSwgT2JqZWN0LnNoYWxsb3dNZXJnZShvcHRpb25zLCB7CisgICAgdGhpcy5z aG93U291cmNlQ29kZShzb3VyY2VDb2RlVGV4dFJhbmdlLnNvdXJjZUNvZGUsIHsKKyAgICAgICAg Li4ub3B0aW9ucywKICAgICAgICAgcG9zaXRpb25Ub1JldmVhbDogdGV4dFJhbmdlVG9TZWxlY3Qu c3RhcnRQb3NpdGlvbigpLAogICAgICAgICB0ZXh0UmFuZ2VUb1NlbGVjdCwKLSAgICB9KSk7Cisg ICAgfSk7CiB9OwogCiBXSS5zaG93UmVzb3VyY2VSZXF1ZXN0ID0gZnVuY3Rpb24ocmVzb3VyY2Us IG9wdGlvbnMgPSB7fSkKQEAgLTIzMTMsOSArMjMxOCwxNCBAQCBXSS5saW5raWZ5TG9jYXRpb24g PSBmdW5jdGlvbih1cmwsIHNvdXJjZUNvZGVQb3NpdGlvbiwgb3B0aW9ucyA9IHt9KQogICAgIH0K IAogICAgIGxldCBzb3VyY2VDb2RlTG9jYXRpb24gPSBzb3VyY2VDb2RlLmNyZWF0ZVNvdXJjZUNv ZGVMb2NhdGlvbihzb3VyY2VDb2RlUG9zaXRpb24ubGluZU51bWJlciwgc291cmNlQ29kZVBvc2l0 aW9uLmNvbHVtbk51bWJlcik7Ci0gICAgbGV0IGxpbmtFbGVtZW50ID0gV0kuY3JlYXRlU291cmNl Q29kZUxvY2F0aW9uTGluayhzb3VyY2VDb2RlTG9jYXRpb24sIE9iamVjdC5zaGFsbG93TWVyZ2Uo b3B0aW9ucywge2RvbnRGbG9hdDogdHJ1ZX0pKTsKKyAgICBsZXQgbGlua0VsZW1lbnQgPSBXSS5j cmVhdGVTb3VyY2VDb2RlTG9jYXRpb25MaW5rKHNvdXJjZUNvZGVMb2NhdGlvbiwgeworICAgICAg ICAuLi5vcHRpb25zLAorICAgICAgICBkb250RmxvYXQ6IHRydWUsCisgICAgfSk7CisKICAgICBp ZiAob3B0aW9ucy5jbGFzc05hbWUpCiAgICAgICAgIGxpbmtFbGVtZW50LmNsYXNzTGlzdC5hZGQo b3B0aW9ucy5jbGFzc05hbWUpOworCiAgICAgcmV0dXJuIGxpbmtFbGVtZW50OwogfTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRp ZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGll cy5qcwppbmRleCBkMTc0MDJmZjZjNDlkMmNkNjAzZTA5MDJhZjEwMjM0NDI4ZTY3YjNhLi42OTFk ZDhlYmY2YmM2MTVkYjAyZjk0YWFlYTg0MTU4ZWJjYjc4ZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtODcs MjAgKzg3LDYgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KE9iamVjdCwgInNoYWxsb3dFcXVhbCIs CiAgICAgfQogfSk7CiAKLU9iamVjdC5kZWZpbmVQcm9wZXJ0eShPYmplY3QsICJzaGFsbG93TWVy Z2UiLAotewotICAgIHZhbHVlKGEsIGIpCi0gICAgewotICAgICAgICBsZXQgcmVzdWx0ID0gT2Jq ZWN0LnNoYWxsb3dDb3B5KGEpOwotICAgICAgICBsZXQga2V5cyA9IE9iamVjdC5rZXlzKGIpOwot ICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IGtleXMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KCFyZXN1bHQuaGFzT3duUHJvcGVydHkoa2V5c1tpXSkgfHwgcmVz dWx0W2tleXNbaV1dID09PSBiW2tleXNbaV1dLCBrZXlzW2ldKTsKLSAgICAgICAgICAgIHJlc3Vs dFtrZXlzW2ldXSA9IGJba2V5c1tpXV07Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHJlc3Vs dDsKLSAgICB9Ci19KTsKLQogT2JqZWN0LmRlZmluZVByb3BlcnR5KE9iamVjdC5wcm90b3R5cGUs ICJ2YWx1ZUZvckNhc2VJbnNlbnNpdGl2ZUtleSIsCiB7CiAgICAgdmFsdWUoa2V5KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVs ZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlRWxlbWVudC5qcwppbmRleCAyZTFmYjNhZDc3YjllNWRiYmUwZjdlMDVhNDZiMzIzYjc1ZTQ2 ODZiLi5iOTEwZmYzZGU2OTY0ODRiYTc5NjRmYWY3OGM3ZDIzODM5ZTFiNWE2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVu dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlRWxlbWVudC5qcwpAQCAtMTYwMSw3ICsxNjAxLDcgQEAgV0kuRE9NVHJlZUVsZW1lbnQgPSBj bGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdJLlRyZWVFbGVtZW50CiAgICAgICAgICAgICB0 aGlzLmV4cGFuZCgpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQXNI VE1MKGNvbW1pdENhbGxiYWNrLCBPYmplY3Quc2hhbGxvd01lcmdlKG9wdGlvbnMsIHtwb3NpdGlv bn0pKTsKKyAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQXNIVE1MKGNvbW1pdENhbGxiYWNrLCB7 Li4ub3B0aW9ucywgcG9zaXRpb259KTsKICAgICB9CiAKICAgICBfYWRkSFRNTChldmVudCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1dlYlNv Y2tldENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvV2ViU29ja2V0Q29udGVudFZpZXcuanMKaW5kZXggMGE4ZWE2NGY5MDc0YzFjNGRiMTg2 ZTM1M2M2NTVhNzBmNzQxZjNjNi4uOWRlYzE2ODFmM2QxNjE4OTBlYWZhY2RkN2I4YjRmZGI2M2Ey N2UxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvV2ViU29ja2V0Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0Q29udGVudFZpZXcuanMKQEAgLTEzOSw5ICsxMzks OSBAQCBXSS5XZWJTb2NrZXRDb250ZW50VmlldyA9IGNsYXNzIFdlYlNvY2tldENvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICB7CiAgICAgICAgIGxldCBub2RlOwogICAgICAg ICBpZiAodGhpcy5fc2hvd1RpbWVDb2x1bW4pCi0gICAgICAgICAgICBub2RlID0gbmV3IFdJLldl YlNvY2tldERhdGFHcmlkTm9kZShPYmplY3Quc2hhbGxvd01lcmdlKHtkYXRhLCB0aW1lfSwgYXR0 cmlidXRlcykpOworICAgICAgICAgICAgbm9kZSA9IG5ldyBXSS5XZWJTb2NrZXREYXRhR3JpZE5v ZGUoey4uLmF0dHJpYnV0ZXMsIGRhdGEsIHRpbWV9KTsKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgbm9kZSA9IG5ldyBXSS5XZWJTb2NrZXREYXRhR3JpZE5vZGUoT2JqZWN0LnNoYWxsb3dNZXJn ZSh7ZGF0YX0sIGF0dHJpYnV0ZXMpKTsKKyAgICAgICAgICAgIG5vZGUgPSBuZXcgV0kuV2ViU29j a2V0RGF0YUdyaWROb2RlKHsuLi5hdHRyaWJ1dGVzLCBkYXRhfSk7CiAKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuYXBwZW5kQ2hpbGQobm9kZSk7CiAK