178795 2017-10-25 09:02:24 -0700 Web Inspector: Styles Redesign: typing colon in property name should advance to value field 2017-11-15 16:31:05 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg nvasilyev commit-queue hi inspector-bugzilla-changes nvasilyev webkit-bug-importer oldest_to_newest 1364221 0 bburg 2017-10-25 09:02:24 -0700 Steps to Reproduce: 1. Open style rules for an element 2. Add a new property name, add trailing : 3. Tab to the next field => property has two colons, should just have one and advance I don't think it's valid to have a colon in a property name, especially at the end, so the editor should be nice and ignore the keystroke while advancing to the next field. If you are used to typing out a complete property: value; string, then it will just do the right thing. This is similar to https://bugs.webkit.org/show_bug.cgi?id=178498, but for properties. 1364222 1 webkit-bug-importer 2017-10-25 09:02:38 -0700 <rdar://problem/35174674> 1371685 2 326953 nvasilyev 2017-11-14 18:05:13 -0800 Created attachment 326953 Patch Typing colon ANYWHERE in the property name advances to value field. This matches Chrome and Firefox. I could remove text on the right side of colon and prepend it to property value. I wasn't sure if it's useful, so I didn't do it in this patch. 1371709 3 326953 hi 2017-11-14 19:55:42 -0800 Comment on attachment 326953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326953&action=review r=me > Source/WebInspectorUI/ChangeLog:29 > + (WI.SpreadsheetTextField): NIT: this should be at the beginning of the WI.SpreadsheetTextField list. This happens to me every once in a while for some reason ¯\_(ツ)_/¯ > Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js:177 > + this._nameElement.addEventListener("beforeinput", (event) => { Since you are adding the event listener to the element itself, I'd reorder these. this._nameElement.tabIndex = 0; this._nameElement.addEventListener("beforeinput", this._handleNameBeforeinput.bind(this)); this._nameTextField = new WI.SpreadsheetTextField(this, this._nameElement, this._nameCompletionDataProvider.bind(this)); I'd also suggest moving the callback to be a member function. I typically try to only use inline event listeners for extremely small (effectively one line) callbacks, or contextmenu stuff. 1372449 4 327023 nvasilyev 2017-11-15 14:04:02 -0800 Created attachment 327023 Patch 1372466 5 commit-queue 2017-11-15 14:57:11 -0800 The commit-queue encountered the following flaky tests while processing attachment 327023: The commit-queue is continuing to process your patch. 1372493 6 327023 commit-queue 2017-11-15 16:31:03 -0800 Comment on attachment 327023 Patch Clearing flags on attachment: 327023 Committed r224906: <https://trac.webkit.org/changeset/224906> 1372494 7 commit-queue 2017-11-15 16:31:05 -0800 All reviewed patches have been landed. Closing bug. 326953 2017-11-14 18:05:13 -0800 2017-11-15 14:04:02 -0800 Patch patch.txt text/plain 7256 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc1NmZmZDkuLjc3MTNkNWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTExLTE0ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0eWxl cyBSZWRlc2lnbjogdHlwaW5nIGNvbG9uIGluIHByb3BlcnR5IG5hbWUgc2hvdWxkIGFkdmFuY2Ug dG8gdmFsdWUgZmllbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODc5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUxNzQ2NzQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNo ZWV0U3R5bGVQcm9wZXJ0eS5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIFVubGlrZSBwcmVz c2luZyBUYWIgb3IgRW50ZXIsIHR5cGluZyAiOiIgaW4gdGhlIHByb3BlcnR5IG5hbWUgc2hvdWxk IGRpc2NhcmQgc3VnZ2VzdGlvbiBoaW50LgorCisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxl UHJvcGVydHkucHJvdG90eXBlLl92YWx1ZUNvbXBsZXRpb25EYXRhUHJvdmlkZXIpOgorICAgICAg ICBXZSB1c2UgMjUwbXMgZGVib3VuY2UgYmVmb3JlIHVwZGF0aW5nIHRoaXMuX3Byb3BlcnR5Lm5h bWUuCisgICAgICAgIFdoZW4gdHlwaW5nICJmb250LWY6Iiwgd2Ugd2FudCB0byBkaXNjYXJkIHN1 Z2dlc3Rpb24gaGludCAoaS5lLiAiZm9udC1mYW1pbHkiKSwKKyAgICAgICAgYW5kIGltbWVkaWF0 ZWx5IHNob3cgYXV0b2NvbXBsZXRlIGZvciAiZm9udC1mIiAoaW4gdGhpcyBjYXNlLCBpbnZhbGlk IHByb3BlcnR5KS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRU ZXh0RmllbGQuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUu c3RvcEVkaXRpbmcpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBl LmRpc2NhcmRDb21wbGV0aW9uKToKKyAgICAgICAgQ2FsbCBzcHJlYWRzaGVldFRleHRGaWVsZERp ZENoYW5nZSB3aGVuIGRpc2NhcmRpbmcgbm9uLWVtcHR5IHN1Z2dlc3Rpb24gaGludC4KKworICAg ICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBlLmRldGFjaGVkKToKKyAgICAg ICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlwZS5jb21wbGV0aW9uU3VnZ2VzdGlv bnNDbGlja2VkQ29tcGxldGlvbik6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5w cm90b3R5cGUuX2hhbmRsZUJsdXIpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQu cHJvdG90eXBlLl9oYW5kbGVLZXlEb3duRm9yU3VnZ2VzdGlvblZpZXcpOgorICAgICAgICAoV0ku U3ByZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBlLl91cGRhdGVDb21wbGV0aW9ucyk6CisgICAg ICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUuX2FwcGx5Q29tcGxldGlvbkhp bnQpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQpOgorICAgICAgICAoV0kuU3By ZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBlLl9oaWRlQ29tcGxldGlvbnMpOiBEZWxldGVkLgor CiAyMDE3LTExLTE0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAg ICAgICAgUmVsaWNlbnNlIG5vbi1kaXN0cmlidXRhYmxlIHdlYiBpbnNwZWN0b3IgaW1hZ2VzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKaW5kZXggNTZmMTcwNzQuLjVm NjBkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKQEAgLTE3 NCw2ICsxNzQsMTQgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmICh0aGlzLl9w cm9wZXJ0eS5lZGl0YWJsZSAmJiB0aGlzLl9wcm9wZXJ0eS5lbmFibGVkKSB7CiAgICAgICAgICAg ICB0aGlzLl9uYW1lRWxlbWVudC50YWJJbmRleCA9IDA7CiAgICAgICAgICAgICB0aGlzLl9uYW1l VGV4dEZpZWxkID0gbmV3IFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkKHRoaXMsIHRoaXMuX25hbWVF bGVtZW50LCB0aGlzLl9uYW1lQ29tcGxldGlvbkRhdGFQcm92aWRlci5iaW5kKHRoaXMpKTsKKyAg ICAgICAgICAgIHRoaXMuX25hbWVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImJlZm9yZWlucHV0 IiwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgaWYgKGV2ZW50LmRhdGEgIT09ICI6IiB8 fCBldmVudC5pbnB1dFR5cGUgIT09ICJpbnNlcnRUZXh0IikKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9uYW1lVGV4dEZpZWxkLmRpc2NhcmRDb21wbGV0aW9uKCk7CisgICAg ICAgICAgICAgICAgdGhpcy5fdmFsdWVUZXh0RmllbGQuc3RhcnRFZGl0aW5nKCk7CisgICAgICAg ICAgICB9KTsKIAogICAgICAgICAgICAgdGhpcy5fdmFsdWVFbGVtZW50LnRhYkluZGV4ID0gMDsK ICAgICAgICAgICAgIHRoaXMuX3ZhbHVlVGV4dEZpZWxkID0gbmV3IFdJLlNwcmVhZHNoZWV0VGV4 dEZpZWxkKHRoaXMsIHRoaXMuX3ZhbHVlRWxlbWVudCwgdGhpcy5fdmFsdWVDb21wbGV0aW9uRGF0 YVByb3ZpZGVyLmJpbmQodGhpcykpOwpAQCAtNDcwLDcgKzQ3OCw4IEBAIFdJLlNwcmVhZHNoZWV0 U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJ Lk9iamVjdAogCiAgICAgX3ZhbHVlQ29tcGxldGlvbkRhdGFQcm92aWRlcihwcmVmaXgpCiAgICAg ewotICAgICAgICByZXR1cm4gV0kuQ1NTS2V5d29yZENvbXBsZXRpb25zLmZvclByb3BlcnR5KHRo aXMuX3Byb3BlcnR5Lm5hbWUpLnN0YXJ0c1dpdGgocHJlZml4KTsKKyAgICAgICAgbGV0IHByb3Bl cnR5TmFtZSA9IHRoaXMuX25hbWVFbGVtZW50LnRleHRDb250ZW50LnRyaW0oKTsKKyAgICAgICAg cmV0dXJuIFdJLkNTU0tleXdvcmRDb21wbGV0aW9ucy5mb3JQcm9wZXJ0eShwcm9wZXJ0eU5hbWUp LnN0YXJ0c1dpdGgocHJlZml4KTsKICAgICB9CiAKICAgICBfc2V0dXBKdW1wVG9TeW1ib2woZWxl bWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMKaW5kZXggNGY4ZTQ0ZC4uZmEy MjBiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMKQEAgLTEwOCwxMiArMTA4 LDI1IEBAIFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRUZXh0Rmll bGQKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJlZGl0aW5nIik7CiAg ICAgICAgIHRoaXMuX2VsZW1lbnQuY29udGVudEVkaXRhYmxlID0gZmFsc2U7CiAKLSAgICAgICAg dGhpcy5faGlkZUNvbXBsZXRpb25zKCk7CisgICAgICAgIHRoaXMuZGlzY2FyZENvbXBsZXRpb24o KTsKKyAgICB9CisKKyAgICBkaXNjYXJkQ29tcGxldGlvbigpCisgICAgeworICAgICAgICBpZiAo IXRoaXMuX2NvbXBsZXRpb25Qcm92aWRlcikKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICB0aGlzLl9zdWdnZXN0aW9uc1ZpZXcuaGlkZSgpOworCisgICAgICAgIGxldCBoYWRTdWdnZXN0 aW9uSGludCA9ICEhdGhpcy5zdWdnZXN0aW9uSGludDsKKyAgICAgICAgdGhpcy5zdWdnZXN0aW9u SGludCA9ICIiOworICAgICAgICBpZiAoaGFkU3VnZ2VzdGlvbkhpbnQgJiYgdGhpcy5fZGVsZWdh dGUgJiYgdHlwZW9mIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdl ID09PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRU ZXh0RmllbGREaWRDaGFuZ2UodGhpcyk7CiAgICAgfQogCiAgICAgZGV0YWNoZWQoKQogICAgIHsK LSAgICAgICAgdGhpcy5faGlkZUNvbXBsZXRpb25zKCk7CisgICAgICAgIHRoaXMuZGlzY2FyZENv bXBsZXRpb24oKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5yZW1vdmUoKTsKICAgICB9CiAKQEAg LTE1Niw3ICsxNjksNyBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNo ZWV0VGV4dEZpZWxkCiAgICAgICAgIC8vIFBsYWNlIHRleHQgY2FyZXQgYXQgdGhlIGVuZC4KICAg ICAgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNldEJhc2VBbmRFeHRlbnQodGhpcy5fZWxlbWVu dCwgc2VsZWN0ZWRUZXh0Lmxlbmd0aCwgdGhpcy5fZWxlbWVudCwgc2VsZWN0ZWRUZXh0Lmxlbmd0 aCk7CiAKLSAgICAgICAgdGhpcy5faGlkZUNvbXBsZXRpb25zKCk7CisgICAgICAgIHRoaXMuZGlz Y2FyZENvbXBsZXRpb24oKTsKIAogICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9m IHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdlID09PSAiZnVuY3Rp b24iKQogICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRUZXh0RmllbGREaWRD aGFuZ2UodGhpcyk7CkBAIC0xOTcsNyArMjEwLDcgQEAgV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQg PSBjbGFzcyBTcHJlYWRzaGVldFRleHRGaWVsZAogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIHRoaXMuX2FwcGx5Q29tcGxldGlvbkhpbnQoKTsKLSAgICAgICAgdGhpcy5faGlkZUNvbXBs ZXRpb25zKCk7CisgICAgICAgIHRoaXMuZGlzY2FyZENvbXBsZXRpb24oKTsKIAogICAgICAgICB0 aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVldFRleHRGaWVsZERpZEJsdXIodGhpcyk7CiAgICAgICAg IHRoaXMuc3RvcEVkaXRpbmcoKTsKQEAgLTI5Myw3ICszMDYsNyBAQCBXSS5TcHJlYWRzaGVldFRl eHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4dEZpZWxkCiAgICAgICAgICAgICBldmVudC5z dG9wKCk7CiAKICAgICAgICAgICAgIGxldCB3aWxsQ2hhbmdlID0gISF0aGlzLnN1Z2dlc3Rpb25I aW50OwotICAgICAgICAgICAgdGhpcy5faGlkZUNvbXBsZXRpb25zKCk7CisgICAgICAgICAgICB0 aGlzLmRpc2NhcmRDb21wbGV0aW9uKCk7CiAKICAgICAgICAgICAgIGlmICh3aWxsQ2hhbmdlICYm IHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVldFRleHRG aWVsZERpZENoYW5nZSA9PT0gImZ1bmN0aW9uIikKICAgICAgICAgICAgICAgICB0aGlzLl9kZWxl Z2F0ZS5zcHJlYWRzaGVldFRleHRGaWVsZERpZENoYW5nZSh0aGlzKTsKQEAgLTMwMiw3ICszMTUs NyBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4dEZpZWxk CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoZXZlbnQua2V5ID09PSAiQXJyb3dMZWZ0IiAmJiAo dGhpcy5zdWdnZXN0aW9uSGludCB8fCB0aGlzLl9zdWdnZXN0aW9uc1ZpZXcudmlzaWJsZSkpIHsK LSAgICAgICAgICAgIHRoaXMuX2hpZGVDb21wbGV0aW9ucygpOworICAgICAgICAgICAgdGhpcy5k aXNjYXJkQ29tcGxldGlvbigpOwogCiAgICAgICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYg dHlwZW9mIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdlID09PSAi ZnVuY3Rpb24iKQogICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4 dEZpZWxkRGlkQ2hhbmdlKHRoaXMpOwpAQCAtMzMyLDEzICszNDUsMTMgQEAgV0kuU3ByZWFkc2hl ZXRUZXh0RmllbGQgPSBjbGFzcyBTcHJlYWRzaGVldFRleHRGaWVsZAogICAgICAgICBsZXQgY29t cGxldGlvbnMgPSB0aGlzLl9jb21wbGV0aW9uUHJvdmlkZXIoY29tcGxldGlvblByZWZpeCk7CiAK ICAgICAgICAgaWYgKCFjb21wbGV0aW9ucy5sZW5ndGgpIHsKLSAgICAgICAgICAgIHRoaXMuX2hp ZGVDb21wbGV0aW9ucygpOworICAgICAgICAgICAgdGhpcy5kaXNjYXJkQ29tcGxldGlvbigpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgLy8gTm8gbmVlZCB0byBz aG93IHRoZSBjb21wbGV0aW9uIHBvcG92ZXIgd2l0aCBvbmx5IG9uZSBpdGVtIHRoYXQgbWF0Y2hl cyB0aGUgZW50ZXJlZCB2YWx1ZS4KICAgICAgICAgaWYgKGNvbXBsZXRpb25zLmxlbmd0aCA9PT0g MSAmJiBjb21wbGV0aW9uc1swXSA9PT0gcHJlZml4KSB7Ci0gICAgICAgICAgICB0aGlzLl9oaWRl Q29tcGxldGlvbnMoKTsKKyAgICAgICAgICAgIHRoaXMuZGlzY2FyZENvbXBsZXRpb24oKTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC00MDAsMTMgKzQxMyw0IEBAIFdJLlNw cmVhZHNoZWV0VGV4dEZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRUZXh0RmllbGQKIAogICAgICAg ICB0aGlzLl9lbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fZWxlbWVudC50ZXh0Q29udGVudDsK ICAgICB9Ci0KLSAgICBfaGlkZUNvbXBsZXRpb25zKCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhp cy5fY29tcGxldGlvblByb3ZpZGVyKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRo aXMuX3N1Z2dlc3Rpb25zVmlldy5oaWRlKCk7Ci0gICAgICAgIHRoaXMuc3VnZ2VzdGlvbkhpbnQg PSAiIjsKLSAgICB9CiB9Owo= 327023 2017-11-15 14:04:02 -0800 2017-11-15 16:31:03 -0800 Patch patch.txt text/plain 7507 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJiNWZlZTUuLjBjZjI0MGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE3LTExLTE1ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0eWxl cyBSZWRlc2lnbjogdHlwaW5nIGNvbG9uIGluIHByb3BlcnR5IG5hbWUgc2hvdWxkIGFkdmFuY2Ug dG8gdmFsdWUgZmllbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODc5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUxNzQ2NzQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVl dFN0eWxlUHJvcGVydHkucHJvdG90eXBlLl91cGRhdGUpOgorICAgICAgICAoV0kuU3ByZWFkc2hl ZXRTdHlsZVByb3BlcnR5LnByb3RvdHlwZS5faGFuZGxlTmFtZUJlZm9yZUlucHV0KToKKyAgICAg ICAgVW5saWtlIHByZXNzaW5nIFRhYiBvciBFbnRlciwgdHlwaW5nICI6IiBpbiB0aGUgcHJvcGVy dHkgbmFtZSBzaG91bGQgZGlzY2FyZCBzdWdnZXN0aW9uIGhpbnQuCisKKyAgICAgICAgKFdJLlNw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5wcm90b3R5cGUuX3ZhbHVlQ29tcGxldGlvbkRhdGFQcm92 aWRlcik6CisgICAgICAgIFdlIHVzZSAyNTBtcyBkZWJvdW5jZSBiZWZvcmUgdXBkYXRpbmcgdGhp cy5fcHJvcGVydHkubmFtZS4KKyAgICAgICAgV2hlbiB0eXBpbmcgImZvbnQtZjoiLCB3ZSB3YW50 IHRvIGRpc2NhcmQgc3VnZ2VzdGlvbiBoaW50IChpLmUuICJmb250LWZhbWlseSIpLAorICAgICAg ICBhbmQgaW1tZWRpYXRlbHkgc2hvdyBhdXRvY29tcGxldGUgZm9yICJmb250LWYiIChpbiB0aGlz IGNhc2UsIGludmFsaWQgcHJvcGVydHkpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZp ZWxkKToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlwZS5zdG9wRWRp dGluZyk6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUuZGlzY2Fy ZENvbXBsZXRpb24pOgorICAgICAgICBDYWxsIHNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdl IHdoZW4gZGlzY2FyZGluZyBub24tZW1wdHkgc3VnZ2VzdGlvbiBoaW50LgorCisgICAgICAgIChX SS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUuZGV0YWNoZWQpOgorICAgICAgICAoV0ku U3ByZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBlLmNvbXBsZXRpb25TdWdnZXN0aW9uc0NsaWNr ZWRDb21wbGV0aW9uKToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlw ZS5faGFuZGxlQmx1cik6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5 cGUuX2hhbmRsZUtleURvd25Gb3JTdWdnZXN0aW9uVmlldyk6CisgICAgICAgIChXSS5TcHJlYWRz aGVldFRleHRGaWVsZC5wcm90b3R5cGUuX3VwZGF0ZUNvbXBsZXRpb25zKToKKyAgICAgICAgKFdJ LlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlwZS5fYXBwbHlDb21wbGV0aW9uSGludCk6Cisg ICAgICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZC5wcm90b3R5cGUuX2hpZGVDb21wbGV0aW9u cyk6IERlbGV0ZWQuCisKIDIwMTctMTEtMTUgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFy b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbW92ZSBHVEsgd2ViIGluc3BlY3RvciBpbWFnZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCA1NmYxNzA3NC4u OTY2ODU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwpAQCAt MTczLDYgKzE3Myw4IEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVh ZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIGlmICh0aGlz Ll9wcm9wZXJ0eS5lZGl0YWJsZSAmJiB0aGlzLl9wcm9wZXJ0eS5lbmFibGVkKSB7CiAgICAgICAg ICAgICB0aGlzLl9uYW1lRWxlbWVudC50YWJJbmRleCA9IDA7CisgICAgICAgICAgICB0aGlzLl9u YW1lRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVpbnB1dCIsIHRoaXMuX2hhbmRsZU5h bWVCZWZvcmVJbnB1dC5iaW5kKHRoaXMpKTsKKwogICAgICAgICAgICAgdGhpcy5fbmFtZVRleHRG aWVsZCA9IG5ldyBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCh0aGlzLCB0aGlzLl9uYW1lRWxlbWVu dCwgdGhpcy5fbmFtZUNvbXBsZXRpb25EYXRhUHJvdmlkZXIuYmluZCh0aGlzKSk7CiAKICAgICAg ICAgICAgIHRoaXMuX3ZhbHVlRWxlbWVudC50YWJJbmRleCA9IDA7CkBAIC00NjMsNiArNDY1LDE2 IEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQ cm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl9wcm9wZXJ0eS5yYXdWYWx1 ZSA9IHRoaXMuX3ZhbHVlRWxlbWVudC50ZXh0Q29udGVudC50cmltKCk7CiAgICAgfQogCisgICAg X2hhbmRsZU5hbWVCZWZvcmVJbnB1dChldmVudCkKKyAgICB7CisgICAgICAgIGlmIChldmVudC5k YXRhICE9PSAiOiIgfHwgZXZlbnQuaW5wdXRUeXBlICE9PSAiaW5zZXJ0VGV4dCIpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAg dGhpcy5fbmFtZVRleHRGaWVsZC5kaXNjYXJkQ29tcGxldGlvbigpOworICAgICAgICB0aGlzLl92 YWx1ZVRleHRGaWVsZC5zdGFydEVkaXRpbmcoKTsKKyAgICB9CisKICAgICBfbmFtZUNvbXBsZXRp b25EYXRhUHJvdmlkZXIocHJlZml4KQogICAgIHsKICAgICAgICAgcmV0dXJuIFdJLkNTU0NvbXBs ZXRpb25zLmNzc05hbWVDb21wbGV0aW9ucy5zdGFydHNXaXRoKHByZWZpeCk7CkBAIC00NzAsNyAr NDgyLDggQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRT dHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfdmFsdWVDb21wbGV0aW9uRGF0 YVByb3ZpZGVyKHByZWZpeCkKICAgICB7Ci0gICAgICAgIHJldHVybiBXSS5DU1NLZXl3b3JkQ29t cGxldGlvbnMuZm9yUHJvcGVydHkodGhpcy5fcHJvcGVydHkubmFtZSkuc3RhcnRzV2l0aChwcmVm aXgpOworICAgICAgICBsZXQgcHJvcGVydHlOYW1lID0gdGhpcy5fbmFtZUVsZW1lbnQudGV4dENv bnRlbnQudHJpbSgpOworICAgICAgICByZXR1cm4gV0kuQ1NTS2V5d29yZENvbXBsZXRpb25zLmZv clByb3BlcnR5KHByb3BlcnR5TmFtZSkuc3RhcnRzV2l0aChwcmVmaXgpOwogICAgIH0KIAogICAg IF9zZXR1cEp1bXBUb1N5bWJvbChlbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVs ZC5qcwppbmRleCA0ZjhlNDRkLi5mYTIyMGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRG aWVsZC5qcwpAQCAtMTA4LDEyICsxMDgsMjUgQEAgV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQgPSBj bGFzcyBTcHJlYWRzaGVldFRleHRGaWVsZAogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlz dC5yZW1vdmUoImVkaXRpbmciKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5jb250ZW50RWRpdGFi bGUgPSBmYWxzZTsKIAotICAgICAgICB0aGlzLl9oaWRlQ29tcGxldGlvbnMoKTsKKyAgICAgICAg dGhpcy5kaXNjYXJkQ29tcGxldGlvbigpOworICAgIH0KKworICAgIGRpc2NhcmRDb21wbGV0aW9u KCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fY29tcGxldGlvblByb3ZpZGVyKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3N1Z2dlc3Rpb25zVmlldy5oaWRlKCk7CisK KyAgICAgICAgbGV0IGhhZFN1Z2dlc3Rpb25IaW50ID0gISF0aGlzLnN1Z2dlc3Rpb25IaW50Owor ICAgICAgICB0aGlzLnN1Z2dlc3Rpb25IaW50ID0gIiI7CisgICAgICAgIGlmIChoYWRTdWdnZXN0 aW9uSGludCAmJiB0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFk c2hlZXRUZXh0RmllbGREaWRDaGFuZ2UgPT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS5zcHJlYWRzaGVldFRleHRGaWVsZERpZENoYW5nZSh0aGlzKTsKICAgICB9CiAK ICAgICBkZXRhY2hlZCgpCiAgICAgewotICAgICAgICB0aGlzLl9oaWRlQ29tcGxldGlvbnMoKTsK KyAgICAgICAgdGhpcy5kaXNjYXJkQ29tcGxldGlvbigpOwogICAgICAgICB0aGlzLl9lbGVtZW50 LnJlbW92ZSgpOwogICAgIH0KIApAQCAtMTU2LDcgKzE2OSw3IEBAIFdJLlNwcmVhZHNoZWV0VGV4 dEZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRUZXh0RmllbGQKICAgICAgICAgLy8gUGxhY2UgdGV4 dCBjYXJldCBhdCB0aGUgZW5kLgogICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0QmFz ZUFuZEV4dGVudCh0aGlzLl9lbGVtZW50LCBzZWxlY3RlZFRleHQubGVuZ3RoLCB0aGlzLl9lbGVt ZW50LCBzZWxlY3RlZFRleHQubGVuZ3RoKTsKIAotICAgICAgICB0aGlzLl9oaWRlQ29tcGxldGlv bnMoKTsKKyAgICAgICAgdGhpcy5kaXNjYXJkQ29tcGxldGlvbigpOwogCiAgICAgICAgIGlmICh0 aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRUZXh0Rmll bGREaWRDaGFuZ2UgPT09ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5z cHJlYWRzaGVldFRleHRGaWVsZERpZENoYW5nZSh0aGlzKTsKQEAgLTE5Nyw3ICsyMTAsNyBAQCBX SS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4dEZpZWxkCiAgICAg ICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fYXBwbHlDb21wbGV0aW9uSGludCgpOwot ICAgICAgICB0aGlzLl9oaWRlQ29tcGxldGlvbnMoKTsKKyAgICAgICAgdGhpcy5kaXNjYXJkQ29t cGxldGlvbigpOwogCiAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxk RGlkQmx1cih0aGlzKTsKICAgICAgICAgdGhpcy5zdG9wRWRpdGluZygpOwpAQCAtMjkzLDcgKzMw Niw3IEBAIFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRUZXh0Rmll bGQKICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKIAogICAgICAgICAgICAgbGV0IHdpbGxDaGFu Z2UgPSAhIXRoaXMuc3VnZ2VzdGlvbkhpbnQ7Ci0gICAgICAgICAgICB0aGlzLl9oaWRlQ29tcGxl dGlvbnMoKTsKKyAgICAgICAgICAgIHRoaXMuZGlzY2FyZENvbXBsZXRpb24oKTsKIAogICAgICAg ICAgICAgaWYgKHdpbGxDaGFuZ2UgJiYgdGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuX2Rl bGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdlID09PSAiZnVuY3Rpb24iKQogICAg ICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0VGV4dEZpZWxkRGlkQ2hhbmdl KHRoaXMpOwpAQCAtMzAyLDcgKzMxNSw3IEBAIFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkID0gY2xh c3MgU3ByZWFkc2hlZXRUZXh0RmllbGQKICAgICAgICAgfQogCiAgICAgICAgIGlmIChldmVudC5r ZXkgPT09ICJBcnJvd0xlZnQiICYmICh0aGlzLnN1Z2dlc3Rpb25IaW50IHx8IHRoaXMuX3N1Z2dl c3Rpb25zVmlldy52aXNpYmxlKSkgewotICAgICAgICAgICAgdGhpcy5faGlkZUNvbXBsZXRpb25z KCk7CisgICAgICAgICAgICB0aGlzLmRpc2NhcmRDb21wbGV0aW9uKCk7CiAKICAgICAgICAgICAg IGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRU ZXh0RmllbGREaWRDaGFuZ2UgPT09ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICAgICAgdGhpcy5f ZGVsZWdhdGUuc3ByZWFkc2hlZXRUZXh0RmllbGREaWRDaGFuZ2UodGhpcyk7CkBAIC0zMzIsMTMg KzM0NSwxMyBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4 dEZpZWxkCiAgICAgICAgIGxldCBjb21wbGV0aW9ucyA9IHRoaXMuX2NvbXBsZXRpb25Qcm92aWRl cihjb21wbGV0aW9uUHJlZml4KTsKIAogICAgICAgICBpZiAoIWNvbXBsZXRpb25zLmxlbmd0aCkg ewotICAgICAgICAgICAgdGhpcy5faGlkZUNvbXBsZXRpb25zKCk7CisgICAgICAgICAgICB0aGlz LmRpc2NhcmRDb21wbGV0aW9uKCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAog ICAgICAgICAvLyBObyBuZWVkIHRvIHNob3cgdGhlIGNvbXBsZXRpb24gcG9wb3ZlciB3aXRoIG9u bHkgb25lIGl0ZW0gdGhhdCBtYXRjaGVzIHRoZSBlbnRlcmVkIHZhbHVlLgogICAgICAgICBpZiAo Y29tcGxldGlvbnMubGVuZ3RoID09PSAxICYmIGNvbXBsZXRpb25zWzBdID09PSBwcmVmaXgpIHsK LSAgICAgICAgICAgIHRoaXMuX2hpZGVDb21wbGV0aW9ucygpOworICAgICAgICAgICAgdGhpcy5k aXNjYXJkQ29tcGxldGlvbigpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAg LTQwMCwxMyArNDEzLDQgQEAgV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQgPSBjbGFzcyBTcHJlYWRz aGVldFRleHRGaWVsZAogCiAgICAgICAgIHRoaXMuX2VsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlz Ll9lbGVtZW50LnRleHRDb250ZW50OwogICAgIH0KLQotICAgIF9oaWRlQ29tcGxldGlvbnMoKQot ICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9jb21wbGV0aW9uUHJvdmlkZXIpCi0gICAgICAgICAg ICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fc3VnZ2VzdGlvbnNWaWV3LmhpZGUoKTsKLSAgICAg ICAgdGhpcy5zdWdnZXN0aW9uSGludCA9ICIiOwotICAgIH0KIH07Cg==