158330 2016-06-02 17:21:38 -0700 Web Inspector: Modernize Array.prototype.every/some callsites to arrow functions 2016-06-02 18:17:43 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1198756 0 joepeck 2016-06-02 17:21:38 -0700 * SUMMARY Modernize Array.prototype.every/some callsites to arrow functions. This patch addresses cases of: - Array.prototype.every - Array.prototype.some Before: return this._items.filter(function(item) { return item.selected; }); After: return this._items.filter((item) => item.selected); Things to watch out for: - These Array methods may take an optional `this` object. Arrow functions may override that. 1198757 1 280389 joepeck 2016-06-02 17:22:17 -0700 Created attachment 280389 [PATCH] Proposed Fix 1198773 2 280389 bburg 2016-06-02 17:55:06 -0700 Comment on attachment 280389 [PATCH] Proposed Fix r=me 1198774 3 280389 commit-queue 2016-06-02 18:17:39 -0700 Comment on attachment 280389 [PATCH] Proposed Fix Clearing flags on attachment: 280389 Committed r201630: <http://trac.webkit.org/changeset/201630> 1198775 4 commit-queue 2016-06-02 18:17:43 -0700 All reviewed patches have been landed. Closing bug. 280389 2016-06-02 17:22:17 -0700 2016-06-02 18:17:39 -0700 [PATCH] Proposed Fix modernize-2.patch text/plain 13087 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNiZWFmM2YuLjQwMjhmNzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE2LTA2LTAyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW9kZXJu aXplIEFycmF5LnByb3RvdHlwZS5ldmVyeS9zb21lIGNhbGxzaXRlcyB0byBhcnJvdyBmdW5jdGlv bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMz MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUuX3VwZGF0ZUNvbnRlbnRGbG93RnJvbVBh eWxvYWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2ZpbGVOb2RlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVOb2RlKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9TY29wZUNoYWluTm9kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY29w ZUNoYWluTm9kZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvU3RhY2tUcmFjZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGFja1RyYWNlKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL01vZGVscy9TdHJ1Y3R1cmVEZXNjcmlwdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TdHJ1Y3R1cmVEZXNjcmlwdGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2Rl bHMvVHlwZURlc2NyaXB0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlR5cGVEZXNjcmlw dGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5k LmpzOgorICAgICAgICAoSW5zcGVjdG9yQmFja2VuZC5Db21tYW5kLnByb3RvdHlwZS5zdXBwb3J0 cyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5lci5wcm90b3R5cGUu c2hvd0NvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRp b25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5wcm90b3R5cGUuX2NoZWNrRWxlbWVudHNGb3JQZW5kaW5nVmlld1N0YXRlQ29va2ll LnRyZWVFbGVtZW50TWF0Y2hlc0Nvb2tpZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdh dGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2NoZWNrRWxlbWVudHNGb3JQZW5kaW5nVmlld1N0 YXRlQ29va2llKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlQmFyLnByb3RvdHlwZS5nZXQgc2VsZWN0ZWRJdGVt cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVCYXIucHJvdG90eXBlLmhhc05vbkRlZmF1 bHRJdGVtU2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LmNvbnNvbGUuYXNzZXJ0KTogRGVsZXRlZC4K KworMjAxNi0wNi0wMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVybml6ZSBzb21lIGZ1bmN0aW9uIGV4cHJlc3Npb25z IHRoYXQgYmluZCh0aGlzKSB0byBhcnJvdyBmdW5jdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMxNQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRy ZWVNYW5hZ2VyLmpzCmluZGV4IDBhYmQxODIuLjFjZGE4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RP TVRyZWVNYW5hZ2VyLmpzCkBAIC00OTMsNyArNDkzLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVN YW5hZ2VyID0gY2xhc3MgRE9NVHJlZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0 CiAgICAgX3VwZGF0ZUNvbnRlbnRGbG93RnJvbVBheWxvYWQoY29udGVudEZsb3csIGZsb3dQYXls b2FkKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5v ZGVzLmxlbmd0aCA9PT0gZmxvd1BheWxvYWQuY29udGVudC5sZW5ndGgpOwotICAgICAgICBjb25z b2xlLmFzc2VydChjb250ZW50Rmxvdy5jb250ZW50Tm9kZXMuZXZlcnkoZnVuY3Rpb24obm9kZSwg aSkgeyByZXR1cm4gbm9kZS5pZCA9PT0gZmxvd1BheWxvYWQuY29udGVudFtpXTsgfSkpOworICAg ICAgICBjb25zb2xlLmFzc2VydChjb250ZW50Rmxvdy5jb250ZW50Tm9kZXMuZXZlcnkoKG5vZGUs IGkpID0+IG5vZGUuaWQgPT09IGZsb3dQYXlsb2FkLmNvbnRlbnRbaV0pKTsKIAogICAgICAgICAv LyBGSVhNRTogQ29sbGVjdCB0aGUgcmVnaW9ucyBmcm9tIHRoZSBwYXlsb2FkLgogICAgICAgICBj b250ZW50Rmxvdy5vdmVyc2V0ID0gZmxvd1BheWxvYWQub3ZlcnNldDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9maWxlTm9kZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9maWxlTm9kZS5q cwppbmRleCBmYTcwYzZkLi4xMjk1NDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvZmlsZU5vZGUuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2ZpbGVOb2RlLmpzCkBAIC0zNCw5ICsz NCw5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlTm9kZSA9IGNsYXNzIFByb2ZpbGVOb2RlIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBjb25zb2xlLmFzc2VydChpZCk7CiAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KCFjYWxscyB8fCBjYWxscyBpbnN0YW5jZW9mIEFycmF5KTsKICAg ICAgICAgY29uc29sZS5hc3NlcnQoIWNhbGxzIHx8IGNhbGxzLmxlbmd0aCA+PSAxKTsKLSAgICAg ICAgY29uc29sZS5hc3NlcnQoIWNhbGxzIHx8IGNhbGxzLmV2ZXJ5KGZ1bmN0aW9uKGNhbGwpIHsg cmV0dXJuIGNhbGwgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGVDYWxsOyB9KSk7 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFjYWxscyB8fCBjYWxscy5ldmVyeSgoY2FsbCkgPT4g Y2FsbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Qcm9maWxlTm9kZUNhbGwpKTsKICAgICAgICAg Y29uc29sZS5hc3NlcnQoY2hpbGROb2RlcyBpbnN0YW5jZW9mIEFycmF5KTsKLSAgICAgICAgY29u c29sZS5hc3NlcnQoY2hpbGROb2Rlcy5ldmVyeShmdW5jdGlvbihub2RlKSB7IHJldHVybiBub2Rl IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlByb2ZpbGVOb2RlOyB9KSk7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KGNoaWxkTm9kZXMuZXZlcnkoKG5vZGUpID0+IG5vZGUgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuUHJvZmlsZU5vZGUpKTsKIAogICAgICAgICB0aGlzLl9pZCA9IGlkOwogICAgICAg ICB0aGlzLl90eXBlID0gdHlwZSB8fCBXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGUuVHlwZS5GdW5j dGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9TY29wZUNoYWluTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9TY29wZUNoYWluTm9kZS5qcwppbmRleCA2MTNhOGQxLi5lN2M2ZWRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NvcGVD aGFpbk5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1Njb3BlQ2hhaW5Ob2RlLmpzCkBAIC0zMCw3ICszMCw3IEBAIFdlYkluc3BlY3Rvci5TY29w ZUNoYWluTm9kZSA9IGNsYXNzIFNjb3BlQ2hhaW5Ob2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9i amVjdAogICAgICAgICBzdXBlcigpOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiB0 eXBlID09PSAic3RyaW5nIik7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KG9iamVjdHMuZXZlcnko ZnVuY3Rpb24oeCkgeyByZXR1cm4geCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZW1vdGVPYmpl Y3Q7IH0pKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQob2JqZWN0cy5ldmVyeSgoeCkgPT4geCBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QpKTsKIAogICAgICAgICBpZiAodHlw ZSBpbiBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbk5vZGUuVHlwZSkKICAgICAgICAgICAgIHR5cGUg PSBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbk5vZGUuVHlwZVt0eXBlXTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TdGFja1RyYWNlLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMK aW5kZXggNDgzMzkwMy4uYWQ0YWVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMKQEAgLTI5LDcgKzI5LDcg QEAgV2ViSW5zcGVjdG9yLlN0YWNrVHJhY2UgPSBjbGFzcyBTdGFja1RyYWNlIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogICAgIHsKICAgICAgICAgc3VwZXIoKTsKIAotICAgICAgICBjb25z b2xlLmFzc2VydChjYWxsRnJhbWVzICYmIGNhbGxGcmFtZXMuZXZlcnkoZnVuY3Rpb24oY2FsbEZy YW1lKSB7IHJldHVybiBjYWxsRnJhbWUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ2FsbEZyYW1l OyB9KSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNhbGxGcmFtZXMgJiYgY2FsbEZyYW1lcy5l dmVyeSgoY2FsbEZyYW1lKSA9PiBjYWxsRnJhbWUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ2Fs bEZyYW1lKSk7CiAKICAgICAgICAgdGhpcy5fY2FsbEZyYW1lcyA9IGNhbGxGcmFtZXM7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L1N0cnVjdHVyZURlc2NyaXB0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL1N0cnVjdHVyZURlc2NyaXB0aW9uLmpzCmluZGV4IDljZGZjYTMuLjhiMzI5 NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9TdHJ1Y3R1cmVEZXNjcmlwdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvU3RydWN0dXJlRGVzY3JpcHRpb24uanMKQEAgLTI5LDggKzI5LDgg QEAgV2ViSW5zcGVjdG9yLlN0cnVjdHVyZURlc2NyaXB0aW9uID0gY2xhc3MgU3RydWN0dXJlRGVz Y3JpcHRpb24gZXh0ZW5kcyBXZWJJbnNwZWMKICAgICB7CiAgICAgICAgIHN1cGVyKCk7CiAKLSAg ICAgICAgY29uc29sZS5hc3NlcnQoIWZpZWxkcyB8fCBmaWVsZHMuZXZlcnkoZnVuY3Rpb24oeCkg eyByZXR1cm4gdHlwZW9mIHggPT09ICJzdHJpbmciOyB9KSk7Ci0gICAgICAgIGNvbnNvbGUuYXNz ZXJ0KCFvcHRpb25hbEZpZWxkcyB8fCBvcHRpb25hbEZpZWxkcy5ldmVyeShmdW5jdGlvbih4KSB7 IHJldHVybiB0eXBlb2YgeCA9PT0gInN0cmluZyI7IH0pKTsKKyAgICAgICAgY29uc29sZS5hc3Nl cnQoIWZpZWxkcyB8fCBmaWVsZHMuZXZlcnkoKHgpID0+IHR5cGVvZiB4ID09PSAic3RyaW5nIikp OworICAgICAgICBjb25zb2xlLmFzc2VydCghb3B0aW9uYWxGaWVsZHMgfHwgb3B0aW9uYWxGaWVs ZHMuZXZlcnkoKHgpID0+IHR5cGVvZiB4ID09PSAic3RyaW5nIikpOwogICAgICAgICBjb25zb2xl LmFzc2VydCghY29uc3RydWN0b3JOYW1lIHx8IHR5cGVvZiBjb25zdHJ1Y3Rvck5hbWUgPT09ICJz dHJpbmciKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXByb3RvdHlwZVN0cnVjdHVyZSB8fCBw cm90b3R5cGVTdHJ1Y3R1cmUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU3RydWN0dXJlRGVzY3Jp cHRpb24pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvVHlwZURlc2NyaXB0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1R5cGVEZXNjcmlwdGlvbi5qcwppbmRleCBmOGZjNmNkLi5hMjIwZDZm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv VHlwZURlc2NyaXB0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9UeXBlRGVzY3JpcHRpb24uanMKQEAgLTMxLDcgKzMxLDcgQEAgV2ViSW5zcGVj dG9yLlR5cGVEZXNjcmlwdGlvbiA9IGNsYXNzIFR5cGVEZXNjcmlwdGlvbiBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplY3QKIAogICAgICAgICBjb25zb2xlLmFzc2VydCghbGVhc3RDb21tb25BbmNl c3RvciB8fCB0eXBlb2YgbGVhc3RDb21tb25BbmNlc3RvciA9PT0gInN0cmluZyIpOwogICAgICAg ICBjb25zb2xlLmFzc2VydCghdHlwZVNldCB8fCB0eXBlU2V0IGluc3RhbmNlb2YgV2ViSW5zcGVj dG9yLlR5cGVTZXQpOwotICAgICAgICBjb25zb2xlLmFzc2VydCghc3RydWN0dXJlcyB8fCBzdHJ1 Y3R1cmVzLmV2ZXJ5KGZ1bmN0aW9uKHgpIHsgcmV0dXJuIHggaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuU3RydWN0dXJlRGVzY3JpcHRpb247IH0pKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoIXN0 cnVjdHVyZXMgfHwgc3RydWN0dXJlcy5ldmVyeSgoeCkgPT4geCBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5TdHJ1Y3R1cmVEZXNjcmlwdGlvbikpOwogCiAgICAgICAgIHRoaXMuX2xlYXN0Q29tbW9u QW5jZXN0b3IgPSBsZWFzdENvbW1vbkFuY2VzdG9yIHx8IG51bGw7CiAgICAgICAgIHRoaXMuX3R5 cGVTZXQgPSB0eXBlU2V0IHx8IG51bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yQmFja2VuZC5qcwpp bmRleCA4YjhmMDM1Li5jZWMyMzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckJhY2tlbmQuanMK QEAgLTUyNiw5ICs1MjYsNyBAQCBJbnNwZWN0b3JCYWNrZW5kLkNvbW1hbmQucHJvdG90eXBlID0g ewogICAgICAgICAndXNlIHN0cmljdCc7CiAKICAgICAgICAgdmFyIGluc3RhbmNlID0gdGhpcy5f aW5zdGFuY2U7Ci0gICAgICAgIHJldHVybiBpbnN0YW5jZS5jYWxsU2lnbmF0dXJlLnNvbWUoZnVu Y3Rpb24ocGFyYW1ldGVyKSB7Ci0gICAgICAgICAgICByZXR1cm4gcGFyYW1ldGVyWyJuYW1lIl0g PT09IHBhcmFtZXRlck5hbWU7Ci0gICAgICAgIH0pOworICAgICAgICByZXR1cm4gaW5zdGFuY2Uu Y2FsbFNpZ25hdHVyZS5zb21lKChwYXJhbWV0ZXIpID0+IHBhcmFtZXRlclsibmFtZSJdID09PSBw YXJhbWV0ZXJOYW1lKTsKICAgICB9LAogCiAgICAgLy8gUHJpdmF0ZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWlu ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 Vmlld0NvbnRhaW5lci5qcwppbmRleCBhM2M3YTllLi44YmNhM2MxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5l ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50Vmlld0NvbnRhaW5lci5qcwpAQCAtMTI3LDEwICsxMjcsNyBAQCBXZWJJbnNwZWN0b3IuQ29u dGVudFZpZXdDb250YWluZXIgPSBjbGFzcyBDb250ZW50Vmlld0NvbnRhaW5lciBleHRlbmRzIFdl Ykluc3BlYwogICAgICAgICAvLyBEaXNhc3NvY2lhdGUgd2l0aCB0aGUgcmVtb3ZlZCBjb250ZW50 IHZpZXdzLgogICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IHJlbW92ZWRFbnRyaWVzLmxlbmd0 aDsgKytpKSB7CiAgICAgICAgICAgICAvLyBTa2lwIGRpc2Fzc29jaWF0aW9uIGlmIHRoaXMgY29u dGVudCB2aWV3IGlzIHN0aWxsIGluIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KLSAgICAgICAgICAg IGxldCBzaG91bGREaXNzb2NpYXRlQ29udGVudFZpZXcgPSAhdGhpcy5fYmFja0ZvcndhcmRMaXN0 LnNvbWUoZnVuY3Rpb24oZXhpc3RpbmdFbnRyeSkgewotICAgICAgICAgICAgICAgIHJldHVybiBl eGlzdGluZ0VudHJ5LmNvbnRlbnRWaWV3ID09PSByZW1vdmVkRW50cmllc1tpXS5jb250ZW50Vmll dzsKLSAgICAgICAgICAgIH0pOwotCisgICAgICAgICAgICBsZXQgc2hvdWxkRGlzc29jaWF0ZUNv bnRlbnRWaWV3ID0gIXRoaXMuX2JhY2tGb3J3YXJkTGlzdC5zb21lKChleGlzdGluZ0VudHJ5KSA9 PiBleGlzdGluZ0VudHJ5LmNvbnRlbnRWaWV3ID09PSByZW1vdmVkRW50cmllc1tpXS5jb250ZW50 Vmlldyk7CiAgICAgICAgICAgICBpZiAoc2hvdWxkRGlzc29jaWF0ZUNvbnRlbnRWaWV3KQogICAg ICAgICAgICAgICAgIHRoaXMuX2Rpc2Fzc29jaWF0ZUZyb21Db250ZW50VmlldyhyZW1vdmVkRW50 cmllc1tpXS5jb250ZW50VmlldywgcmVtb3ZlZEVudHJpZXNbaV0udG9tYnN0b25lKTsKICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggNzkzZWRjMS4u ZmEyNjYwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC03NTgs MTggKzc1OCwxNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNz IE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICAgICAgICAgIHJl cHJlc2VudGVkT2JqZWN0LnNhdmVJZGVudGl0eVRvQ29va2llKGNhbmRpZGF0ZU9iamVjdENvb2tp ZSk7CiAKICAgICAgICAgICAgIHZhciBjYW5kaWRhdGVDb29raWVLZXlzID0gT2JqZWN0LmtleXMo Y2FuZGlkYXRlT2JqZWN0Q29va2llKTsKLSAgICAgICAgICAgIHJldHVybiBjYW5kaWRhdGVDb29r aWVLZXlzLmxlbmd0aCAmJiBjYW5kaWRhdGVDb29raWVLZXlzLmV2ZXJ5KGZ1bmN0aW9uIHZhbHVl c01hdGNoRm9yS2V5KGtleSkgewotICAgICAgICAgICAgICAgIHJldHVybiBjYW5kaWRhdGVPYmpl Y3RDb29raWVba2V5XSA9PT0gY29va2llW2tleV07Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIHJldHVybiBjYW5kaWRhdGVDb29raWVLZXlzLmxlbmd0aCAmJiBjYW5kaWRhdGVDb29raWVL ZXlzLmV2ZXJ5KChrZXkpID0+IGNhbmRpZGF0ZU9iamVjdENvb2tpZVtrZXldID09PSBjb29raWVb a2V5XSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgbWF0Y2hlZEVsZW1lbnQgPSBudWxsOwot ICAgICAgICB0cmVlRWxlbWVudHMuc29tZShmdW5jdGlvbihlbGVtZW50KSB7CisgICAgICAgIHRy ZWVFbGVtZW50cy5zb21lKChlbGVtZW50KSA9PiB7CiAgICAgICAgICAgICBpZiAodHJlZUVsZW1l bnRNYXRjaGVzQ29va2llLmNhbGwodGhpcywgZWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBt YXRjaGVkRWxlbWVudCA9IGVsZW1lbnQ7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgICAgICB9Ci0gICAgICAgIH0sIHRoaXMpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9KTsKIAogICAgICAgICBpZiAobWF0Y2hlZEVsZW1lbnQpIHsKICAgICAgICAg ICAgIGxldCBkaWRTaG93Q29udGVudFZpZXcgPSB0aGlzLnNob3dEZWZhdWx0Q29udGVudFZpZXdG b3JUcmVlRWxlbWVudChtYXRjaGVkRWxlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmpzCmluZGV4IGVkZTY5ODguLjlm MzY3MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Njb3BlQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Njb3BlQmFyLmpzCkBAIC04MSwxNiArODEsMTIgQEAgV2ViSW5zcGVjdG9yLlNjb3Bl QmFyID0gY2xhc3MgU2NvcGVCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvbkl0ZW0K IAogICAgIGdldCBzZWxlY3RlZEl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9p dGVtcy5maWx0ZXIoZnVuY3Rpb24oaXRlbSkgewotICAgICAgICAgICAgcmV0dXJuIGl0ZW0uc2Vs ZWN0ZWQ7Ci0gICAgICAgIH0pOworICAgICAgICByZXR1cm4gdGhpcy5faXRlbXMuZmlsdGVyKChp dGVtKSA9PiBpdGVtLnNlbGVjdGVkKTsKICAgICB9CiAKICAgICBoYXNOb25EZWZhdWx0SXRlbVNl bGVjdGVkKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9pdGVtcy5zb21lKGZ1bmN0aW9u KGl0ZW0pIHsKLSAgICAgICAgICAgIHJldHVybiBpdGVtLnNlbGVjdGVkICYmIGl0ZW0gIT09IHRo aXMuX2RlZmF1bHRJdGVtOwotICAgICAgICB9LCB0aGlzKTsKKyAgICAgICAgcmV0dXJuIHRoaXMu X2l0ZW1zLnNvbWUoKGl0ZW0pID0+IGl0ZW0uc2VsZWN0ZWQgJiYgaXRlbSAhPT0gdGhpcy5fZGVm YXVsdEl0ZW0pOwogICAgIH0KIAogICAgIC8vIFByaXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMK aW5kZXggM2Q3NDI0Ni4uZDI3NjZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKQEAgLTI4LDEw ICsyOCwxMCBAQCBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUYWJDb250ZW50 VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogICAgIGNvbnN0cnVjdG9yKGlkZW50 aWZpZXIsIHN0eWxlQ2xhc3NOYW1lcywgdGFiQmFySXRlbSwgbmF2aWdhdGlvblNpZGViYXJQYW5l bCwgZGV0YWlsc1NpZGViYXJQYW5lbHMpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0 eXBlb2YgaWRlbnRpZmllciA9PT0gInN0cmluZyIpOwotICAgICAgICBjb25zb2xlLmFzc2VydCh0 eXBlb2Ygc3R5bGVDbGFzc05hbWVzID09PSAic3RyaW5nIiB8fCBzdHlsZUNsYXNzTmFtZXMuZXZl cnkoZnVuY3Rpb24oY2xhc3NOYW1lKSB7IHJldHVybiB0eXBlb2YgY2xhc3NOYW1lID09PSAic3Ry aW5nIjsgfSkpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2Ygc3R5bGVDbGFzc05hbWVz ID09PSAic3RyaW5nIiB8fCBzdHlsZUNsYXNzTmFtZXMuZXZlcnkoKGNsYXNzTmFtZSkgPT4gdHlw ZW9mIGNsYXNzTmFtZSA9PT0gInN0cmluZyIpKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGFi QmFySXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJCYXJJdGVtKTsKICAgICAgICAgY29u c29sZS5hc3NlcnQoIW5hdmlnYXRpb25TaWRlYmFyUGFuZWwgfHwgbmF2aWdhdGlvblNpZGViYXJQ YW5lbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsKTsKLSAg ICAgICAgY29uc29sZS5hc3NlcnQoIWRldGFpbHNTaWRlYmFyUGFuZWxzIHx8IGRldGFpbHNTaWRl YmFyUGFuZWxzLmV2ZXJ5KGZ1bmN0aW9uKGRldGFpbHNTaWRlYmFyUGFuZWwpIHsgcmV0dXJuIGRl dGFpbHNTaWRlYmFyUGFuZWwgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NpZGViYXJQ YW5lbDsgfSkpOworICAgICAgICBjb25zb2xlLmFzc2VydCghZGV0YWlsc1NpZGViYXJQYW5lbHMg fHwgZGV0YWlsc1NpZGViYXJQYW5lbHMuZXZlcnkoKGRldGFpbHNTaWRlYmFyUGFuZWwpID0+IGRl dGFpbHNTaWRlYmFyUGFuZWwgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NpZGViYXJQ YW5lbCkpOwogCiAgICAgICAgIHN1cGVyKG51bGwpOwogCg==