223418 2021-03-18 00:32:59 -0700 Web Inspector: Layout sidebar grid overlay color swatch tooltip shouldn't include "switch format" hint 2021-04-06 00:28:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle rcaliman bburg ews-watchlist hi inspector-bugzilla-changes rcaliman webkit-bug-importer oldest_to_newest 1741056 0 pangle 2021-03-18 00:32:59 -0700 Steps to reproduce: 1. Inspect a page with a CSS grid 2. Hover over a grid overlay swatch in the Layout sidebar Results: Tooltip will read: ``` Click to select a color Shift-click to switch color formats ``` Expected result: Tooltip should read: ``` Click to select a color ``` and not reference switching formats, which is not applicable in this context. 1743685 1 webkit-bug-importer 2021-03-25 00:33:14 -0700 <rdar://problem/75825793> 1746023 2 424896 rcaliman 2021-04-01 08:05:14 -0700 Created attachment 424896 Patch 1746054 3 424896 pangle 2021-04-01 09:15:30 -0700 Comment on attachment 424896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424896&action=review > Source/WebInspectorUI/UserInterface/Views/InlineSwatch.js:184 > if (this._allowShiftClickColor()) Just noticing there is a check if shift-clicking should even be allowed, and if it is false we would get the string we wanted. Maybe instead of passing a title into the swatch we should support directly enabling/disabling shift-click, since _swatchElementClicked also has a check for shift-clicking being allowed? 1746076 4 424896 bburg 2021-04-01 09:54:32 -0700 Comment on attachment 424896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424896&action=review >> Source/WebInspectorUI/UserInterface/Views/InlineSwatch.js:184 >> if (this._allowShiftClickColor()) > > Just noticing there is a check if shift-clicking should even be allowed, and if it is false we would get the string we wanted. Maybe instead of passing a title into the swatch we should support directly enabling/disabling shift-click, since _swatchElementClicked also has a check for shift-clicking being allowed? +1, it makes more sense to me, to have the swatch object itself be readonly. 1746100 5 424912 rcaliman 2021-04-01 10:59:00 -0700 Created attachment 424912 Patch 1746114 6 424912 bburg 2021-04-01 11:21:05 -0700 Comment on attachment 424912 Patch r=me The logic looks fine to me. I am not fond of the existing _allowShiftClickColor name. Something more like allowsChangingColorFormats would be more about the semantics of what is possible or not, rather than how it is currently exposed. 1746116 7 424912 pangle 2021-04-01 11:23:22 -0700 Comment on attachment 424912 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424912&action=review > Source/WebInspectorUI/UserInterface/Views/InlineSwatch.js:128 > + set shiftClickColorEnabled(value) { NIT: `{` on next line 1746461 8 425010 rcaliman 2021-04-02 05:25:11 -0700 Created attachment 425010 Patch Carry over R+; Update method name, fix style issue 1747310 9 ews-feeder 2021-04-06 00:28:35 -0700 Committed r275493: <https://commits.webkit.org/r275493> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425010. 424896 2021-04-01 08:05:14 -0700 2021-04-01 10:58:56 -0700 Patch bug-223418-20210401170512.patch text/plain 5302 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMzMDUzZmI2YTAzYTRiMWZmZTY2OGEyZWM5ZDJh NDEwNTQxYjViNGUuLmIxYTEyM2Y5MWRjODUwYmRjZjg3NWJiZWI5MTJlMGRiOTQ4M2FkY2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTAxICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBMYXlvdXQgc2lkZWJhciBncmlkIG92ZXJsYXkgY29sb3Igc3dhdGNoIHRvb2x0aXAgc2hvdWxk bid0IGluY2x1ZGUgInN3aXRjaCBmb3JtYXQiIGhpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzU4MjU3OTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWxsb3cgc2V0dGluZyBhIGN1c3RvbSB0aXRsZSBhdHRyaWJ1dGUgdmFsdWUgZm9yIGBJbmxp bmVTd2F0Y2hgLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlv bi5qczoKKyAgICAgICAgKFdJLkNTU0dyaWRTZWN0aW9uLnByb3RvdHlwZS5sYXlvdXQpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmpzOgorICAgICAgICAoV0ku SW5saW5lU3dhdGNoKToKKyAgICAgICAgKFdJLklubGluZVN3YXRjaC5wcm90b3R5cGUuX3VwZGF0 ZVN3YXRjaCk6CisKIDIwMjEtMDMtMzEgIFBhdHJpY2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlZ3Jlc3Npb24gKHIyNzAxMzQpIFRpbWVsaW5l IHJlY29yZGluZ3MgMiBhbmQgYmV5b25kIGRvIG5vdCBzaG93IGEgdGltZXNjYWxlLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNl Y3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NH cmlkU2VjdGlvbi5qcwppbmRleCAyN2NhNzE1NWQxZTZkODI4YzJkY2EyOTU3NjE3N2I2ZTkzMGQ1 Mjc5Li44OTZkNmJhMDI0MTYyMzczMDk5ZTk2OGUwYTMwZTEwYWE1MzYyNDE1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlv bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NH cmlkU2VjdGlvbi5qcwpAQCAtMTM1LDcgKzEzNSw4IEBAIFdJLkNTU0dyaWRTZWN0aW9uID0gY2xh c3MgQ1NTR3JpZFNlY3Rpb24gZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICB9KTsKIAogICAg ICAgICAgICAgbGV0IGdyaWRDb2xvciA9IFdJLm92ZXJsYXlNYW5hZ2VyLmdldEdyaWRDb2xvckZv ck5vZGUoZG9tTm9kZSk7Ci0gICAgICAgICAgICBsZXQgc3dhdGNoID0gbmV3IFdJLklubGluZVN3 YXRjaChXSS5JbmxpbmVTd2F0Y2guVHlwZS5Db2xvciwgZ3JpZENvbG9yKTsKKyAgICAgICAgICAg IGNvbnN0IHJlYWRPbmx5ID0gZmFsc2U7CisgICAgICAgICAgICBsZXQgc3dhdGNoID0gbmV3IFdJ LklubGluZVN3YXRjaChXSS5JbmxpbmVTd2F0Y2guVHlwZS5Db2xvciwgZ3JpZENvbG9yLCByZWFk T25seSwgV0kuVUlTdHJpbmcoIkNsaWNrIHRvIHNlbGVjdCBhIGNvbG9yIikpOwogICAgICAgICAg ICAgaXRlbUNvbnRhaW5lckVsZW1lbnQuYXBwZW5kKHN3YXRjaC5lbGVtZW50KTsKIAogICAgICAg ICAgICAgc3dhdGNoLmFkZEV2ZW50TGlzdGVuZXIoV0kuSW5saW5lU3dhdGNoLkV2ZW50LlZhbHVl Q2hhbmdlZCwgKGV2ZW50KSA9PiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMKaW5kZXggYjE4YjIwZjY2YTFl NWMxYzQyODJlMjZmZjI5ZThmMDU2MThiYzRhOC4uMDk3MjRiNTEwNjg0ODljYzViZTZhZTIxMTQz ZDgxMjQ1ZDVjYzgwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5qcwpAQCAtMjYsMTEgKzI2LDEyIEBACiAK IFdJLklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJLk9iamVjdAog ewotICAgIGNvbnN0cnVjdG9yKHR5cGUsIHZhbHVlLCByZWFkT25seSkKKyAgICBjb25zdHJ1Y3Rv cih0eXBlLCB2YWx1ZSwgcmVhZE9ubHksIHRpdGxlKQogICAgIHsKICAgICAgICAgc3VwZXIoKTsK IAogICAgICAgICB0aGlzLl90eXBlID0gdHlwZTsKKyAgICAgICAgdGhpcy5fdGl0bGUgPSB0aXRs ZTsKIAogICAgICAgICBzd2l0Y2ggKHRoaXMuX3R5cGUpIHsKICAgICAgICAgY2FzZSBXSS5Jbmxp bmVTd2F0Y2guVHlwZS5CZXppZXI6CkBAIC01OCwxMSArNTksMTEgQEAgV0kuSW5saW5lU3dhdGNo ID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGVsc2Ugewog ICAgICAgICAgICAgc3dpdGNoICh0aGlzLl90eXBlKSB7CiAgICAgICAgICAgICBjYXNlIFdJLklu bGluZVN3YXRjaC5UeXBlLkJlemllcjoKLSAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVt ZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkVkaXQgXHUyMDFDY3ViaWMtYmV6aWVyXHUyMDFEIGZ1 bmN0aW9uIik7CisgICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IHRo aXMuX3RpdGxlIHx8IFdJLlVJU3RyaW5nKCJFZGl0IFx1MjAxQ2N1YmljLWJlemllclx1MjAxRCBm dW5jdGlvbiIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBjYXNlIFdJ LklubGluZVN3YXRjaC5UeXBlLkJveFNoYWRvdzoKLSAgICAgICAgICAgICAgICB0aGlzLl9zd2F0 Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkVkaXQgXHUyMDFDYm94LXNoYWRvd1x1MjAx RCIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0bGUgPSB0aGlzLl90 aXRsZSB8fCBXSS5VSVN0cmluZygiRWRpdCBcdTIwMUNib3gtc2hhZG93XHUyMDFEIik7CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5 cGUuQ29sb3I6CkBAIC03MCwxOSArNzEsMTkgQEAgV0kuSW5saW5lU3dhdGNoID0gY2xhc3MgSW5s aW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAg ICAgICAgICAgIGNhc2UgV0kuSW5saW5lU3dhdGNoLlR5cGUuR3JhZGllbnQ6Ci0gICAgICAgICAg ICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5nKCJFZGl0IGN1c3Rv bSBncmFkaWVudCIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0bGUg PSB0aGlzLl90aXRsZSB8fCBXSS5VSVN0cmluZygiRWRpdCBjdXN0b20gZ3JhZGllbnQiKTsKICAg ICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSBXSS5JbmxpbmVTd2F0Y2gu VHlwZS5JbWFnZToKLSAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0g V0kuVUlTdHJpbmcoIlZpZXcgSW1hZ2UiKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hF bGVtZW50LnRpdGxlID0gdGhpcy5fdGl0bGUgfHwgV0kuVUlTdHJpbmcoIlZpZXcgSW1hZ2UiKTsK ICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSBXSS5JbmxpbmVTd2F0 Y2guVHlwZS5TcHJpbmc6Ci0gICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRs ZSA9IFdJLlVJU3RyaW5nKCJFZGl0IFx1MjAxQ3NwcmluZ1x1MjAxRCBmdW5jdGlvbiIpOworICAg ICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0bGUgPSB0aGlzLl90aXRsZSB8fCBX SS5VSVN0cmluZygiRWRpdCBcdTIwMUNzcHJpbmdcdTIwMUQgZnVuY3Rpb24iKTsKICAgICAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5W YXJpYWJsZToKLSAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0ku VUlTdHJpbmcoIkNsaWNrIHRvIHZpZXcgdmFyaWFibGUgdmFsdWVcblNoaWZ0LWNsaWNrIHRvIHJl cGxhY2UgdmFyaWFibGUgd2l0aCB2YWx1ZSIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRj aEVsZW1lbnQudGl0bGUgPSB0aGlzLl90aXRsZSB8fCBXSS5VSVN0cmluZygiQ2xpY2sgdG8gdmll dyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sgdG8gcmVwbGFjZSB2YXJpYWJsZSB3aXRoIHZh bHVlIik7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGRlZmF1bHQ6CkBA IC0xODEsOSArMTgyLDkgQEAgV0kuSW5saW5lU3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4 dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgaWYgKHRoaXMuX3R5cGUgPT09IFdJLklubGluZVN3 YXRjaC5UeXBlLkNvbG9yKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5fYWxsb3dTaGlmdENsaWNr Q29sb3IoKSkKLSAgICAgICAgICAgICAgICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0ku VUlTdHJpbmcoIkNsaWNrIHRvIHNlbGVjdCBhIGNvbG9yXG5TaGlmdC1jbGljayB0byBzd2l0Y2gg Y29sb3IgZm9ybWF0cyIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRjaEVsZW1lbnQudGl0 bGUgPSB0aGlzLl90aXRsZSB8fCBXSS5VSVN0cmluZygiQ2xpY2sgdG8gc2VsZWN0IGEgY29sb3Jc blNoaWZ0LWNsaWNrIHRvIHN3aXRjaCBjb2xvciBmb3JtYXRzIik7CiAgICAgICAgICAgICBlbHNl Ci0gICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5n KCJDbGljayB0byBzZWxlY3QgYSBjb2xvciIpOworICAgICAgICAgICAgICAgIHRoaXMuX3N3YXRj aEVsZW1lbnQudGl0bGUgPSB0aGlzLl90aXRsZSB8fCBXSS5VSVN0cmluZygiQ2xpY2sgdG8gc2Vs ZWN0IGEgY29sb3IiKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghZG9udEZpcmVFdmVudHMp Cg== 424912 2021-04-01 10:59:00 -0700 2021-04-02 05:25:08 -0700 Patch bug-223418-20210401195859.patch text/plain 3080 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMzMDUzZmI2YTAzYTRiMWZmZTY2OGEyZWM5ZDJh NDEwNTQxYjViNGUuLmNlN2FlYWUyNWFlYTEzZDlkYTM5MTYyNzY1MWNhN2U5YjM2YTI1ZjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTAxICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBMYXlvdXQgc2lkZWJhciBncmlkIG92ZXJsYXkgY29sb3Igc3dhdGNoIHRvb2x0aXAgc2hvdWxk bid0IGluY2x1ZGUgInN3aXRjaCBmb3JtYXQiIGhpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzU4MjU3OTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzOgorICAgICAgICAoV0ku Q1NTR3JpZFNlY3Rpb24ucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9JbmxpbmVTd2F0Y2guanM6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gpOgorICAg ICAgICAoV0kuSW5saW5lU3dhdGNoLnByb3RvdHlwZS5zZXQgc2hpZnRDbGlja0NvbG9yRW5hYmxl ZCk6CisgICAgICAgIChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9hbGxvd1NoaWZ0Q2xpY2tD b2xvcik6CisKIDIwMjEtMDMtMzEgIFBhdHJpY2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlZ3Jlc3Npb24gKHIyNzAxMzQpIFRpbWVsaW5lIHJl Y29yZGluZ3MgMiBhbmQgYmV5b25kIGRvIG5vdCBzaG93IGEgdGltZXNjYWxlLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rp b24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlk U2VjdGlvbi5qcwppbmRleCAyN2NhNzE1NWQxZTZkODI4YzJkY2EyOTU3NjE3N2I2ZTkzMGQ1Mjc5 Li4wZjM4NmI5YzY2OTRlZTBhOWFhMDM4Yzk1MTgzNWVhOTVmZjczMzY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlk U2VjdGlvbi5qcwpAQCAtMTM2LDYgKzEzNiw3IEBAIFdJLkNTU0dyaWRTZWN0aW9uID0gY2xhc3Mg Q1NTR3JpZFNlY3Rpb24gZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAgICAgICAgIGxldCBncmlkQ29s b3IgPSBXSS5vdmVybGF5TWFuYWdlci5nZXRHcmlkQ29sb3JGb3JOb2RlKGRvbU5vZGUpOwogICAg ICAgICAgICAgbGV0IHN3YXRjaCA9IG5ldyBXSS5JbmxpbmVTd2F0Y2goV0kuSW5saW5lU3dhdGNo LlR5cGUuQ29sb3IsIGdyaWRDb2xvcik7CisgICAgICAgICAgICBzd2F0Y2guc2hpZnRDbGlja0Nv bG9yRW5hYmxlZCA9IGZhbHNlOwogICAgICAgICAgICAgaXRlbUNvbnRhaW5lckVsZW1lbnQuYXBw ZW5kKHN3YXRjaC5lbGVtZW50KTsKIAogICAgICAgICAgICAgc3dhdGNoLmFkZEV2ZW50TGlzdGVu ZXIoV0kuSW5saW5lU3dhdGNoLkV2ZW50LlZhbHVlQ2hhbmdlZCwgKGV2ZW50KSA9PiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVT d2F0Y2guanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Jbmxp bmVTd2F0Y2guanMKaW5kZXggYjE4YjIwZjY2YTFlNWMxYzQyODJlMjZmZjI5ZThmMDU2MThiYzRh OC4uNGUwZmEyMjEyZWQzZjQwMzJjYTA5ZWU4ZmY3ZDMzODY2YmI4YmUxZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3 YXRjaC5qcwpAQCAtNjYsNiArNjYsNyBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVT d2F0Y2ggZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICAgICAgY2FzZSBXSS5JbmxpbmVTd2F0Y2guVHlwZS5Db2xvcjoKKyAgICAgICAgICAgICAgICB0 aGlzLl9zaGlmdENsaWNrQ29sb3JFbmFibGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAvLyBI YW5kbGVkIGxhdGVyIGJ5IF91cGRhdGVTd2F0Y2guCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAK QEAgLTEyNCw2ICsxMjUsMTEgQEAgV0kuSW5saW5lU3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNo IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX3VwZGF0ZVN3YXRjaCh0cnVlKTsKICAg ICB9CiAKKyAgICBzZXQgc2hpZnRDbGlja0NvbG9yRW5hYmxlZCh2YWx1ZSkgeworICAgICAgICB0 aGlzLl9zaGlmdENsaWNrQ29sb3JFbmFibGVkID0gISF2YWx1ZTsKKyAgICAgICAgdGhpcy5fdXBk YXRlU3dhdGNoKHRydWUpOworICAgIH0KKwogICAgIC8vIFBvcG92ZXIgZGVsZWdhdGUKIAogICAg IGRpZERpc21pc3NQb3BvdmVyKHBvcG92ZXIpCkBAIC0xOTIsNyArMTk4LDcgQEAgV0kuSW5saW5l U3dhdGNoID0gY2xhc3MgSW5saW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfYWxs b3dTaGlmdENsaWNrQ29sb3IoKQogICAgIHsKLSAgICAgICAgcmV0dXJuICF0aGlzLl9yZWFkT25s eSAmJiAhdGhpcy52YWx1ZS5pc091dHNpZGVTUkdCKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9z aGlmdENsaWNrQ29sb3JFbmFibGVkICYmICF0aGlzLl9yZWFkT25seSAmJiAhdGhpcy52YWx1ZS5p c091dHNpZGVTUkdCKCk7CiAgICAgfQogCiAgICAgX3N3YXRjaEVsZW1lbnRDbGlja2VkKGV2ZW50 KQo= 425010 2021-04-02 05:25:11 -0700 2021-04-06 00:28:36 -0700 Patch bug-223418-20210402142510.patch text/plain 4213 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMzMDUzZmI2YTAzYTRiMWZmZTY2OGEyZWM5ZDJh NDEwNTQxYjViNGUuLmU0NmQ5Mjg4NTcxOWRjYjY1Yjk2Yzg0NzY5ZDEyYmYzNjkxNGFjZGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTAyICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBMYXlvdXQgc2lkZWJhciBncmlkIG92ZXJsYXkgY29sb3Igc3dhdGNoIHRvb2x0aXAgc2hvdWxk bid0IGluY2x1ZGUgInN3aXRjaCBmb3JtYXQiIGhpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzU4MjU3OTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQkogQnVyZy4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanM6CisgICAgICAgIChXSS5DU1NHcmlk U2VjdGlvbi5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0lubGluZVN3YXRjaC5qczoKKyAgICAgICAgKFdJLklubGluZVN3YXRjaCk6CisgICAgICAgIChX SS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLnNldCBzaGlmdENsaWNrQ29sb3JFbmFibGVkKToKKyAg ICAgICAgKFdJLklubGluZVN3YXRjaC5wcm90b3R5cGUuX3VwZGF0ZVN3YXRjaCk6CisgICAgICAg IChXSS5JbmxpbmVTd2F0Y2gucHJvdG90eXBlLl9hbGxvd0NoYW5naW5nQ29sb3JGb3JtYXRzKToK KwogMjAyMS0wMy0zMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogUmVncmVzc2lvbiAocjI3MDEzNCkgVGltZWxpbmUgcmVjb3JkaW5n cyAyIGFuZCBiZXlvbmQgZG8gbm90IHNob3cgYSB0aW1lc2NhbGUuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9u LmpzCmluZGV4IDI3Y2E3MTU1ZDFlNmQ4MjhjMmRjYTI5NTc2MTc3YjZlOTMwZDUyNzkuLjBmMzg2 YjljNjY5NGVlMGE5YWEwMzhjOTUxODM1ZWE5NWZmNzMzNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9u LmpzCkBAIC0xMzYsNiArMTM2LDcgQEAgV0kuQ1NTR3JpZFNlY3Rpb24gPSBjbGFzcyBDU1NHcmlk U2VjdGlvbiBleHRlbmRzIFdJLlZpZXcKIAogICAgICAgICAgICAgbGV0IGdyaWRDb2xvciA9IFdJ Lm92ZXJsYXlNYW5hZ2VyLmdldEdyaWRDb2xvckZvck5vZGUoZG9tTm9kZSk7CiAgICAgICAgICAg ICBsZXQgc3dhdGNoID0gbmV3IFdJLklubGluZVN3YXRjaChXSS5JbmxpbmVTd2F0Y2guVHlwZS5D b2xvciwgZ3JpZENvbG9yKTsKKyAgICAgICAgICAgIHN3YXRjaC5zaGlmdENsaWNrQ29sb3JFbmFi bGVkID0gZmFsc2U7CiAgICAgICAgICAgICBpdGVtQ29udGFpbmVyRWxlbWVudC5hcHBlbmQoc3dh dGNoLmVsZW1lbnQpOwogCiAgICAgICAgICAgICBzd2F0Y2guYWRkRXZlbnRMaXN0ZW5lcihXSS5J bmxpbmVTd2F0Y2guRXZlbnQuVmFsdWVDaGFuZ2VkLCAoZXZlbnQpID0+IHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRj aC5qcwppbmRleCBiMThiMjBmNjZhMWU1YzFjNDI4MmUyNmZmMjllOGYwNTYxOGJjNGE4Li44MWU0 OGRiNDQ3N2IwN2RmY2NiNmJkNzA3N2I4NDQ1MzJmZDY3OTM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmpz CkBAIC02Niw2ICs2Niw3IEBAIFdJLklubGluZVN3YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBl eHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBj YXNlIFdJLklubGluZVN3YXRjaC5UeXBlLkNvbG9yOgorICAgICAgICAgICAgICAgIHRoaXMuX3No aWZ0Q2xpY2tDb2xvckVuYWJsZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgIC8vIEhhbmRsZWQg bGF0ZXIgYnkgX3VwZGF0ZVN3YXRjaC4KICAgICAgICAgICAgICAgICBicmVhazsKIApAQCAtMTI0 LDYgKzEyNSwxMiBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVTd2F0Y2ggZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fdXBkYXRlU3dhdGNoKHRydWUpOwogICAgIH0KIAor ICAgIHNldCBzaGlmdENsaWNrQ29sb3JFbmFibGVkKHZhbHVlKQorICAgIHsKKyAgICAgICAgdGhp cy5fc2hpZnRDbGlja0NvbG9yRW5hYmxlZCA9ICEhdmFsdWU7CisgICAgICAgIHRoaXMuX3VwZGF0 ZVN3YXRjaCh0cnVlKTsKKyAgICB9CisKICAgICAvLyBQb3BvdmVyIGRlbGVnYXRlCiAKICAgICBk aWREaXNtaXNzUG9wb3Zlcihwb3BvdmVyKQpAQCAtMTgwLDcgKzE4Nyw3IEBAIFdJLklubGluZVN3 YXRjaCA9IGNsYXNzIElubGluZVN3YXRjaCBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAg dGhpcy5fc3dhdGNoSW5uZXJFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJiYWNrZ3JvdW5kLWlt YWdlIiwgYHVybCgke3ZhbHVlLnNyY30pYCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3R5cGUgPT09 IFdJLklubGluZVN3YXRjaC5UeXBlLkNvbG9yKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fYWxs b3dTaGlmdENsaWNrQ29sb3IoKSkKKyAgICAgICAgICAgIGlmICh0aGlzLl9hbGxvd0NoYW5naW5n Q29sb3JGb3JtYXRzKCkpCiAgICAgICAgICAgICAgICAgdGhpcy5fc3dhdGNoRWxlbWVudC50aXRs ZSA9IFdJLlVJU3RyaW5nKCJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQtY2xpY2sgdG8g c3dpdGNoIGNvbG9yIGZvcm1hdHMiKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICB0aGlzLl9zd2F0Y2hFbGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkNsaWNrIHRvIHNlbGVj dCBhIGNvbG9yIik7CkBAIC0xOTAsOSArMTk3LDkgQEAgV0kuSW5saW5lU3dhdGNoID0gY2xhc3Mg SW5saW5lU3dhdGNoIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXSS5JbmxpbmVTd2F0Y2guRXZlbnQuVmFsdWVDaGFuZ2VkLCB7dmFs dWV9KTsKICAgICB9CiAKLSAgICBfYWxsb3dTaGlmdENsaWNrQ29sb3IoKQorICAgIF9hbGxvd0No YW5naW5nQ29sb3JGb3JtYXRzKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAhdGhpcy5fcmVhZE9u bHkgJiYgIXRoaXMudmFsdWUuaXNPdXRzaWRlU1JHQigpOworICAgICAgICByZXR1cm4gdGhpcy5f c2hpZnRDbGlja0NvbG9yRW5hYmxlZCAmJiAhdGhpcy5fcmVhZE9ubHkgJiYgIXRoaXMudmFsdWUu aXNPdXRzaWRlU1JHQigpOwogICAgIH0KIAogICAgIF9zd2F0Y2hFbGVtZW50Q2xpY2tlZChldmVu dCkKQEAgLTIwMyw3ICsyMTAsNyBAQCBXSS5JbmxpbmVTd2F0Y2ggPSBjbGFzcyBJbmxpbmVTd2F0 Y2ggZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICBpZiAoZXZlbnQuc2hpZnRLZXkgJiYgdmFs dWUpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl90eXBlID09PSBXSS5JbmxpbmVTd2F0Y2guVHlw ZS5Db2xvcikgewotICAgICAgICAgICAgICAgIGlmICghdGhpcy5fYWxsb3dTaGlmdENsaWNrQ29s b3IoKSkgeworICAgICAgICAgICAgICAgIGlmICghdGhpcy5fYWxsb3dDaGFuZ2luZ0NvbG9yRm9y bWF0cygpKSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5iZWVw KCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9Cg==