238661 2022-04-01 02:43:40 -0700 Web Inspector: Use computedStyleMap() instead of deprecated getPropertyCSSValue() 2022-04-08 03:36:41 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 cgarcia webkit-unassigned aperez ews-watchlist hi inspector-bugzilla-changes joepeck pangle webkit-bug-importer oldest_to_newest 1857211 0 cgarcia 2022-04-01 02:43:40 -0700 . 1857213 1 456340 cgarcia 2022-04-01 02:45:29 -0700 Created attachment 456340 Patch 1858366 2 cgarcia 2022-04-05 06:46:06 -0700 Ping reviewers. 1858483 3 456340 hi 2022-04-05 11:40:46 -0700 Comment on attachment 456340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456340&action=review Can you please add a comment in the ChangeLog explaining why this is desired/necessary? > Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:65 > + page.corePage()->settings().setCSSTypedOMEnabled(true); Since this is not something enabled by default, we should ensure that the frontend doesn't break if this is disabled. Could we create a helper function that still uses the old behavior if this isn't enabled? Something like: ``` Object.defineProperty(Element.prototype, "getComputedCSSPropertyNumberValue", { value(property) { let result = undefined; result ??= this.computedStyleMap?.().get(property)?.value; result ??= window.getComputedStyle(this).getPropertyCSSValue(property)?.getFloatValue(CSSPrimitiveValue.CSS_PX); return result; }, }); ``` 1858703 4 456340 cgarcia 2022-04-06 00:17:46 -0700 Comment on attachment 456340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456340&action=review >> Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:65 >> + page.corePage()->settings().setCSSTypedOMEnabled(true); > > Since this is not something enabled by default, we should ensure that the frontend doesn't break if this is disabled. Could we create a helper function that still uses the old behavior if this isn't enabled? Something like: > ``` > Object.defineProperty(Element.prototype, "getComputedCSSPropertyNumberValue", { > value(property) { > let result = undefined; > result ??= this.computedStyleMap?.().get(property)?.value; > result ??= window.getComputedStyle(this).getPropertyCSSValue(property)?.getFloatValue(CSSPrimitiveValue.CSS_PX); > return result; > }, > }); > ``` Doesn't the setting ensure it's always enabled in the inspector frontend? or do you mean adding the helper instead of changing the setting? 1858711 5 456340 hi 2022-04-06 00:44:43 -0700 Comment on attachment 456340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456340&action=review >>> Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:65 >>> + page.corePage()->settings().setCSSTypedOMEnabled(true); >> >> Since this is not something enabled by default, we should ensure that the frontend doesn't break if this is disabled. Could we create a helper function that still uses the old behavior if this isn't enabled? Something like: >> ``` >> Object.defineProperty(Element.prototype, "getComputedCSSPropertyNumberValue", { >> value(property) { >> let result = undefined; >> result ??= this.computedStyleMap?.().get(property)?.value; >> result ??= window.getComputedStyle(this).getPropertyCSSValue(property)?.getFloatValue(CSSPrimitiveValue.CSS_PX); >> return result; >> }, >> }); >> ``` > > Doesn't the setting ensure it's always enabled in the inspector frontend? or do you mean adding the helper instead of changing the setting? Oh sorry I wasn't entirely clear. This relies on *both* the setting and `ENABLE_CSS_TYPED_OM`. I was more concerned with about if `ENABLE_CSS_TYPED_OM` is not enabled (for whatever reason). If/When the build flag is removed, then we can remove the fallback code. 1858716 6 cgarcia 2022-04-06 01:03:59 -0700 (In reply to Devin Rousso from comment #5) > Comment on attachment 456340 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=456340&action=review > > >>> Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:65 > >>> + page.corePage()->settings().setCSSTypedOMEnabled(true); > >> > >> Since this is not something enabled by default, we should ensure that the frontend doesn't break if this is disabled. Could we create a helper function that still uses the old behavior if this isn't enabled? Something like: > >> ``` > >> Object.defineProperty(Element.prototype, "getComputedCSSPropertyNumberValue", { > >> value(property) { > >> let result = undefined; > >> result ??= this.computedStyleMap?.().get(property)?.value; > >> result ??= window.getComputedStyle(this).getPropertyCSSValue(property)?.getFloatValue(CSSPrimitiveValue.CSS_PX); > >> return result; > >> }, > >> }); > >> ``` > > > > Doesn't the setting ensure it's always enabled in the inspector frontend? or do you mean adding the helper instead of changing the setting? > > Oh sorry I wasn't entirely clear. This relies on *both* the setting and > `ENABLE_CSS_TYPED_OM`. I was more concerned with about if > `ENABLE_CSS_TYPED_OM` is not enabled (for whatever reason). If/When the > build flag is removed, then we can remove the fallback code. I'm not familiar with xcode build system, but I think CSS_TYPED_OM is enabled unconditionally in PlatformEnableCocoa.h (or can that be overridden with xcode magic?). And I enabled it by default for GTK and WPE ports too. 1858987 7 456340 hi 2022-04-06 12:56:26 -0700 Comment on attachment 456340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456340&action=review >>>>> Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:65 >>>>> + page.corePage()->settings().setCSSTypedOMEnabled(true); >>>> >>>> Since this is not something enabled by default, we should ensure that the frontend doesn't break if this is disabled. Could we create a helper function that still uses the old behavior if this isn't enabled? Something like: >>>> ``` >>>> Object.defineProperty(Element.prototype, "getComputedCSSPropertyNumberValue", { >>>> value(property) { >>>> let result = undefined; >>>> result ??= this.computedStyleMap?.().get(property)?.value; >>>> result ??= window.getComputedStyle(this).getPropertyCSSValue(property)?.getFloatValue(CSSPrimitiveValue.CSS_PX); >>>> return result; >>>> }, >>>> }); >>>> ``` >>> >>> Doesn't the setting ensure it's always enabled in the inspector frontend? or do you mean adding the helper instead of changing the setting? >> >> Oh sorry I wasn't entirely clear. This relies on *both* the setting and `ENABLE_CSS_TYPED_OM`. I was more concerned with about if `ENABLE_CSS_TYPED_OM` is not enabled (for whatever reason). If/When the build flag is removed, then we can remove the fallback code. > > I'm not familiar with xcode build system, but I think CSS_TYPED_OM is enabled unconditionally in PlatformEnableCocoa.h (or can that be overridden with xcode magic?). And I enabled it by default for GTK and WPE ports too. Yes, but on cocoa platforms that's predicated by `#if !defined(ENABLE_CSS_TYPED_OM)`. I admit it's probably unlikely that some build system would override this, but in the off chance that something does I'd hate for Web Inspector to be broken in that situation. We do something similar for other things that are guarded by flags (e.g. `WebGLRenderingContext`, `indexedDB`, etc.), just in case :) 1859202 8 456910 cgarcia 2022-04-07 04:58:22 -0700 Created attachment 456910 Patch 1859364 9 456910 hi 2022-04-07 12:16:43 -0700 Comment on attachment 456910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456910&action=review r=me, thanks! > Source/WebInspectorUI/ChangeLog:8 > + * UserInterface/Base/Utilities.js: Can you add some explanation as to why this change is needed/desired? Would be helpful for future engineers who may encounter this change and wonder why it was made :) 1859638 10 webkit-bug-importer 2022-04-08 02:44:14 -0700 <rdar://problem/91472876> 1859645 11 cgarcia 2022-04-08 03:23:56 -0700 Committed r292597 (249430@trunk): <https://commits.webkit.org/249430@trunk> 456340 2022-04-01 02:45:29 -0700 2022-04-07 04:58:22 -0700 Patch wi-computed-style-map.diff text/plain 5794 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIwZDA0MDU4MGZjYS4uNGEwNzQzYjI3ZTYzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wNC0wMSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogVXNlIGNvbXB1dGVkU3R5bGVNYXAoKSBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWQgZ2V0 UHJvcGVydHlDU1NWYWx1ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzg2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpzOgorICAgICAg ICAoV0kuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5pc0V2ZW50V2l0aGluRGlzY2xvc3VyZVRyaWFu Z2xlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qczoKKyAgICAgICAg KFdJLlRhYkJhci5wcm90b3R5cGUuX2hhbmRsZU1vdXNlTW92ZWQuaW5saW5lU3R5bGVWYWx1ZSk6 CisgICAgICAgIChXSS5UYWJCYXIucHJvdG90eXBlLl9oYW5kbGVNb3VzZU1vdmVkKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuVHJl ZUVsZW1lbnQucHJvdG90eXBlLmlzRXZlbnRXaXRoaW5EaXNjbG9zdXJlVHJpYW5nbGUpOgorCiAy MDIyLTAzLTMxICBQYXRyaWNrIEFuZ2xlICA8cGFuZ2xlQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBTdXBwb3J0IENvbnRhaW5lciBRdWVyaWVzIGluIHRoZSBTdHlsZXMgc2lk ZWJhcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YUdyaWROb2RlLmpzCmluZGV4IGEwYTcyMWQyMjViNy4uZjA0MGRlMDY2ZmQxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRh R3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGF0YUdyaWROb2RlLmpzCkBAIC02NTUsMTIgKzY1NSwxMiBAQCBXSS5EYXRhR3JpZE5vZGUg PSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKCFjZWxs IHx8ICFjZWxsLmNsYXNzTGlzdC5jb250YWlucygiZGlzY2xvc3VyZSIpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgICAgIGxldCBjb21wdXRlZFN0eWxlID0gd2luZG93LmdldENv bXB1dGVkU3R5bGUoY2VsbCk7CisgICAgICAgIGxldCBjb21wdXRlZFN0eWxlID0gY2VsbC5jb21w dXRlZFN0eWxlTWFwKCk7CiAgICAgICAgIGxldCBzdGFydCA9IDA7CiAgICAgICAgIGlmIChXSS5y ZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rpb24uUlRMKQotICAg ICAgICAgICAgc3RhcnQgKz0gY2VsbC50b3RhbE9mZnNldFJpZ2h0IC0gY29tcHV0ZWRTdHlsZS5n ZXRQcm9wZXJ0eUNTU1ZhbHVlKCJwYWRkaW5nLXJpZ2h0IikuZ2V0RmxvYXRWYWx1ZShDU1NQcmlt aXRpdmVWYWx1ZS5DU1NfUFgpIC0gdGhpcy5kaXNjbG9zdXJlVG9nZ2xlV2lkdGg7CisgICAgICAg ICAgICBzdGFydCArPSBjZWxsLnRvdGFsT2Zmc2V0UmlnaHQgLSBjb21wdXRlZFN0eWxlLmdldCgi cGFkZGluZy1yaWdodCIpLnZhbHVlIC0gdGhpcy5kaXNjbG9zdXJlVG9nZ2xlV2lkdGg7CiAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgIHN0YXJ0ICs9IGNlbGwudG90YWxPZmZzZXRMZWZ0ICsgY29t cHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCJwYWRkaW5nLWxlZnQiKS5nZXRGbG9hdFZh bHVlKENTU1ByaW1pdGl2ZVZhbHVlLkNTU19QWCk7CisgICAgICAgICAgICBzdGFydCArPSBjZWxs LnRvdGFsT2Zmc2V0TGVmdCArIGNvbXB1dGVkU3R5bGUuZ2V0KCJwYWRkaW5nLWxlZnQiKS52YWx1 ZTsKICAgICAgICAgcmV0dXJuIGV2ZW50LnBhZ2VYID49IHN0YXJ0ICYmIGV2ZW50LnBhZ2VYIDw9 IHN0YXJ0ICsgdGhpcy5kaXNjbG9zdXJlVG9nZ2xlV2lkdGg7CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKaW5kZXgg Mzk2NjY5NTEyZjVjLi43ZWU4OWM3NmViNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKQEAgLTg1Niw3ICs4NTYsNyBAQCBX SS5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIC8vIEZJWE1F OiBBbmltYXRlIHRoZSB0YWJzIHRoYXQgbW92ZSB0byBtYWtlIHJvb20gZm9yIHRoZSBzZWxlY3Rl ZCB0YWIuIFRoaXMgd2FzIGNhdXNpbmcgbWUgdHJvdWJsZSB3aGVuIEkgdHJpZWQuCiAKICAgICAg ICAgZnVuY3Rpb24gaW5saW5lU3R5bGVWYWx1ZShlbGVtZW50LCBwcm9wZXJ0eSkgewotICAgICAg ICAgICAgcmV0dXJuIGVsZW1lbnQuc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShwcm9wZXJ0eSku Z2V0RmxvYXRWYWx1ZShDU1NQcmltaXRpdmVWYWx1ZS5DU1NfUFgpIHx8IDA7CisgICAgICAgICAg ICByZXR1cm4gZWxlbWVudC5jb21wdXRlZFN0eWxlTWFwKCkuZ2V0KHByb3BlcnR5KS52YWx1ZSB8 fCAwOwogICAgICAgICB9CiAKICAgICAgICAgbGV0IGFjY3VtdWxhdGVkTGVmdCA9IDA7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxl bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVF bGVtZW50LmpzCmluZGV4IGM2OTA2OTlmZWJkMC4uZjFjOWY2YzNjZTRiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVu dC5qcwpAQCAtNjU3LDEyICs2NTcsMTIgQEAgV0kuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVlRWxl bWVudCBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg ICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90IHVzZSBnZXRDb21wdXRlZFN0eWxlKCkuIEZvciB0 aGF0IHdlIG5lZWQgdG8gZ2V0IHJpZCBvZiB1c2luZyA6OmJlZm9yZSBmb3IgZGlzY2xvc3VyZSB0 cmlhbmdsZS4gKGh0dHA6Ly93ZWJrLml0Lzc0NDQ2KQotICAgICAgICBsZXQgY29tcHV0ZWRTdHls ZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRoaXMuX2xpc3RJdGVtTm9kZSk7CisgICAgICAg IGxldCBjb21wdXRlZFN0eWxlID0gdGhpcy5fbGlzdEl0ZW1Ob2RlLmNvbXB1dGVkU3R5bGVNYXAo KTsKICAgICAgICAgbGV0IHN0YXJ0ID0gMDsKICAgICAgICAgaWYgKGNvbXB1dGVkU3R5bGUuZGly ZWN0aW9uID09PSBXSS5MYXlvdXREaXJlY3Rpb24uUlRMKQotICAgICAgICAgICAgc3RhcnQgKz0g dGhpcy5fbGlzdEl0ZW1Ob2RlLnRvdGFsT2Zmc2V0UmlnaHQgLSBjb21wdXRlZFN0eWxlLmdldFBy b3BlcnR5Q1NTVmFsdWUoInBhZGRpbmctcmlnaHQiKS5nZXRGbG9hdFZhbHVlKENTU1ByaW1pdGl2 ZVZhbHVlLkNTU19QWCkgLSB0aGlzLmFycm93VG9nZ2xlV2lkdGg7CisgICAgICAgICAgICBzdGFy dCArPSB0aGlzLl9saXN0SXRlbU5vZGUudG90YWxPZmZzZXRSaWdodCAtIGNvbXB1dGVkU3R5bGUu Z2V0KCJwYWRkaW5nLXJpZ2h0IikudmFsdWUgLSB0aGlzLmFycm93VG9nZ2xlV2lkdGg7CiAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgIHN0YXJ0ICs9IHRoaXMuX2xpc3RJdGVtTm9kZS50b3RhbE9m ZnNldExlZnQgKyBjb21wdXRlZFN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoInBhZGRpbmctbGVm dCIpLmdldEZsb2F0VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUuQ1NTX1BYKTsKKyAgICAgICAgICAg IHN0YXJ0ICs9IHRoaXMuX2xpc3RJdGVtTm9kZS50b3RhbE9mZnNldExlZnQgKyBjb21wdXRlZFN0 eWxlLmdldCgicGFkZGluZy1sZWZ0IikudmFsdWU7CiAKICAgICAgICAgcmV0dXJuIGV2ZW50LnBh Z2VYID49IHN0YXJ0ICYmIGV2ZW50LnBhZ2VYIDw9IHN0YXJ0ICsgdGhpcy5hcnJvd1RvZ2dsZVdp ZHRoICYmIHRoaXMuaGFzQ2hpbGRyZW47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5MzVlNGEyNGEwODgu LjBiY2EyY2Q1ZWQwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMi0wNC0wMSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogVXNlIGNvbXB1dGVkU3R5bGVNYXAoKSBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWQgZ2V0 UHJvcGVydHlDU1NWYWx1ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzg2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBFbnN1cmUgQ1NTIFR5cGUgT00gaXMgZW5hYmxlZCBpbiBpbnNwZWN0b3IgZnJv bnRlbmQgcGFnZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3Rv clVJLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yVUk6OmVuYWJsZUZyb250ZW5k RmVhdHVyZXMpOgorCiAyMDIyLTA0LTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyOTAzNjApOiBbR0xYXSBDcmFzaCBv biBwcm9jZXNzIGV4aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNw ZWN0b3IvV2ViSW5zcGVjdG9yVUkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luc3Bl Y3Rvci9XZWJJbnNwZWN0b3JVSS5jcHAKaW5kZXggNzcwMzliZGMyNDY2Li42YTY2NmRkODE2ODIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVj dG9yVUkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5z cGVjdG9yVUkuY3BwCkBAIC02MSw2ICs2MSw5IEBAIHZvaWQgV2ViSW5zcGVjdG9yVUk6OmVuYWJs ZUZyb250ZW5kRmVhdHVyZXMoV2ViUGFnZSYgcGFnZSkKICNpZiBFTkFCTEUoV0VCR0wyKQogICAg IHBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zZXRXZWJHTDJFbmFibGVkKHRydWUpOwogI2Vu ZGlmCisjaWYgRU5BQkxFKENTU19UWVBFRF9PTSkKKyAgICBwYWdlLmNvcmVQYWdlKCktPnNldHRp bmdzKCkuc2V0Q1NTVHlwZWRPTUVuYWJsZWQodHJ1ZSk7CisjZW5kaWYKIH0KIAogV2ViSW5zcGVj dG9yVUk6OldlYkluc3BlY3RvclVJKFdlYlBhZ2UmIHBhZ2UpCg== 456910 2022-04-07 04:58:22 -0700 2022-04-08 03:36:41 -0700 Patch wi-computed-style-map.diff text/plain 6559 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM1NzJjNGRkZTBhMy4uZDMyYTgyZjI1MDQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMi0wNC0wNyAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogVXNlIGNvbXB1dGVkU3R5bGVNYXAoKSBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWQgZ2V0 UHJvcGVydHlDU1NWYWx1ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzg2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChn ZXQgcmV0dXJuKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5q czoKKyAgICAgICAgKFdJLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuaXNFdmVudFdpdGhpbkRpc2Ns b3N1cmVUcmlhbmdsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanM6 CisgICAgICAgIChXSS5UYWJCYXIucHJvdG90eXBlLl9oYW5kbGVNb3VzZU1vdmVkLmlubGluZVN0 eWxlVmFsdWUpOgorICAgICAgICAoV0kuVGFiQmFyLnByb3RvdHlwZS5faGFuZGxlTW91c2VNb3Zl ZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qczoKKyAgICAg ICAgKFdJLlRyZWVFbGVtZW50LnByb3RvdHlwZS5pc0V2ZW50V2l0aGluRGlzY2xvc3VyZVRyaWFu Z2xlKToKKwogMjAyMi0wNC0wNSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVncmVzc2lvbihyMjkxNzI5KSBUaGUgcmVzdWx0IG9m IGxvZ2dpbmcgJDAgdG8gdGhlIGNvbnNvbGUgc2hvd3Mgb3ZlcmxhcHBpbmcgYCQwYCBhbmQgYCRb bl1gIGFmdGVyIHRoZSBub2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IDNkMDdlYmY0ODY1Mi4uMzE1MDhiODA0 Y2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL1V0aWxpdGllcy5qcwpAQCAtNDg4LDYgKzQ4OCwxNSBAQCBPYmplY3QuZGVmaW5lUHJvcGVy dHkoRWxlbWVudC5wcm90b3R5cGUsICJyZWNhbGN1bGF0ZVN0eWxlcyIsCiAgICAgfQogfSk7CiAK K09iamVjdC5kZWZpbmVQcm9wZXJ0eShFbGVtZW50LnByb3RvdHlwZSwgImdldENvbXB1dGVkQ1NT UHJvcGVydHlOdW1iZXJWYWx1ZSIsIHsKKyAgICB2YWx1ZShwcm9wZXJ0eSkgeworICAgICAgICBs ZXQgcmVzdWx0ID0gdW5kZWZpbmVkOworICAgICAgICByZXN1bHQgPz89IHRoaXMuY29tcHV0ZWRT dHlsZU1hcD8uKCkuZ2V0KHByb3BlcnR5KT8udmFsdWU7CisgICAgICAgIHJlc3VsdCA/Pz0gd2lu ZG93LmdldENvbXB1dGVkU3R5bGUodGhpcykuZ2V0UHJvcGVydHlDU1NWYWx1ZShwcm9wZXJ0eSk/ LmdldEZsb2F0VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUuQ1NTX1BYKTsKKyAgICAgICAgcmV0dXJu IHJlc3VsdDsKKyAgICB9LAorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShEb2N1bWVudEZy YWdtZW50LnByb3RvdHlwZSwgImNyZWF0ZUNoaWxkIiwKIHsKICAgICB2YWx1ZTogRWxlbWVudC5w cm90b3R5cGUuY3JlYXRlQ2hpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qcwppbmRleCBhMGE3MjFkMjI1Yjcu LmYwMDQwMjU0MDU1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qcwpAQCAtNjU1LDEyICs2NTUsMTEgQEAg V0kuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAg ICAgICAgIGlmICghY2VsbCB8fCAhY2VsbC5jbGFzc0xpc3QuY29udGFpbnMoImRpc2Nsb3N1cmUi KSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBsZXQgY29tcHV0ZWRTdHls ZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGNlbGwpOwogICAgICAgICBsZXQgc3RhcnQgPSAw OwogICAgICAgICBpZiAoV0kucmVzb2x2ZWRMYXlvdXREaXJlY3Rpb24oKSA9PT0gV0kuTGF5b3V0 RGlyZWN0aW9uLlJUTCkKLSAgICAgICAgICAgIHN0YXJ0ICs9IGNlbGwudG90YWxPZmZzZXRSaWdo dCAtIGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgicGFkZGluZy1yaWdodCIpLmdl dEZsb2F0VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUuQ1NTX1BYKSAtIHRoaXMuZGlzY2xvc3VyZVRv Z2dsZVdpZHRoOworICAgICAgICAgICAgc3RhcnQgKz0gY2VsbC50b3RhbE9mZnNldFJpZ2h0IC0g Y2VsbC5nZXRDb21wdXRlZENTU1Byb3BlcnR5TnVtYmVyVmFsdWUoInBhZGRpbmctcmlnaHQiKSAt IHRoaXMuZGlzY2xvc3VyZVRvZ2dsZVdpZHRoOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBz dGFydCArPSBjZWxsLnRvdGFsT2Zmc2V0TGVmdCArIGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgicGFkZGluZy1sZWZ0IikuZ2V0RmxvYXRWYWx1ZShDU1NQcmltaXRpdmVWYWx1ZS5D U1NfUFgpOworICAgICAgICAgICAgc3RhcnQgKz0gY2VsbC50b3RhbE9mZnNldExlZnQgKyBjZWxs LmdldENvbXB1dGVkQ1NTUHJvcGVydHlOdW1iZXJWYWx1ZSgicGFkZGluZy1sZWZ0Iik7CiAgICAg ICAgIHJldHVybiBldmVudC5wYWdlWCA+PSBzdGFydCAmJiBldmVudC5wYWdlWCA8PSBzdGFydCAr IHRoaXMuZGlzY2xvc3VyZVRvZ2dsZVdpZHRoOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCmluZGV4IDM5NjY2OTUx MmY1Yy4uYTBlMDI1YmYxMmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCkBAIC04NTYsNyArODU2LDcgQEAgV0kuVGFiQmFy ID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV0kuVmlldwogICAgICAgICAvLyBGSVhNRTogQW5pbWF0 ZSB0aGUgdGFicyB0aGF0IG1vdmUgdG8gbWFrZSByb29tIGZvciB0aGUgc2VsZWN0ZWQgdGFiLiBU aGlzIHdhcyBjYXVzaW5nIG1lIHRyb3VibGUgd2hlbiBJIHRyaWVkLgogCiAgICAgICAgIGZ1bmN0 aW9uIGlubGluZVN0eWxlVmFsdWUoZWxlbWVudCwgcHJvcGVydHkpIHsKLSAgICAgICAgICAgIHJl dHVybiBlbGVtZW50LnN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUocHJvcGVydHkpLmdldEZsb2F0 VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUuQ1NTX1BYKSB8fCAwOworICAgICAgICAgICAgcmV0dXJu IGVsZW1lbnQuZ2V0Q29tcHV0ZWRDU1NQcm9wZXJ0eU51bWJlclZhbHVlKHByb3BlcnR5KSB8fCAw OwogICAgICAgICB9CiAKICAgICAgICAgbGV0IGFjY3VtdWxhdGVkTGVmdCA9IDA7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVu dC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVt ZW50LmpzCmluZGV4IGM2OTA2OTlmZWJkMC4uNDExNGVjMjc4ZDJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5q cwpAQCAtNjYwLDkgKzY2MCw5IEBAIFdJLlRyZWVFbGVtZW50ID0gY2xhc3MgVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgbGV0IGNvbXB1dGVkU3R5bGUgPSB3aW5kb3cuZ2V0 Q29tcHV0ZWRTdHlsZSh0aGlzLl9saXN0SXRlbU5vZGUpOwogICAgICAgICBsZXQgc3RhcnQgPSAw OwogICAgICAgICBpZiAoY29tcHV0ZWRTdHlsZS5kaXJlY3Rpb24gPT09IFdJLkxheW91dERpcmVj dGlvbi5SVEwpCi0gICAgICAgICAgICBzdGFydCArPSB0aGlzLl9saXN0SXRlbU5vZGUudG90YWxP ZmZzZXRSaWdodCAtIGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgicGFkZGluZy1y aWdodCIpLmdldEZsb2F0VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUuQ1NTX1BYKSAtIHRoaXMuYXJy b3dUb2dnbGVXaWR0aDsKKyAgICAgICAgICAgIHN0YXJ0ICs9IHRoaXMuX2xpc3RJdGVtTm9kZS50 b3RhbE9mZnNldFJpZ2h0IC0gdGhpcy5fbGlzdEl0ZW1Ob2RlLmdldENvbXB1dGVkQ1NTUHJvcGVy dHlOdW1iZXJWYWx1ZSgicGFkZGluZy1yaWdodCIpIC0gdGhpcy5hcnJvd1RvZ2dsZVdpZHRoOwog ICAgICAgICBlbHNlCi0gICAgICAgICAgICBzdGFydCArPSB0aGlzLl9saXN0SXRlbU5vZGUudG90 YWxPZmZzZXRMZWZ0ICsgY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCJwYWRkaW5n LWxlZnQiKS5nZXRGbG9hdFZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlLkNTU19QWCk7CisgICAgICAg ICAgICBzdGFydCArPSB0aGlzLl9saXN0SXRlbU5vZGUudG90YWxPZmZzZXRMZWZ0ICsgdGhpcy5f bGlzdEl0ZW1Ob2RlLmdldENvbXB1dGVkQ1NTUHJvcGVydHlOdW1iZXJWYWx1ZSgicGFkZGluZy1s ZWZ0Iik7CiAKICAgICAgICAgcmV0dXJuIGV2ZW50LnBhZ2VYID49IHN0YXJ0ICYmIGV2ZW50LnBh Z2VYIDw9IHN0YXJ0ICsgdGhpcy5hcnJvd1RvZ2dsZVdpZHRoICYmIHRoaXMuaGFzQ2hpbGRyZW47 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCBhYzZlMWRmZjMxMzkuLjNkNzhhZjM4NGQ0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAyMi0wNC0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVXNlIGNvbXB1dGVkU3R5 bGVNYXAoKSBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWQgZ2V0UHJvcGVydHlDU1NWYWx1ZSgpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2NjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgQ1NTIFR5 cGUgT00gaXMgZW5hYmxlZCBpbiBpbnNwZWN0b3IgZnJvbnRlbmQgcGFnZS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViSW5zcGVjdG9yVUk6OmVuYWJsZUZyb250ZW5kRmVhdHVyZXMpOgorCiAyMDIyLTA0LTA3 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLiBGaXggR1RLIGJ1aWxkIGFmdGVyIHIyOTI1MDYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUkuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSS5jcHAKaW5kZXggN2Rk NGI1MDRkZGM0Li43NzA1NTE5MTkzYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUkuY3BwCkBAIC02MSw2ICs2MSw5IEBAIHZv aWQgV2ViSW5zcGVjdG9yVUk6OmVuYWJsZUZyb250ZW5kRmVhdHVyZXMoV2ViUGFnZSYgcGFnZSkK ICNpZiBFTkFCTEUoV0VCR0wyKQogICAgIHBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zZXRX ZWJHTDJFbmFibGVkKHRydWUpOwogI2VuZGlmCisjaWYgRU5BQkxFKENTU19UWVBFRF9PTSkKKyAg ICBwYWdlLmNvcmVQYWdlKCktPnNldHRpbmdzKCkuc2V0Q1NTVHlwZWRPTUVuYWJsZWQodHJ1ZSk7 CisjZW5kaWYKIH0KIAogV2ViSW5zcGVjdG9yVUk6OldlYkluc3BlY3RvclVJKFdlYlBhZ2UmIHBh Z2UpCg==