121265 2013-09-12 14:57:25 -0700 Web Inspector: Duplicated color swatches changing autocompletes color names 2013-09-12 16:29:22 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 928513 0 joepeck 2013-09-12 14:57:25 -0700 This is a REGRESSION due to CodeMirror supporting multiple bookmarks at the same position. <https://github.com/marijnh/CodeMirror/commit/96400e8fc7a3d7303715d03078350036fc6f6743> I'll investigate a fix. I likely broke this in an earlier CodeMirror update. 928514 1 webkit-bug-importer 2013-09-12 14:57:46 -0700 <rdar://problem/14979488> 928526 2 joepeck 2013-09-12 15:26:51 -0700 * STEPS TO REPRODUCE 1. Inspect <p> on data:text/html,<p>test 2. In the styles sidebar start typing: "color: b|" 3. Go up/down completion list => duplicate swatches appear * NOTES This also causes problems with checkbox bookmarks. 928528 3 211482 joepeck 2013-09-12 15:28:40 -0700 Created attachment 211482 [PATCH] Proposed Fix 928537 4 211485 joepeck 2013-09-12 15:48:00 -0700 Created attachment 211485 [PATCH] Proposed Fix - Better Code Style 928563 5 211485 commit-queue 2013-09-12 16:29:20 -0700 Comment on attachment 211485 [PATCH] Proposed Fix - Better Code Style Clearing flags on attachment: 211485 Committed r155661: <http://trac.webkit.org/changeset/155661> 928564 6 commit-queue 2013-09-12 16:29:22 -0700 All reviewed patches have been landed. Closing bug. 211482 2013-09-12 15:28:40 -0700 2013-09-12 15:48:00 -0700 [PATCH] Proposed Fix unique-bookmarks.patch text/plain 6427 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlmZTVkZTcuLjMwMWVlODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTA5LTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRHVwbGlj YXRlZCBjb2xvciBzd2F0Y2hlcyBjaGFuZ2luZyBhdXRvY29tcGxldGVzIGNvbG9yIG5hbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjEyNjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb2RlTWlycm9y IGJvb2ttYXJrcyBhdCBwb3NpdGlvbiB1c2VkIHRvIGJlIHVuaXF1ZSBidXQgbm8gbG9uZ2VyIGFy ZS4KKyAgICAgICAgRGVmaW5lIGFuIGV4dGVuc2lvbiB0byBnaXZlIHVzIHVuaXF1ZSBib29rbWFy a3MgYXMgd2UgZXhwZWN0ZWQsIGFuZAorICAgICAgICB1cGRhdGUgYWxsIHRoZSBvbGQgbG9jYXRp b25zIHVzaW5nIHNldEJvb2ttYXJrLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuZGlkRGlzbWlzc1BvcG92ZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlw ZS5fdXBkYXRlVGV4dE1hcmtlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5fY3JlYXRlQ29sb3JTd2F0Y2hl cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Iu cHJvdG90eXBlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvci5wcm90b3R5cGUuZXZlbnQubmV3Q29sb3JUZXh0KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0NvZGVNaXJyb3JBZGRpdGlvbnMuanM6CisKKzIwMTMtMDktMTIgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRh dGUgTGljZW5zZSBjb3B5cmlnaHRzIGluIG1pbmlmaWVkIEphdmFTY3JpcHQKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTI2NAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9DU1NTdHlsZURlY2xhcmF0aW9u VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NTU1N0 eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4IDM1NzQwM2EuLjU0Y2NjYzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCkBAIC0xOTEsNyArMTkxLDcgQEAg V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgZGlkRGlzbWlzc1BvcG92ZXI6IGZ1bmN0aW9uKHBv cG92ZXIpIAorICAgIGRpZERpc21pc3NQb3BvdmVyOiBmdW5jdGlvbihwb3BvdmVyKQogICAgIHsK ICAgICAgICAgaWYgKHBvcG92ZXIgPT09IHRoaXMuX2NvbG9yUGlja2VyUG9wb3ZlcikKICAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9jb2xvclBpY2tlclBvcG92ZXI7CkBAIC0zNjIsNyArMzYyLDcg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBmcm9tID0ge2xpbmU6IGksIGNoOiBtYXRj aC5pbmRleH07CiAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgdG8gPSB7bGluZTogaSwgY2g6 IG1hdGNoLmluZGV4ICsgbWF0Y2hbMF0ubGVuZ3RofTsKIAotICAgICAgICAgICAgICAgICAgICAg ICAgdmFyIGNoZWNrYm94TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5zZXRCb29rbWFyayhmcm9t LCBjaGVja2JveEVsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNoZWNrYm94 TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5zZXRVbmlxdWVCb29rbWFyayhmcm9tLCBjaGVja2Jv eEVsZW1lbnQpOwogICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2tib3hNYXJrZXIuX19wcm9w ZXJ0eUNoZWNrYm94ID0gdHJ1ZTsKIAogICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNvbW1l bnRUZXh0TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5tYXJrVGV4dChmcm9tLCB0byk7CkBAIC00 MzksMTAgKzQzOSwxMCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fY29sb3JTd2F0Y2hDbGlja2VkLmJpbmQodGhpcykp OwogCiAgICAgICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hJbm5lckVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAgICAgIHN3YXRjaElubmVy RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgiYmFja2dyb3VuZC1jb2xvciIsIG1hdGNoWzBdKTsK KyAgICAgICAgICAgICAgICAgICAgc3dhdGNoSW5uZXJFbGVtZW50LnN0eWxlLmJhY2tncm91bmRD b2xvciA9IG1hdGNoWzBdOwogICAgICAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50LmFwcGVu ZENoaWxkKHN3YXRjaElubmVyRWxlbWVudCk7CiAKLSAgICAgICAgICAgICAgICAgICAgdmFyIHN3 YXRjaE1hcmtlciA9IHRoaXMuX2NvZGVNaXJyb3Iuc2V0Qm9va21hcmsoZnJvbSwgc3dhdGNoRWxl bWVudCk7CisgICAgICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hNYXJrZXIgPSB0aGlzLl9jb2Rl TWlycm9yLnNldFVuaXF1ZUJvb2ttYXJrKGZyb20sIHN3YXRjaEVsZW1lbnQpOwogCiAgICAgICAg ICAgICAgICAgICAgIHZhciBjb2xvclRleHRNYXJrZXIgPSB0aGlzLl9jb2RlTWlycm9yLm1hcmtU ZXh0KGZyb20sIHRvKTsKICAgICAgICAgICAgICAgICAgICAgY29sb3JUZXh0TWFya2VyLl9fbWFy a2VkQ29sb3IgPSB0cnVlOwpAQCAtNDg5LDcgKzQ4OSw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjaGVja2Jv eEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgdGhpcy5fcHJvcGVydHlDaGVja2Jv eENoYW5nZWQuYmluZCh0aGlzKSk7CiAgICAgICAgICAgICBjaGVja2JveEVsZW1lbnQuX19jc3NQ cm9wZXJ0eSA9IHByb3BlcnR5OwogCi0gICAgICAgICAgICB2YXIgY2hlY2tib3hNYXJrZXIgPSB0 aGlzLl9jb2RlTWlycm9yLnNldEJvb2ttYXJrKGZyb20sIGNoZWNrYm94RWxlbWVudCk7CisgICAg ICAgICAgICB2YXIgY2hlY2tib3hNYXJrZXIgPSB0aGlzLl9jb2RlTWlycm9yLnNldFVuaXF1ZUJv b2ttYXJrKGZyb20sIGNoZWNrYm94RWxlbWVudCk7CiAgICAgICAgICAgICBjaGVja2JveE1hcmtl ci5fX3Byb3BlcnR5Q2hlY2tib3ggPSB0cnVlOwogICAgICAgICB9CiAKQEAgLTcxMyw3ICs3MTMs NyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBl ID0gewogCiAgICAgICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UobmV3 Q29sb3JUZXh0LCByYW5nZS5mcm9tLCByYW5nZS50byk7CiAKLSAgICAgICAgICAgICAgICAvLyBU aGUgY29sb3IncyB0ZXh0IGZvcm1hdCBjb3VsZCBoYXZlIGNoYW5nZWQsIHNvIHdlIG5lZWQgdG8g dXBkYXRlIHRoZSAicmFuZ2UiIAorICAgICAgICAgICAgICAgIC8vIFRoZSBjb2xvcidzIHRleHQg Zm9ybWF0IGNvdWxkIGhhdmUgY2hhbmdlZCwgc28gd2UgbmVlZCB0byB1cGRhdGUgdGhlICJyYW5n ZSIKICAgICAgICAgICAgICAgICAvLyB2YXJpYWJsZSB0byBhbnRpY2lwYXRlIGEgZGlmZmVyZW50 ICJyYW5nZS50byIgcHJvcGVydHkuCiAgICAgICAgICAgICAgICAgcmFuZ2UudG8uY2ggPSByYW5n ZS5mcm9tLmNoICsgbmV3Q29sb3JUZXh0Lmxlbmd0aDsKIApAQCAtNzUxLDcgKzc1MSw3IEBAIFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB9LmJpbmQodGhpcykpOwogCiAgICAgICAgICAgICB2YXIgYm91bmRzID0gV2Vi SW5zcGVjdG9yLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KHN3YXRjaC5nZXRCb3VuZGluZ0NsaWVu dFJlY3QoKSk7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgdGhpcy5fY29sb3JQaWNrZXJQ b3BvdmVyLmNvbnRlbnQgPSBjb2xvclBpY2tlci5lbGVtZW50OwogICAgICAgICAgICAgdGhpcy5f Y29sb3JQaWNrZXJQb3BvdmVyLnByZXNlbnQoYm91bmRzLCBbV2ViSW5zcGVjdG9yLlJlY3RFZGdl Lk1JTl9YXSk7CiAKQEAgLTgxNSw3ICs4MTUsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHBsYWNlaG9s ZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICAgICAg cGxhY2Vob2xkZXJFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvci5DaGVja2JveFBsYWNlaG9sZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1l OwogCi0gICAgICAgICAgICB2YXIgcGxhY2Vob2xkZXJNYXJrID0gdGhpcy5fY29kZU1pcnJvci5z ZXRCb29rbWFyayhwb3NpdGlvbiwgcGxhY2Vob2xkZXJFbGVtZW50KTsKKyAgICAgICAgICAgIHZh ciBwbGFjZWhvbGRlck1hcmsgPSB0aGlzLl9jb2RlTWlycm9yLnNldFVuaXF1ZUJvb2ttYXJrKHBv c2l0aW9uLCBwbGFjZWhvbGRlckVsZW1lbnQpOwogICAgICAgICAgICAgcGxhY2Vob2xkZXJNYXJr Ll9fY2hlY2tib3hQbGFjZWhvbGRlciA9IHRydWU7CiAgICAgICAgIH0KICAgICB9LApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvckFkZGl0 aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvZGVNaXJyb3JB ZGRpdGlvbnMuanMKaW5kZXggODMyYTM3Yi4uZjg3NDk5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvckFkZGl0aW9ucy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yQWRkaXRpb25zLmpz CkBAIC0yNzEsNiArMjcxLDIwIEBACiAgICAgICAgIHJldHVybiBwYWRkZWRDbGFzcy5pbmRleE9m KCIgIiArIGNsYXNzTmFtZSArICIgIiwgaW5kZXgpICE9PSAtMTsKICAgICB9KTsKIAorICAgIENv ZGVNaXJyb3IuZGVmaW5lRXh0ZW5zaW9uKCJzZXRVbmlxdWVCb29rbWFyayIsIGZ1bmN0aW9uKHBv c2l0aW9uLCBvcHRpb25zKSB7CisgICAgICAgIHZhciBtYXJrcyA9IHRoaXMuZmluZE1hcmtzQXQo cG9zaXRpb24pOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1hcmtzLmxlbmd0aDsgKytp KSB7CisgICAgICAgICAgICBpZiAobWFya3NbaV0uX191bmlxdWVCb29rbWFyaykgeworICAgICAg ICAgICAgICAgIG1hcmtzW2ldLmNsZWFyKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB2YXIgdW5pcXVlQm9va21hcmsgPSB0aGlz LnNldEJvb2ttYXJrKHBvc2l0aW9uLCBvcHRpb25zKTsKKyAgICAgICAgdW5pcXVlQm9va21hcmsu X191bmlxdWVCb29rbWFyayA9IHRydWU7CisgICAgICAgIHJldHVybiB1bmlxdWVCb29rbWFyazsK KyAgICB9KTsKKwogICAgIENvZGVNaXJyb3IuZGVmaW5lRXh0ZW5zaW9uKCJ0b2dnbGVMaW5lQ2xh c3MiLCBmdW5jdGlvbihsaW5lLCB3aGVyZSwgY2xhc3NOYW1lKSB7CiAgICAgICAgIGlmICh0aGlz Lmhhc0xpbmVDbGFzcyhsaW5lLCB3aGVyZSwgY2xhc3NOYW1lKSkgewogICAgICAgICAgICAgdGhp cy5yZW1vdmVMaW5lQ2xhc3MobGluZSwgd2hlcmUsIGNsYXNzTmFtZSk7Cg== 211485 2013-09-12 15:48:00 -0700 2013-09-12 16:29:20 -0700 [PATCH] Proposed Fix - Better Code Style unique-bookmarks.patch text/plain 6427 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlmZTVkZTcuLjMwMWVlODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTA5LTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRHVwbGlj YXRlZCBjb2xvciBzd2F0Y2hlcyBjaGFuZ2luZyBhdXRvY29tcGxldGVzIGNvbG9yIG5hbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjEyNjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb2RlTWlycm9y IGJvb2ttYXJrcyBhdCBwb3NpdGlvbiB1c2VkIHRvIGJlIHVuaXF1ZSBidXQgbm8gbG9uZ2VyIGFy ZS4KKyAgICAgICAgRGVmaW5lIGFuIGV4dGVuc2lvbiB0byBnaXZlIHVzIHVuaXF1ZSBib29rbWFy a3MgYXMgd2UgZXhwZWN0ZWQsIGFuZAorICAgICAgICB1cGRhdGUgYWxsIHRoZSBvbGQgbG9jYXRp b25zIHVzaW5nIHNldEJvb2ttYXJrLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuZGlkRGlzbWlzc1BvcG92ZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlw ZS5fdXBkYXRlVGV4dE1hcmtlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5fY3JlYXRlQ29sb3JTd2F0Y2hl cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Iu cHJvdG90eXBlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvci5wcm90b3R5cGUuZXZlbnQubmV3Q29sb3JUZXh0KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0NvZGVNaXJyb3JBZGRpdGlvbnMuanM6CisKKzIwMTMtMDktMTIgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRh dGUgTGljZW5zZSBjb3B5cmlnaHRzIGluIG1pbmlmaWVkIEphdmFTY3JpcHQKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTI2NAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9DU1NTdHlsZURlY2xhcmF0aW9u VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NTU1N0 eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4IDM1NzQwM2EuLjU0Y2NjYzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCkBAIC0xOTEsNyArMTkxLDcgQEAg V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgZGlkRGlzbWlzc1BvcG92ZXI6IGZ1bmN0aW9uKHBv cG92ZXIpIAorICAgIGRpZERpc21pc3NQb3BvdmVyOiBmdW5jdGlvbihwb3BvdmVyKQogICAgIHsK ICAgICAgICAgaWYgKHBvcG92ZXIgPT09IHRoaXMuX2NvbG9yUGlja2VyUG9wb3ZlcikKICAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9jb2xvclBpY2tlclBvcG92ZXI7CkBAIC0zNjIsNyArMzYyLDcg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBmcm9tID0ge2xpbmU6IGksIGNoOiBtYXRj aC5pbmRleH07CiAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgdG8gPSB7bGluZTogaSwgY2g6 IG1hdGNoLmluZGV4ICsgbWF0Y2hbMF0ubGVuZ3RofTsKIAotICAgICAgICAgICAgICAgICAgICAg ICAgdmFyIGNoZWNrYm94TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5zZXRCb29rbWFyayhmcm9t LCBjaGVja2JveEVsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNoZWNrYm94 TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5zZXRVbmlxdWVCb29rbWFyayhmcm9tLCBjaGVja2Jv eEVsZW1lbnQpOwogICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2tib3hNYXJrZXIuX19wcm9w ZXJ0eUNoZWNrYm94ID0gdHJ1ZTsKIAogICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNvbW1l bnRUZXh0TWFya2VyID0gdGhpcy5fY29kZU1pcnJvci5tYXJrVGV4dChmcm9tLCB0byk7CkBAIC00 MzksMTAgKzQzOSwxMCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fY29sb3JTd2F0Y2hDbGlja2VkLmJpbmQodGhpcykp OwogCiAgICAgICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hJbm5lckVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAgICAgIHN3YXRjaElubmVy RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgiYmFja2dyb3VuZC1jb2xvciIsIG1hdGNoWzBdKTsK KyAgICAgICAgICAgICAgICAgICAgc3dhdGNoSW5uZXJFbGVtZW50LnN0eWxlLmJhY2tncm91bmRD b2xvciA9IG1hdGNoWzBdOwogICAgICAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50LmFwcGVu ZENoaWxkKHN3YXRjaElubmVyRWxlbWVudCk7CiAKLSAgICAgICAgICAgICAgICAgICAgdmFyIHN3 YXRjaE1hcmtlciA9IHRoaXMuX2NvZGVNaXJyb3Iuc2V0Qm9va21hcmsoZnJvbSwgc3dhdGNoRWxl bWVudCk7CisgICAgICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hNYXJrZXIgPSB0aGlzLl9jb2Rl TWlycm9yLnNldFVuaXF1ZUJvb2ttYXJrKGZyb20sIHN3YXRjaEVsZW1lbnQpOwogCiAgICAgICAg ICAgICAgICAgICAgIHZhciBjb2xvclRleHRNYXJrZXIgPSB0aGlzLl9jb2RlTWlycm9yLm1hcmtU ZXh0KGZyb20sIHRvKTsKICAgICAgICAgICAgICAgICAgICAgY29sb3JUZXh0TWFya2VyLl9fbWFy a2VkQ29sb3IgPSB0cnVlOwpAQCAtNDg5LDcgKzQ4OSw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjaGVja2Jv eEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgdGhpcy5fcHJvcGVydHlDaGVja2Jv eENoYW5nZWQuYmluZCh0aGlzKSk7CiAgICAgICAgICAgICBjaGVja2JveEVsZW1lbnQuX19jc3NQ cm9wZXJ0eSA9IHByb3BlcnR5OwogCi0gICAgICAgICAgICB2YXIgY2hlY2tib3hNYXJrZXIgPSB0 aGlzLl9jb2RlTWlycm9yLnNldEJvb2ttYXJrKGZyb20sIGNoZWNrYm94RWxlbWVudCk7CisgICAg ICAgICAgICB2YXIgY2hlY2tib3hNYXJrZXIgPSB0aGlzLl9jb2RlTWlycm9yLnNldFVuaXF1ZUJv b2ttYXJrKGZyb20sIGNoZWNrYm94RWxlbWVudCk7CiAgICAgICAgICAgICBjaGVja2JveE1hcmtl ci5fX3Byb3BlcnR5Q2hlY2tib3ggPSB0cnVlOwogICAgICAgICB9CiAKQEAgLTcxMyw3ICs3MTMs NyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBl ID0gewogCiAgICAgICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UobmV3 Q29sb3JUZXh0LCByYW5nZS5mcm9tLCByYW5nZS50byk7CiAKLSAgICAgICAgICAgICAgICAvLyBU aGUgY29sb3IncyB0ZXh0IGZvcm1hdCBjb3VsZCBoYXZlIGNoYW5nZWQsIHNvIHdlIG5lZWQgdG8g dXBkYXRlIHRoZSAicmFuZ2UiIAorICAgICAgICAgICAgICAgIC8vIFRoZSBjb2xvcidzIHRleHQg Zm9ybWF0IGNvdWxkIGhhdmUgY2hhbmdlZCwgc28gd2UgbmVlZCB0byB1cGRhdGUgdGhlICJyYW5n ZSIKICAgICAgICAgICAgICAgICAvLyB2YXJpYWJsZSB0byBhbnRpY2lwYXRlIGEgZGlmZmVyZW50 ICJyYW5nZS50byIgcHJvcGVydHkuCiAgICAgICAgICAgICAgICAgcmFuZ2UudG8uY2ggPSByYW5n ZS5mcm9tLmNoICsgbmV3Q29sb3JUZXh0Lmxlbmd0aDsKIApAQCAtNzUxLDcgKzc1MSw3IEBAIFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB9LmJpbmQodGhpcykpOwogCiAgICAgICAgICAgICB2YXIgYm91bmRzID0gV2Vi SW5zcGVjdG9yLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KHN3YXRjaC5nZXRCb3VuZGluZ0NsaWVu dFJlY3QoKSk7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgdGhpcy5fY29sb3JQaWNrZXJQ b3BvdmVyLmNvbnRlbnQgPSBjb2xvclBpY2tlci5lbGVtZW50OwogICAgICAgICAgICAgdGhpcy5f Y29sb3JQaWNrZXJQb3BvdmVyLnByZXNlbnQoYm91bmRzLCBbV2ViSW5zcGVjdG9yLlJlY3RFZGdl Lk1JTl9YXSk7CiAKQEAgLTgxNSw3ICs4MTUsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHBsYWNlaG9s ZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICAgICAg cGxhY2Vob2xkZXJFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvci5DaGVja2JveFBsYWNlaG9sZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1l OwogCi0gICAgICAgICAgICB2YXIgcGxhY2Vob2xkZXJNYXJrID0gdGhpcy5fY29kZU1pcnJvci5z ZXRCb29rbWFyayhwb3NpdGlvbiwgcGxhY2Vob2xkZXJFbGVtZW50KTsKKyAgICAgICAgICAgIHZh ciBwbGFjZWhvbGRlck1hcmsgPSB0aGlzLl9jb2RlTWlycm9yLnNldFVuaXF1ZUJvb2ttYXJrKHBv c2l0aW9uLCBwbGFjZWhvbGRlckVsZW1lbnQpOwogICAgICAgICAgICAgcGxhY2Vob2xkZXJNYXJr Ll9fY2hlY2tib3hQbGFjZWhvbGRlciA9IHRydWU7CiAgICAgICAgIH0KICAgICB9LApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvckFkZGl0 aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvZGVNaXJyb3JB ZGRpdGlvbnMuanMKaW5kZXggODMyYTM3Yi4uZjg3NDk5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvckFkZGl0aW9ucy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yQWRkaXRpb25zLmpz CkBAIC0yNzEsNiArMjcxLDIwIEBACiAgICAgICAgIHJldHVybiBwYWRkZWRDbGFzcy5pbmRleE9m KCIgIiArIGNsYXNzTmFtZSArICIgIiwgaW5kZXgpICE9PSAtMTsKICAgICB9KTsKIAorICAgIENv ZGVNaXJyb3IuZGVmaW5lRXh0ZW5zaW9uKCJzZXRVbmlxdWVCb29rbWFyayIsIGZ1bmN0aW9uKHBv c2l0aW9uLCBvcHRpb25zKSB7CisgICAgICAgIHZhciBtYXJrcyA9IHRoaXMuZmluZE1hcmtzQXQo cG9zaXRpb24pOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1hcmtzLmxlbmd0aDsgKytp KSB7CisgICAgICAgICAgICBpZiAobWFya3NbaV0uX191bmlxdWVCb29rbWFyaykgeworICAgICAg ICAgICAgICAgIG1hcmtzW2ldLmNsZWFyKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB2YXIgdW5pcXVlQm9va21hcmsgPSB0aGlz LnNldEJvb2ttYXJrKHBvc2l0aW9uLCBvcHRpb25zKTsKKyAgICAgICAgdW5pcXVlQm9va21hcmsu X191bmlxdWVCb29rbWFyayA9IHRydWU7CisgICAgICAgIHJldHVybiB1bmlxdWVCb29rbWFyazsK KyAgICB9KTsKKwogICAgIENvZGVNaXJyb3IuZGVmaW5lRXh0ZW5zaW9uKCJ0b2dnbGVMaW5lQ2xh c3MiLCBmdW5jdGlvbihsaW5lLCB3aGVyZSwgY2xhc3NOYW1lKSB7CiAgICAgICAgIGlmICh0aGlz Lmhhc0xpbmVDbGFzcyhsaW5lLCB3aGVyZSwgY2xhc3NOYW1lKSkgewogICAgICAgICAgICAgdGhp cy5yZW1vdmVMaW5lQ2xhc3MobGluZSwgd2hlcmUsIGNsYXNzTmFtZSk7Cg==