173232 2017-06-10 18:26:33 -0700 Web Inspector: Don't use -webkit-user-modify CSS property 2017-06-13 14:03:58 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes oldest_to_newest 1317942 0 nvasilyev 2017-06-10 18:26:33 -0700 Replace -webkit-user-modify CSS property with contentEditable HTML attribute. According to rniwa, -webkit-user-modify CSS property is slow and shouldn't be used. In addition to this, it has been deprecated in Chrome: https://www.chromestatus.com/feature/4725222129270784 1317943 1 nvasilyev 2017-06-10 18:29:44 -0700 It is currently used in two places: Editing.css: .editing { -webkit-user-modify: read-write-plaintext-only; } VisualStyleSelectorTreeItem.css: .item.visual-style-selector-item:not(.dom-element-icon).editable > .titles > .title { -webkit-user-modify: read-write-plaintext-only; } Both should use contenteditable="plaintext-only" HTML attribute instead. 1318372 2 312697 nvasilyev 2017-06-12 14:33:44 -0700 Created attachment 312697 Patch 1318474 3 312697 hi 2017-06-12 16:45:31 -0700 Comment on attachment 312697 Patch r=me View in context: https://bugs.webkit.org/attachment.cgi?id=312697&action=review > Source/WebInspectorUI/UserInterface/Views/EditingSupport.js:153 > + element.contentEditable = false; NIT: I think this should be `this.contentEditable = false;` to match the previous line. > Source/WebInspectorUI/UserInterface/Views/EditingSupport.js:279 > + if (container.parentNode.contentEditable) { NIT: I think that using the `classList.contains("editing")` is more specific than just checking for "contentEditable". I would leave this as it was. > Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js:242 > + this._mainTitleElement.contentEditable = this.selected ? "plaintext-only" : false; NIT: I think this should be moved after the next line to keep consistent ordering between `this._listItemNode` and `this._mainTitleElement`. 1318775 4 312796 nvasilyev 2017-06-13 13:24:48 -0700 Created attachment 312796 Patch 1318810 5 312796 commit-queue 2017-06-13 14:03:56 -0700 Comment on attachment 312796 Patch Clearing flags on attachment: 312796 Committed r218202: <http://trac.webkit.org/changeset/218202> 1318811 6 commit-queue 2017-06-13 14:03:58 -0700 All reviewed patches have been landed. Closing bug. 312697 2017-06-12 14:33:44 -0700 2017-06-13 13:24:48 -0700 Patch patch.txt text/plain 5411 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBiOGFjYzMuLjg0MjJkNzBiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNy0wNi0xMiAgTmlraXRhIFZhc2ls eWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBEb24n dCB1c2UgLXdlYmtpdC11c2VyLW1vZGlmeSBDU1MgcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzIzMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgLXdlYmtpdC11c2VyLW1vZGlm eSBDU1MgcHJvcGVydHkgd2l0aCBjb250ZW50RWRpdGFibGUgSFRNTCBhdHRyaWJ1dGUuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmcuY3NzOgorICAgICAgICAoLmVkaXRp bmcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanM6Cisg ICAgICAgIChjbGVhblVwQWZ0ZXJFZGl0aW5nKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3M6CisgICAgICAgICguaXRlbS52aXN1 YWwtc3R5bGUtc2VsZWN0b3ItaXRlbTpub3QoLmRvbS1lbGVtZW50LWljb24pLmVkaXRhYmxlID4g LnRpdGxlcyA+IC50aXRsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZVNlbGVjdG9yVHJlZUl0ZW0uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVTZWxlY3RvclRyZWVJdGVtLnByb3RvdHlwZS5vbmRlc2VsZWN0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0ucHJvdG90eXBlLl9oYW5kbGVNYWlu VGl0bGVNb3VzZURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0 b3JUcmVlSXRlbS5wcm90b3R5cGUuX2NvbW1pdFNlbGVjdG9yKToKKwogMjAxNy0wNS0yNCAgRnVq aWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbR1RLXSBX ZWIgSW5zcGVjdG9yOiBBZGQgbmV3IEdUSysgaWNvbnMgZm9yIGdhcmJhZ2UgY29sbGVjdCBhbmQg Y2xlYW4gYnV0dG9ucyBpbiBDb25zb2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmcuY3NzCmluZGV4IGVlYmRlZWUuLmUzY2I4ODMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Vk aXRpbmcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0VkaXRpbmcuY3NzCkBAIC0yOCw3ICsyOCw2IEBACiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAw JSwgMCUsIDAuNSkgM3B4IDNweCA0cHg7CiAgICAgb3V0bGluZTogMXB4IHNvbGlkIGhzbCgwLCAw JSwgNjUlKSAhaW1wb3J0YW50OwogICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwotICAgIC13 ZWJraXQtdXNlci1tb2RpZnk6IHJlYWQtd3JpdGUtcGxhaW50ZXh0LW9ubHk7CiAgICAgdGV4dC1v dmVyZmxvdzogY2xpcCAhaW1wb3J0YW50OwogICAgIHBhZGRpbmctbGVmdDogMnB4OwogICAgIG1h cmdpbi1sZWZ0OiAtMnB4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcwppbmRleCAzYWQ5MjI0Li43OGJk ZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9FZGl0aW5nU3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcwpAQCAtMTIyLDYgKzEyMiw3IEBAIFdlYkluc3Bl Y3Rvci5zdGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50LCBjb25maWcpCiAgICAgdmFyIG1v dmVEaXJlY3Rpb24gPSAiIjsKIAogICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZWRpdGluZyIp OworICAgIGVsZW1lbnQuY29udGVudEVkaXRhYmxlID0gInBsYWludGV4dC1vbmx5IjsKIAogICAg IHZhciBvbGRTcGVsbENoZWNrID0gZWxlbWVudC5oYXNBdHRyaWJ1dGUoInNwZWxsY2hlY2siKSA/ IGVsZW1lbnQuc3BlbGxjaGVjayA6IHVuZGVmaW5lZDsKICAgICBlbGVtZW50LnNwZWxsY2hlY2sg PSBjb25maWcuc3BlbGxjaGVjazsKQEAgLTE0OSw2ICsxNTAsOCBAQCBXZWJJbnNwZWN0b3Iuc3Rh cnRFZGl0aW5nID0gZnVuY3Rpb24oZWxlbWVudCwgY29uZmlnKQogICAgICAgICBXZWJJbnNwZWN0 b3IubWFya0JlaW5nRWRpdGVkKGVsZW1lbnQsIGZhbHNlKTsKIAogICAgICAgICB0aGlzLmNsYXNz TGlzdC5yZW1vdmUoImVkaXRpbmciKTsKKyAgICAgICAgZWxlbWVudC5jb250ZW50RWRpdGFibGUg PSBmYWxzZTsKKwogICAgICAgICB0aGlzLnNjcm9sbFRvcCA9IDA7CiAgICAgICAgIHRoaXMuc2Ny b2xsTGVmdCA9IDA7CiAKQEAgLTI3Myw3ICsyNzYsNyBAQCBXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0 aW5nID0gZnVuY3Rpb24oZWxlbWVudCwgY29uZmlnKQogICAgICAgICAgICAgLy8gYWRkZWQgYXMg YSBzaW1wbGUgdGV4dCBub2RlLiBTaW5jZSB0aGUgb3BlbmluZyBxdW90ZSBpcyBpbW1lZGlhdGVs eSBiZWZvcmUKICAgICAgICAgICAgIC8vIHRoZSBhdHRyaWJ1dGUsIHRoZSBub2RlIGZvciB0aGF0 IGF0dHJpYnV0ZSBtdXN0IGJlIHRoZSBuZXh0IHNpYmxpbmcgYW5kIHRoZQogICAgICAgICAgICAg Ly8gdGV4dCBvZiB0aGUgYXR0cmlidXRlJ3MgdmFsdWUgbXVzdCBiZSB0aGUgZmlyc3QgY2hpbGQg b2YgdGhhdCBzaWJsaW5nLgotICAgICAgICAgICAgaWYgKGNvbnRhaW5lci5wYXJlbnROb2RlLmNs YXNzTGlzdC5jb250YWlucygiZWRpdGluZyIpKSB7CisgICAgICAgICAgICBpZiAoY29udGFpbmVy LnBhcmVudE5vZGUuY29udGVudEVkaXRhYmxlKSB7CiAgICAgICAgICAgICAgICAgY29udGFpbmVy ID0gY29udGFpbmVyLm5leHRTaWJsaW5nLmZpcnN0Q2hpbGQ7CiAgICAgICAgICAgICAgICAgc3Rh cnRPZmZzZXQgPSAwOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl U2VsZWN0b3JUcmVlSXRlbS5jc3MKaW5kZXggOWUwMzM4Zi4uNzU1ZTY1NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxl Y3RvclRyZWVJdGVtLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uY3NzCkBAIC0xMTksNyArMTE5LDYg QEAgYm9keTpub3QoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUpIC5p dGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci0KIC5pdGVtLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1p dGVtOm5vdCguZG9tLWVsZW1lbnQtaWNvbikuZWRpdGFibGUgPiAudGl0bGVzID4gLnRpdGxlIHsK ICAgICBjdXJzb3I6IHRleHQ7CiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogdGV4dDsKLSAgICAt d2Via2l0LXVzZXItbW9kaWZ5OiByZWFkLXdyaXRlLXBsYWludGV4dC1vbmx5OwogfQogCiAuaXRl bS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbTpub3QoLmRvbS1lbGVtZW50LWljb24pLmVkaXRh YmxlID4gLnRpdGxlcyA+IC50aXRsZTpmb2N1cyB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0u anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZVNlbGVjdG9yVHJlZUl0ZW0uanMKaW5kZXggYThmZWU3Yy4uZDc3ZDI4YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxl Y3RvclRyZWVJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwpAQCAtMTE5LDYgKzExOSw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0gPSBjbGFzcyBWaXN1YWxT dHlsZVNlbGVjdG9yVHJlZUl0ZW0gZXh0CiAgICAgb25kZXNlbGVjdCgpCiAgICAgewogICAgICAg ICB0aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LnJlbW92ZSgiZWRpdGFibGUiKTsKKyAgICAg ICAgdGhpcy5fbWFpblRpdGxlRWxlbWVudC5jb250ZW50RWRpdGFibGUgPSBmYWxzZTsKICAgICB9 CiAKICAgICBwb3B1bGF0ZUNvbnRleHRNZW51KGNvbnRleHRNZW51LCBldmVudCkKQEAgLTIzOCw2 ICsyMzksNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtID0gY2xh c3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtIGV4dAogICAgICAgICBpZiAoZXZlbnQuYnV0 dG9uICE9PSAwIHx8IGV2ZW50LmN0cmxLZXkpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAg ICAgdGhpcy5fbWFpblRpdGxlRWxlbWVudC5jb250ZW50RWRpdGFibGUgPSB0aGlzLnNlbGVjdGVk ID8gInBsYWludGV4dC1vbmx5IiA6IGZhbHNlOwogICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUu Y2xhc3NMaXN0LnRvZ2dsZSgiZWRpdGFibGUiLCB0aGlzLnNlbGVjdGVkKTsKICAgICB9CiAKQEAg LTI1NCw2ICsyNTYsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVt ID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtIGV4dAogICAgIHsKICAgICAgICAg dGhpcy5faGlkZURPTU5vZGVIaWdobGlnaHQoKTsKICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2Rl LmNsYXNzTGlzdC5yZW1vdmUoImVkaXRhYmxlIik7CisgICAgICAgIHRoaXMuX21haW5UaXRsZUVs ZW1lbnQuY29udGVudEVkaXRhYmxlID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVRpdGxl VG9vbHRpcCgpOwogCiAgICAgICAgIGxldCB2YWx1ZSA9IHRoaXMuc2VsZWN0b3JUZXh0Owo= 312796 2017-06-13 13:24:48 -0700 2017-06-13 14:03:56 -0700 Patch patch.txt text/plain 4807 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBiOGFjYzMuLmM4ZTE3M2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA2LTEzICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERvbid0 IHVzZSAtd2Via2l0LXVzZXItbW9kaWZ5IENTUyBwcm9wZXJ0eQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMjMyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgIFJlcGxhY2UgLXdlYmtpdC11c2VyLW1vZGlmeSBD U1MgcHJvcGVydHkgd2l0aCBjb250ZW50RWRpdGFibGUgSFRNTCBhdHRyaWJ1dGUuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmcuY3NzOgorICAgICAgICAoLmVkaXRpbmcp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanM6CisgICAg ICAgIChjbGVhblVwQWZ0ZXJFZGl0aW5nKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3M6CisgICAgICAgICguaXRlbS52aXN1YWwt c3R5bGUtc2VsZWN0b3ItaXRlbTpub3QoLmRvbS1lbGVtZW50LWljb24pLmVkaXRhYmxlID4gLnRp dGxlcyA+IC50aXRsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZVNlbGVjdG9yVHJlZUl0ZW0uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVT ZWxlY3RvclRyZWVJdGVtLnByb3RvdHlwZS5vbmRlc2VsZWN0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0ucHJvdG90eXBlLl9oYW5kbGVNYWluVGl0 bGVNb3VzZURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JU cmVlSXRlbS5wcm90b3R5cGUuX2NvbW1pdFNlbGVjdG9yKToKKwogMjAxNy0wNS0yNCAgRnVqaWkg SGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbR1RLXSBXZWIg SW5zcGVjdG9yOiBBZGQgbmV3IEdUSysgaWNvbnMgZm9yIGdhcmJhZ2UgY29sbGVjdCBhbmQgY2xl YW4gYnV0dG9ucyBpbiBDb25zb2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmcuY3NzCmluZGV4IGVlYmRlZWUuLmUzY2I4ODMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRp bmcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Vk aXRpbmcuY3NzCkBAIC0yOCw3ICsyOCw2IEBACiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwg MCUsIDAuNSkgM3B4IDNweCA0cHg7CiAgICAgb3V0bGluZTogMXB4IHNvbGlkIGhzbCgwLCAwJSwg NjUlKSAhaW1wb3J0YW50OwogICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwotICAgIC13ZWJr aXQtdXNlci1tb2RpZnk6IHJlYWQtd3JpdGUtcGxhaW50ZXh0LW9ubHk7CiAgICAgdGV4dC1vdmVy ZmxvdzogY2xpcCAhaW1wb3J0YW50OwogICAgIHBhZGRpbmctbGVmdDogMnB4OwogICAgIG1hcmdp bi1sZWZ0OiAtMnB4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcwppbmRleCAzYWQ5MjI0Li5jNjc2YzY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9F ZGl0aW5nU3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcwpAQCAtMTIyLDYgKzEyMiw3IEBAIFdlYkluc3BlY3Rv ci5zdGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50LCBjb25maWcpCiAgICAgdmFyIG1vdmVE aXJlY3Rpb24gPSAiIjsKIAogICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZWRpdGluZyIpOwor ICAgIGVsZW1lbnQuY29udGVudEVkaXRhYmxlID0gInBsYWludGV4dC1vbmx5IjsKIAogICAgIHZh ciBvbGRTcGVsbENoZWNrID0gZWxlbWVudC5oYXNBdHRyaWJ1dGUoInNwZWxsY2hlY2siKSA/IGVs ZW1lbnQuc3BlbGxjaGVjayA6IHVuZGVmaW5lZDsKICAgICBlbGVtZW50LnNwZWxsY2hlY2sgPSBj b25maWcuc3BlbGxjaGVjazsKQEAgLTE0OSw2ICsxNTAsOCBAQCBXZWJJbnNwZWN0b3Iuc3RhcnRF ZGl0aW5nID0gZnVuY3Rpb24oZWxlbWVudCwgY29uZmlnKQogICAgICAgICBXZWJJbnNwZWN0b3Iu bWFya0JlaW5nRWRpdGVkKGVsZW1lbnQsIGZhbHNlKTsKIAogICAgICAgICB0aGlzLmNsYXNzTGlz dC5yZW1vdmUoImVkaXRpbmciKTsKKyAgICAgICAgdGhpcy5jb250ZW50RWRpdGFibGUgPSBmYWxz ZTsKKwogICAgICAgICB0aGlzLnNjcm9sbFRvcCA9IDA7CiAgICAgICAgIHRoaXMuc2Nyb2xsTGVm dCA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uY3Nz CmluZGV4IDllMDMzOGYuLjc1NWU2NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVT ZWxlY3RvclRyZWVJdGVtLmNzcwpAQCAtMTE5LDcgKzExOSw2IEBAIGJvZHk6bm90KC53aW5kb3ct aW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAuaXRlbS52aXN1YWwtc3R5bGUtc2Vs ZWN0b3ItCiAuaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbTpub3QoLmRvbS1lbGVtZW50 LWljb24pLmVkaXRhYmxlID4gLnRpdGxlcyA+IC50aXRsZSB7CiAgICAgY3Vyc29yOiB0ZXh0Owog ICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IHRleHQ7Ci0gICAgLXdlYmtpdC11c2VyLW1vZGlmeTog cmVhZC13cml0ZS1wbGFpbnRleHQtb25seTsKIH0KIAogLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVj dG9yLWl0ZW06bm90KC5kb20tZWxlbWVudC1pY29uKS5lZGl0YWJsZSA+IC50aXRsZXMgPiAudGl0 bGU6Zm9jdXMgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpz CmluZGV4IGE4ZmVlN2MuLmMwNDRkMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNl bGVjdG9yVHJlZUl0ZW0uanMKQEAgLTExOSw2ICsxMTksNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVTZWxlY3RvclRyZWVJdGVtID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVt IGV4dAogICAgIG9uZGVzZWxlY3QoKQogICAgIHsKICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2Rl LmNsYXNzTGlzdC5yZW1vdmUoImVkaXRhYmxlIik7CisgICAgICAgIHRoaXMuX21haW5UaXRsZUVs ZW1lbnQuY29udGVudEVkaXRhYmxlID0gZmFsc2U7CiAgICAgfQogCiAgICAgcG9wdWxhdGVDb250 ZXh0TWVudShjb250ZXh0TWVudSwgZXZlbnQpCkBAIC0yMzksNiArMjQwLDcgQEAgV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbSA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0 b3JUcmVlSXRlbSBleHQKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl9saXN0 SXRlbU5vZGUuY2xhc3NMaXN0LnRvZ2dsZSgiZWRpdGFibGUiLCB0aGlzLnNlbGVjdGVkKTsKKyAg ICAgICAgdGhpcy5fbWFpblRpdGxlRWxlbWVudC5jb250ZW50RWRpdGFibGUgPSB0aGlzLnNlbGVj dGVkID8gInBsYWludGV4dC1vbmx5IiA6IGZhbHNlOwogICAgIH0KIAogICAgIF9oYW5kbGVNYWlu VGl0bGVLZXlEb3duKGV2ZW50KQpAQCAtMjU0LDYgKzI1Niw3IEBAIFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0gPSBjbGFzcyBWaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0 ZW0gZXh0CiAgICAgewogICAgICAgICB0aGlzLl9oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwogICAg ICAgICB0aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LnJlbW92ZSgiZWRpdGFibGUiKTsKKyAg ICAgICAgdGhpcy5fbWFpblRpdGxlRWxlbWVudC5jb250ZW50RWRpdGFibGUgPSBmYWxzZTsKICAg ICAgICAgdGhpcy5fdXBkYXRlVGl0bGVUb29sdGlwKCk7CiAKICAgICAgICAgbGV0IHZhbHVlID0g dGhpcy5zZWxlY3RvclRleHQ7Cg==