162115 2016-09-17 00:32:55 -0700 Web Inspector: Color picker in Style sidebar stops working after 1st color change 2016-09-19 04:31:53 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue hi joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1230775 0 joepeck 2016-09-17 00:32:55 -0700 Summary: Color picker in Style sidebar stops working after 1st color change Steps to Reproduce: 1. Inspect an element with a color property 2. Click color swatch to bring up the editor 3. Change color once => CSS updates, page updates 4. Change color again => Nothing happens. Notes: - Sequence of events seems to be: => InlineSwatch ValueChanged => codeMirror.replaceRange(...) => codeMirror content changed => update backend (inform of style changes) => domnodestyles update PropertiesChanged => CSSStyleDeclarationTextEditor _propertiesChanged => clear markers + create new inline swatches When new inline swatches are created the UI cannot recover. The popover is orphaned. It sends events but the CSSStyleDeclarationTextEditor has nothing to update, and the original inline swatch's elements have been removed and replaced so the updates have no visible changes. Simple solution may be to just not recreate markers when actively editing. 1230776 1 webkit-bug-importer 2016-09-17 00:33:28 -0700 <rdar://problem/28349875> 1230777 2 289163 joepeck 2016-09-17 00:46:24 -0700 Created attachment 289163 [PATCH] Proposed Fix 1231053 3 289163 bburg 2016-09-19 04:09:37 -0700 Comment on attachment 289163 [PATCH] Proposed Fix r=me Man, we need UI tests. 1231056 4 289163 commit-queue 2016-09-19 04:31:49 -0700 Comment on attachment 289163 [PATCH] Proposed Fix Clearing flags on attachment: 289163 Committed r206092: <http://trac.webkit.org/changeset/206092> 1231057 5 commit-queue 2016-09-19 04:31:53 -0700 All reviewed patches have been landed. Closing bug. 289163 2016-09-17 00:46:24 -0700 2016-09-19 04:31:49 -0700 [PATCH] Proposed Fix color-picker-1.patch text/plain 8956 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI3ZjA4ZTMuLjY0Y2MzNTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE2LTA5LTE3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29sb3Ig cGlja2VyIGluIFN0eWxlIHNpZGViYXIgc3RvcHMgd29ya2luZyBhZnRlciAxc3QgY29sb3IgY2hh bmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIx MTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4MzQ5ODc1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl91cGRhdGVUZXh0TWFya2Vycyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90 eXBlLl91cGRhdGVUZXh0TWFya2Vycy5jcmVhdGVTd2F0Y2gpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5faW5saW5lU3dhdGNo QWN0aXZhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvci5wcm90b3R5cGUuX2lubGluZVN3YXRjaERlYWN0aXZhdGVkKToKKyAgICAgICAgTGlz dGVuIGZvciBzd2F0Y2ggYWN0aXZhdGVkIC8gaW5hY3RpdmF0ZWQgZXZlbnRzIHRvIHNldCBzb21l IHN0YXRlLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRF ZGl0b3IucHJvdG90eXBlLl9wcm9wZXJ0aWVzQ2hhbmdlZCk6CisgICAgICAgIERvIG5vdCB3aXBl IG1hcmtlcnMgaWYgdGhlcmUgaXMgYW4gYWN0aXZlIGlubGluZSBzd2F0Y2guIFRoYXQKKyAgICAg ICAgd291bGQgYnJlYWsgYmVoYXZpb3IgZm9yIHRoYXQgYWN0aXZlIHN3YXRjaC4KKworICAgICAg ICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5f aW5saW5lU3dhdGNoVmFsdWVDaGFuZ2VkKToKKyAgICAgICAgRWxpbWluYXRlIG9sZCwgaW5jb3Jy ZWN0LCBhbmQgbm93IHVubmVjZXNzYXJ5IGNvZGUgZm9yIHRyeWluZyB0byByZWNvdmVyCisgICAg ICAgIGEgdGV4dE1hcmtlciBmb3IgYW4gaW5saW5lIHN3YXRjaCBpZiB0aGUgdGV4dE1hcmtlciB3 ZW50IGF3YXkuIEJlc2lkZXMgYmVpbmcKKyAgICAgICAgaW5jb3JyZWN0LCBpZiBhbiBpbmxpbmUg c3dhdGNoJ3MgdGV4dE1hcmtlciBnb2VzIGF3YXksIHRoZW4gd2Ugd2lsbCBhbHJlYWR5CisgICAg ICAgIGhhdmUgaXNzdWVzLCBiZWNhdXNlIGFueSBhY3RpdmUgcG9wb3ZlciB3aWxsIHN0aWxsIGJl IGNvbm5lY3RlZCB0byB0aGUKKyAgICAgICAgb3JpZ2luYWwgbWFya2VyIGFuZCBzd2F0Y2ggZWxl bWVudCB0aGF0IG5vIGxvbmdlciBhcHBlYXIgaW4gdGhlIGVkaXRvci4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ29sb3JQaWNrZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29sb3JQaWNrZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbG9yUGlja2VyLnByb3RvdHlw ZS5zZXQgY29sb3IpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNo LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLklubGluZVN3YXRjaC5wcm90b3R5cGUuZGlkRGlz bWlzc1BvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLklubGluZVN3YXRjaC5wcm90b3R5 cGUuX3N3YXRjaEVsZW1lbnRDbGlja2VkKToKKwogMjAxNi0wOS0xNiAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNjb3BlIHNp ZGViYXIgc2hvd3MgIkNsb3N1cmUiIGluc3RlYWQgb2YgIkxvY2FsIiB3aGVuIHBhdXNlZCBpbiBh bm9ueW1vdXMgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRl eHRFZGl0b3IuanMKaW5kZXggNDFhOGUxMS4uMTJjZDJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMKQEAgLTQyLDYgKzQyLDcgQEAgV2ViSW5z cGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNs YXJhdGlvblRleHRFZGl0b3IKICAgICAgICAgdGhpcy5fYWx3YXlzU2hvd1Byb3BlcnR5TmFtZXMg PSB7fTsKICAgICAgICAgdGhpcy5fZmlsdGVyUmVzdWx0UHJvcGVydHlOYW1lcyA9IG51bGw7CiAg ICAgICAgIHRoaXMuX3NvcnRQcm9wZXJ0aWVzID0gZmFsc2U7CisgICAgICAgIHRoaXMuX2hhc0Fj dGl2ZUlubGluZVN3YXRjaEVkaXRvciA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX2xpbmVQcmVm aXhXaGl0ZXNwYWNlID0gIiI7CiAKQEAgLTc3MSw2ICs3NzIsOCBAQCBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvcgogCiAgICAgX3VwZGF0ZVRleHRNYXJrZXJzKG5vbmF0b21pYykKICAgICB7CisgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9oYXNBY3RpdmVJbmxpbmVTd2F0Y2hFZGl0b3IsICJX ZSBzaG91bGQgbmV2ZXIgYmUgcmVjcmVhdGluZyBtYXJrZXJzIHdoZW4gd2UgYW4gYWN0aXZlIGlu bGluZSBzd2F0Y2ggZWRpdG9yLiIpOworCiAgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZSgpCiAgICAg ICAgIHsKICAgICAgICAgICAgIHRoaXMuX2NsZWFyVGV4dE1hcmtlcnModHJ1ZSk7CkBAIC04NTQs NiArODU3LDggQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0g Y2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKICAgICAgICAgZnVuY3Rpb24gY3Jl YXRlU3dhdGNoKHN3YXRjaCwgbWFya2VyLCB2YWx1ZU9iamVjdCwgdmFsdWVTdHJpbmcpCiAgICAg ICAgIHsKICAgICAgICAgICAgIHN3YXRjaC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5J bmxpbmVTd2F0Y2guRXZlbnQuVmFsdWVDaGFuZ2VkLCB0aGlzLl9pbmxpbmVTd2F0Y2hWYWx1ZUNo YW5nZWQsIHRoaXMpOworICAgICAgICAgICAgc3dhdGNoLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLklubGluZVN3YXRjaC5FdmVudC5BY3RpdmF0ZWQsIHRoaXMuX2lubGluZVN3YXRjaEFj dGl2YXRlZCwgdGhpcyk7CisgICAgICAgICAgICBzd2F0Y2guYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuSW5saW5lU3dhdGNoLkV2ZW50LkRpc21pc3NlZCwgdGhpcy5faW5saW5lU3dhdGNo RGVhY3RpdmF0ZWQsIHRoaXMpOwogCiAgICAgICAgICAgICBsZXQgY29kZU1pcnJvclRleHRNYXJr ZXIgPSBtYXJrZXIuY29kZU1pcnJvclRleHRNYXJrZXI7CiAgICAgICAgICAgICBsZXQgY29kZU1p cnJvclRleHRNYXJrZXJSYW5nZSA9IGNvZGVNaXJyb3JUZXh0TWFya2VyLmZpbmQoKTsKQEAgLTEz MjUsNiArMTMzMCw4IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv ciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yCiAKICAgICBfaW5saW5lU3dh dGNoVmFsdWVDaGFuZ2VkKGV2ZW50KQogICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhp cy5faGFzQWN0aXZlSW5saW5lU3dhdGNoRWRpdG9yKTsKKwogICAgICAgICBsZXQgc3dhdGNoID0g ZXZlbnQgJiYgZXZlbnQudGFyZ2V0OwogICAgICAgICBjb25zb2xlLmFzc2VydChzd2F0Y2gpOwog ICAgICAgICBpZiAoIXN3YXRjaCkKQEAgLTEzNDMsMjkgKzEzNTAsNiBAQCBXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9u VGV4dEVkaXRvcgogCiAgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZSgpCiAgICAgICAgIHsKLSAgICAg ICAgICAgIC8vIFRoZSBvcmlnaW5hbCB0ZXh0IG1hcmtlciBtaWdodCBoYXZlIGJlZW4gY2xlYXJl ZCBieSBhIHN0eWxlIHVwZGF0ZSwKLSAgICAgICAgICAgIC8vIGluIHRoaXMgY2FzZSB3ZSBuZWVk IHRvIGZpbmQgdGhlIG5ldyB0ZXh0IG1hcmtlciBzbyB3ZSBrbm93IHRoZQotICAgICAgICAgICAg Ly8gcmlnaHQgcmFuZ2UgZm9yIHRoZSBuZXcgc3R5bGUgdGV4dC4KLSAgICAgICAgICAgIGlmICgh dGV4dE1hcmtlciB8fCAhdGV4dE1hcmtlci5maW5kKCkpIHsKLSAgICAgICAgICAgICAgICB0ZXh0 TWFya2VyID0gbnVsbDsKLQotICAgICAgICAgICAgICAgIGxldCBtYXJrcyA9IHRoaXMuX2NvZGVN aXJyb3IuZmluZE1hcmtzQXQocmFuZ2UuZnJvbSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFtYXJr cy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgICAg IGZvciAobGV0IG1hcmsgb2YgbWFya3MpIHsKLSAgICAgICAgICAgICAgICAgICAgbGV0IHR5cGUg PSBXZWJJbnNwZWN0b3IuVGV4dE1hcmtlci50ZXh0TWFya2VyRm9yQ29kZU1pcnJvclRleHRNYXJr ZXIobWFyaykudHlwZTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKE9iamVjdC52YWx1ZXMoV2Vi SW5zcGVjdG9yLlRleHRNYXJrZXIuVHlwZSkuaW5jbHVkZXModHlwZSkpCi0gICAgICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgICAgICB0ZXh0TWFya2VyID0g bWFyazsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoIXRleHRNYXJrZXIpCi0gICAgICAgICAgICAg ICAgcmV0dXJuOwotCiAgICAgICAgICAgICAvLyBTb21ldGltZXMgd2Ugc3RpbGwgbWlnaHQgZmlu ZCBhIHN0YWxlIHRleHQgbWFya2VyIHdpdGggZmluZE1hcmtzQXQuCiAgICAgICAgICAgICByYW5n ZSA9IHRleHRNYXJrZXIuZmluZCgpOwogICAgICAgICAgICAgaWYgKCFyYW5nZSkKQEAgLTEzODcs NiArMTM3MSwxNiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Ig PSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICB0aGlzLl9jb2Rl TWlycm9yLm9wZXJhdGlvbih1cGRhdGUuYmluZCh0aGlzKSk7CiAgICAgfQogCisgICAgX2lubGlu ZVN3YXRjaEFjdGl2YXRlZCgpCisgICAgeworICAgICAgICB0aGlzLl9oYXNBY3RpdmVJbmxpbmVT d2F0Y2hFZGl0b3IgPSB0cnVlOworICAgIH0KKworICAgIF9pbmxpbmVTd2F0Y2hEZWFjdGl2YXRl ZCgpCisgICAgeworICAgICAgICB0aGlzLl9oYXNBY3RpdmVJbmxpbmVTd2F0Y2hFZGl0b3IgPSBm YWxzZTsKKyAgICB9ICAgIAorCiAgICAgX3Byb3BlcnR5T3ZlcnJpZGRlblN0YXR1c0NoYW5nZWQo ZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl91cGRhdGVUZXh0TWFya2VyRm9yUHJvcGVydHlJ Zk5lZWRlZChldmVudC50YXJnZXQpOwpAQCAtMTM5OSw2ICsxMzkzLDE1IEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yCiAgICAgICAgIGlmICh0aGlzLl9jb21wbGV0aW9uQ29udHJvbGxlci5pc1No b3dpbmdDb21wbGV0aW9ucygpKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGlmICh0 aGlzLl9oYXNBY3RpdmVJbmxpbmVTd2F0Y2hFZGl0b3IpCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgLy8gRG9uJ3QgdHJ5IHRvIHVwZGF0ZSB0aGUgZG9jdW1lbnQgYWZ0ZXIganVzdCBt b2RpZnlpbmcgYSBzd2F0Y2guCisgICAgICAgIGlmICh0aGlzLl9pZ25vcmVOZXh0UHJvcGVydGll c0NoYW5nZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX2lnbm9yZU5leHRQcm9wZXJ0aWVzQ2hhbmdl ZCA9IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgLy8g UmVzZXQgdGhlIGNvbnRlbnQgaWYgdGhlIHRleHQgaXMgZGlmZmVyZW50IGFuZCB3ZSBhcmUgbm90 IGZvY3VzZWQuCiAgICAgICAgIGlmICghdGhpcy5mb2N1c2VkICYmICghdGhpcy5fc3R5bGUudGV4 dCB8fCB0aGlzLl9zdHlsZS50ZXh0ICE9PSB0aGlzLl9mb3JtYXR0ZWRDb250ZW50KCkpKSB7CiAg ICAgICAgICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbG9yUGlja2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sb3JQaWNrZXIuanMKaW5kZXggMDdh MzM1ZS4uN2YzMTgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29sb3JQaWNrZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29sb3JQaWNrZXIuanMKQEAgLTUyLDYgKzUyLDggQEAgV2ViSW5z cGVjdG9yLkNvbG9yUGlja2VyID0gY2xhc3MgQ29sb3JQaWNrZXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2JqZWN0CiAgICAgICAgIHRoaXMuX29wYWNpdHlQYXR0ZXJuID0gInVybChJbWFnZXMvQ2hl Y2tlcnMuc3ZnKSI7CiAKICAgICAgICAgdGhpcy5fY29sb3IgPSAid2hpdGUiOworCisgICAgICAg IHRoaXMuX2RvbnRVcGRhdGVDb2xvciA9IGZhbHNlOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpA QCAtMTAzLDcgKzEwNSw3IEBAIFdlYkluc3BlY3Rvci5Db2xvclBpY2tlciA9IGNsYXNzIENvbG9y UGlja2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl9vcGFjaXR5 U2xpZGVyLnZhbHVlID0gY29sb3IuYWxwaGE7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVNsaWRlcnMo dGhpcy5fY29sb3JXaGVlbC5yYXdDb2xvciwgY29sb3IpOwogCi0gICAgICAgIGRlbGV0ZSB0aGlz Ll9kb250VXBkYXRlQ29sb3I7CisgICAgICAgIHRoaXMuX2RvbnRVcGRhdGVDb2xvciA9IGZhbHNl OwogICAgIH0KIAogICAgIGNvbG9yV2hlZWxDb2xvckRpZENoYW5nZShjb2xvcldoZWVsKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5l U3dhdGNoLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5s aW5lU3dhdGNoLmpzCmluZGV4IGEwMGQ0MDguLjc3MWVmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMK QEAgLTkyLDYgKzkyLDggQEAgV2ViSW5zcGVjdG9yLklubGluZVN3YXRjaCA9IGNsYXNzIElubGlu ZVN3YXRjaCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgICAgICBpZiAodHlwZW9m IHRoaXMuX3ZhbHVlRWRpdG9yLnJlbW92ZUxpc3RlbmVycyA9PT0gImZ1bmN0aW9uIikKICAgICAg ICAgICAgIHRoaXMuX3ZhbHVlRWRpdG9yLnJlbW92ZUxpc3RlbmVycygpOworCisgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5JbmxpbmVTd2F0Y2guRXZl bnQuRGVhY3RpdmF0ZWQpOwogICAgIH0KIAogICAgIC8vIFByaXZhdGUKQEAgLTE2Myw2ICsxNjUs OCBAQCBXZWJJbnNwZWN0b3IuSW5saW5lU3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBwb3BvdmVyLmNvbnRlbnQgPSB0aGlzLl92 YWx1ZUVkaXRvci5lbGVtZW50OwogICAgICAgICBwb3BvdmVyLnByZXNlbnQoYm91bmRzLnBhZCgy KSwgW1dlYkluc3BlY3Rvci5SZWN0RWRnZS5NSU5fWF0pOwogCisgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5JbmxpbmVTd2F0Y2guRXZlbnQuQWN0aXZh dGVkKTsKKwogICAgICAgICBsZXQgdmFsdWUgPSB0aGlzLl92YWx1ZSB8fCB0aGlzLl9mYWxsYmFj a1ZhbHVlKCk7CiAgICAgICAgIGlmICh0aGlzLl90eXBlID09PSBXZWJJbnNwZWN0b3IuSW5saW5l U3dhdGNoLlR5cGUuQmV6aWVyKQogICAgICAgICAgICAgdGhpcy5fdmFsdWVFZGl0b3IuYmV6aWVy ID0gdmFsdWU7CkBAIC0yOTcsNSArMzAxLDcgQEAgV2ViSW5zcGVjdG9yLklubGluZVN3YXRjaC5U eXBlID0gewogCiBXZWJJbnNwZWN0b3IuSW5saW5lU3dhdGNoLkV2ZW50ID0gewogICAgIEJlZm9y ZUNsaWNrZWQ6ICJpbmxpbmUtc3dhdGNoLWJlZm9yZS1jbGlja2VkIiwKLSAgICBWYWx1ZUNoYW5n ZWQ6ICJpbmxpbmUtc3dhdGNoLXZhbHVlLWNoYW5nZWQiCisgICAgVmFsdWVDaGFuZ2VkOiAiaW5s aW5lLXN3YXRjaC12YWx1ZS1jaGFuZ2VkIiwKKyAgICBBY3RpdmF0ZWQ6ICJpbmxpbmUtc3dhdGNo LWFjdGl2YXRlZCIsCisgICAgRGVhY3RpdmF0ZWQ6ICJpbmxpbmUtc3dhdGNoLWRlYWN0aXZhdGVk IiwKIH07Cg==