224807 2021-04-20 02:05:58 -0700 Clean up handling of `-webkit-inline-flex`/`-webkit-flex` CSS display values 2021-05-24 06:59:28 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224574 1 ntim ntim changseok esprehn+autocc ews-watchlist glenn gyuyoung.kim koivisto kondapallykalyan macpherson menard pdr webkit-bug-importer oldest_to_newest 1752180 0 ntim 2021-04-20 02:05:58 -0700 Context: WebKit supports the `-webkit-inline-flex`/`-webkit-flex` values for the CSS `display` property. They are aliases for `inline-flex`/`flex` specifically. Right now, those values are handled as separate `DisplayType` (see https://webkit-search.igalia.com/webkit/rev/240c1d5ec6ecbabd0053aad3ea5e985e53198714/Source/WebCore/rendering/style/RenderStyleConstants.h#908,910), instead we'd like to alias them directly at parse time in the `consumeDisplay` function of CSSPropertyParser.cpp. This does change the serialization (what is returned when you do `element.style.display` or `getComputedStyle(element).display`) of `-webkit-flex`/`-webkit-inline-flex` to `flex`/`inline-flex`, but this change is ok. Some tests may need to be updated to reflect this though. Steps to fix: * Add special cases directly at the beginning of the `consumeDisplay` function: ``` // Convert -webkit-flex/-webkit-inline-flex to flex/inline-flex if (range.peek().id() == CSSValueWebkitInlineFlex) return consumeIdent(range); if (range.peek().id() == CSSValueWebkitFlex) return consumeIdent(range); ``` * Move -webkit-flex/-webkit-inline-flex in Source/WebCore/css/CSSValueKeywords.in after `flow`, to avoid breaking `DisplayType display = static_cast<DisplayType>(m_value.valueID - CSSValueInline);` in CSSPrimitiveValue.cpp * Remove the WebKitFlex/WebKitInlineFlex values from the `DisplayType` enum. * Also remove all their usages too: https://webkit-search.igalia.com/webkit/search?q=DisplayType%3A%3AWebKitFlex&path=&case=false&regexp=false https://webkit-search.igalia.com/webkit/search?q=DisplayType%3A%3AWebKitInlineFlex&path=&case=false&regexp=false * Fix all potential failing tests (You'll find those by running `Tools/Scripts/run-webkit-tests --no-retry --no-show LayoutTests/` or by submitting the patch on Bugzilla and checking EWS failures). The failures will be due tests expecting `-webkit-flex`/`-webkit-inline-flex` instead of the unprefixed version when serializing. The tests should be changed to reflect that. Please feel free to reach out on the WebKit Slack for any questions (I'm @ntim). 1752191 1 webkit-bug-importer 2021-04-20 02:29:00 -0700 <rdar://problem/76888941> 1752197 2 ntim 2021-04-20 02:35:24 -0700 Sorry, the snippet I suggested was wrong, here's one that should be correct: + // Convert -webkit-flex/-webkit-inline-flex to flex/inline-flex + CSSValueID nextValueID = range.peek().id(); + if (nextValueID == CSSValueWebkitInlineFlex || nextValueID == CSSValueWebkitFlex) { + consumeIdent(range); + return CSSValuePool::singleton().createValue( + nextValueID == CSSValueWebkitInlineFlex ? CSSValueInlineFlex : CSSValueFlex); + } 1763061 3 ntim 2021-05-24 01:31:06 -0700 I'll take this. 1763070 4 429513 ntim 2021-05-24 02:22:23 -0700 Created attachment 429513 Patch 1763108 5 ews-feeder 2021-05-24 06:59:26 -0700 Committed r277949 (238076@main): <https://commits.webkit.org/238076@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429513. 429513 2021-05-24 02:22:23 -0700 2021-05-24 06:59:27 -0700 Patch bug-224807-20210524112222.patch text/plain 8262 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkOGFlNWMwY2NmYmU3 NmM4NGI4ZWY4OGRmODFlMmQ0YWVhZTIyOS4uN2JmMzllMTA5MDFkNjg3YmJjODg4NmQzZjFmNzRj YWNlYTFhMzFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA1LTI0ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgaGFuZGxpbmcgb2Yg YC13ZWJraXQtaW5saW5lLWZsZXhgL2Atd2Via2l0LWZsZXhgIENTUyBkaXNwbGF5IHZhbHVlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0ODA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlc2UgYXJl IG5vdyBhbGlhc2VkIGF0IHBhcnNlLXRpbWUsIGxpa2UgdGhlIHR3by12YWx1ZSBDU1MgZGlzcGxh eSBzeW50YXggaXMuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5o OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVl KToKKyAgICAgICAgKiBjc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbjoKKyAgICAgICAgKiBjc3MvcGFy c2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVEaXNw bGF5KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzSW5saW5lTGV2ZWxCb3ggY29uc3QpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckVsZW1lbnQ6OmNyZWF0ZUZvcik6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlQ29uc3RhbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgorICAgICAg ICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oOgorICAgICAgICAqIHN0 eWxlL1N0eWxlQWRqdXN0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmVxdWl2YWxl bnRCbG9ja0Rpc3BsYXkpOgorCiAyMDIxLTA1LTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgTWFrZSBDaGVja2VkTG9jayB0aGUgZGVmYXVsdCBMb2NrCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA4YWQz ZGNjNjllYWRjMTcxMjc4OGMyMGU2ZWYxNTQ5MGJhMWEwM2ExLi5lMzVmYTgwMzkzNWU2MTJkOTQ4 YzY4YWFmMDgxZTM3ODU4NDhhMGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmlt aXRpdmVWYWx1ZU1hcHBpbmdzLmgKQEAgLTEzODUsMTEgKzEzODUsOSBAQCB0ZW1wbGF0ZTw+IGlu bGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRGlzcGxheVR5cGUgZSkK ICAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVXZWJraXRJbmxpbmVCb3g7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgRGlzcGxheVR5cGU6OkZsZXg6Ci0gICAgY2FzZSBEaXNwbGF5 VHlwZTo6V2ViS2l0RmxleDoKICAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVGbGV4 OwogICAgICAgICBicmVhazsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpJbmxpbmVGbGV4OgotICAg IGNhc2UgRGlzcGxheVR5cGU6OldlYktpdElubGluZUZsZXg6CiAgICAgICAgIG1fdmFsdWUudmFs dWVJRCA9IENTU1ZhbHVlSW5saW5lRmxleDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBEaXNw bGF5VHlwZTo6R3JpZDoKQEAgLTE0MTksMTAgKzE0MTcsNiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBD U1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRGlzcGxheVR5cGUoKSBjb25zdAogCiAgICAgRGlz cGxheVR5cGUgZGlzcGxheSA9IHN0YXRpY19jYXN0PERpc3BsYXlUeXBlPihtX3ZhbHVlLnZhbHVl SUQgLSBDU1NWYWx1ZUlubGluZSk7CiAgICAgQVNTRVJUKGRpc3BsYXkgPj0gRGlzcGxheVR5cGU6 OklubGluZSAmJiBkaXNwbGF5IDw9IERpc3BsYXlUeXBlOjpOb25lKTsKLSAgICBpZiAoZGlzcGxh eSA9PSBEaXNwbGF5VHlwZTo6V2ViS2l0RmxleCkKLSAgICAgICAgcmV0dXJuIERpc3BsYXlUeXBl OjpGbGV4OwotICAgIGlmIChkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpXZWJLaXRJbmxpbmVGbGV4 KQotICAgICAgICByZXR1cm4gRGlzcGxheVR5cGU6OklubGluZUZsZXg7CiAgICAgcmV0dXJuIGRp c3BsYXk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdv cmRzLmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KaW5kZXggNmFj MDE5YzhiNGM1NGE1NWYzYTgwNzVkMWRkZWYyMGE4MGE1OGE5ZS4uZmZiNjQzZmI5ZmQyYTIzMjdk YmZhMzI1MDg0NjM0NjUwMjk4ZWYxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1ZhbHVlS2V5d29yZHMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29y ZHMuaW4KQEAgLTQ2NiwxNCArNDY2LDE0IEBAIHRhYmxlLWNhcHRpb24KIC13ZWJraXQtYm94CiAt d2Via2l0LWlubGluZS1ib3gKIGZsZXgKLS13ZWJraXQtZmxleAogaW5saW5lLWZsZXgKLS13ZWJr aXQtaW5saW5lLWZsZXgKIGNvbnRlbnRzCiBncmlkCiBpbmxpbmUtZ3JpZAogZmxvdy1yb290CiBm bG93Cistd2Via2l0LWlubGluZS1mbGV4Cistd2Via2l0LWZsZXgKIC8vbm9uZQogLy8KIC8vIENT U19QUk9QX0NVUlNPUjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NT UHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0 eVBhcnNlci5jcHAKaW5kZXggYzA0YmY3MDJlYzRiMTg0MjY2YTZkNWFiMWNhMzIwMjlmMWM1YWQ5 OS4uOWNjZGI2MTU3ZDhhNWM5ZmU5NzVkZWFhNzJhNjc4MGUxZGE0NjYzNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKQEAgLTQwNCw4ICs0 MDQsNiBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lRGlzcGxheShDU1NQYXJzZXJU b2tlblJhbmdlJiByYW5nZSkKICAgICAgICAgLy8gUHJlZml4ZWQgdmFsdWVzCiAgICAgICAgIENT U1ZhbHVlV2Via2l0SW5saW5lQm94LAogICAgICAgICBDU1NWYWx1ZVdlYmtpdEJveCwKLSAgICAg ICAgQ1NTVmFsdWVXZWJraXRJbmxpbmVGbGV4LAotICAgICAgICBDU1NWYWx1ZVdlYmtpdEZsZXgs CiAgICAgICAgIC8vIE5vIGxheW91dCBzdXBwb3J0IGZvciB0aGUgZnVsbCA8ZGlzcGxheS1saXN0 aXRlbT4gc3ludGF4LCBzbyB0cmVhdCBpdCBhcyA8ZGlzcGxheS1sZWdhY3k+CiAgICAgICAgIENT U1ZhbHVlTGlzdEl0ZW0KICAgICA+KHJhbmdlKTsKQEAgLTQxNyw2ICs0MTUsMTQgQEAgc3RhdGlj IFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZURpc3BsYXkoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFu Z2UpCiAgICAgaWYgKHJhbmdlLmF0RW5kKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisg ICAgLy8gQ29udmVydCAtd2Via2l0LWZsZXgvLXdlYmtpdC1pbmxpbmUtZmxleCB0byBmbGV4L2lu bGluZS1mbGV4CisgICAgQ1NTVmFsdWVJRCBuZXh0VmFsdWVJRCA9IHJhbmdlLnBlZWsoKS5pZCgp OworICAgIGlmIChuZXh0VmFsdWVJRCA9PSBDU1NWYWx1ZVdlYmtpdElubGluZUZsZXggfHwgbmV4 dFZhbHVlSUQgPT0gQ1NTVmFsdWVXZWJraXRGbGV4KSB7CisgICAgICAgIGNvbnN1bWVJZGVudChy YW5nZSk7CisgICAgICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZVZh bHVlKAorICAgICAgICAgICAgbmV4dFZhbHVlSUQgPT0gQ1NTVmFsdWVXZWJraXRJbmxpbmVGbGV4 ID8gQ1NTVmFsdWVJbmxpbmVGbGV4IDogQ1NTVmFsdWVGbGV4KTsKKyAgICB9CisKICAgICAvLyBQ YXJzZSBbIDxkaXNwbGF5LW91dHNpZGU+IHx8IDxkaXNwbGF5LWluc2lkZT4gXQogICAgIE9wdGlv bmFsPENTU1ZhbHVlSUQ+IHBhcnNlZERpc3BsYXlPdXRzaWRlOwogICAgIE9wdGlvbmFsPENTU1Zh bHVlSUQ+IHBhcnNlZERpc3BsYXlJbnNpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xh eW91dHRyZWUvTGF5b3V0Qm94LmNwcAppbmRleCA5ZjRiMzMzMjNhY2MzM2ZmN2EyN2UyOTNiMmJh M2YwNmNhNmE3OWMzLi5iYjQxNDY0MWNkNTcxZTYxNjZlNDk0ZGYyZDViZmIzNmYxMjg4MDFkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKQEAg LTMxNSw3ICszMTUsNiBAQCBib29sIEJveDo6aXNJbmxpbmVMZXZlbEJveCgpIGNvbnN0CiAgICAg cmV0dXJuIGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6OklubGluZQogICAgICAgICB8fCBkaXNwbGF5 ID09IERpc3BsYXlUeXBlOjpJbmxpbmVCb3gKICAgICAgICAgfHwgZGlzcGxheSA9PSBEaXNwbGF5 VHlwZTo6SW5saW5lRmxleAotICAgICAgICB8fCBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpXZWJL aXRJbmxpbmVGbGV4CiAgICAgICAgIHx8IGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6OklubGluZUdy aWQKICAgICAgICAgfHwgaXNJbmxpbmVCbG9ja0JveCgpCiAgICAgICAgIHx8IGlzSW5saW5lVGFi bGVCb3goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRl eCBhYjYwOWQxOTcyMDIyNzJkZDZlYzU1YTQxYzMyNmMyMGI3ZGEwMGQzLi4yMDk1MjRkOTJiZWU3 NmM3ZGVlYTljYzg5YzliYTliMTZjZTc5MDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVsZW1lbnQuY3BwCkBAIC0xNzUsOCArMTc1LDYgQEAgUmVuZGVyUHRyPFJlbmRlckVs ZW1lbnQ+IFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcihFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJT dHlsZSYKICAgICAgICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckxpc3RJdGVtPihlbGVt ZW50LCBXVEZNb3ZlKHN0eWxlKSk7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6RmxleDoKICAgICBj YXNlIERpc3BsYXlUeXBlOjpJbmxpbmVGbGV4OgotICAgIGNhc2UgRGlzcGxheVR5cGU6OldlYktp dEZsZXg6Ci0gICAgY2FzZSBEaXNwbGF5VHlwZTo6V2ViS2l0SW5saW5lRmxleDoKICAgICAgICAg cmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckZsZXhpYmxlQm94PihlbGVtZW50LCBXVEZNb3Zl KHN0eWxlKSk7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6R3JpZDoKICAgICBjYXNlIERpc3BsYXlU eXBlOjpJbmxpbmVHcmlkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5jcHAKaW5kZXggOTRlNjg3MTUzNGViNGFjOGUxNTNl NjFkNTM4YWZhYWM5N2QxYTU5Zi4uY2U1ZTcyMTIzMzZhZGE5M2Y1YTExMTUxYTNhYWVhOTc1NGM5 MjA5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlQ29uc3RhbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGVDb25zdGFudHMuY3BwCkBAIC00NTAsOSArNDUwLDcgQEAgVGV4dFN0cmVhbSYgb3Bl cmF0b3I8PChUZXh0U3RyZWFtJiB0cywgRGlzcGxheVR5cGUgZGlzcGxheSkKICAgICBjYXNlIERp c3BsYXlUeXBlOjpCb3g6IHRzIDw8ICJib3giOyBicmVhazsKICAgICBjYXNlIERpc3BsYXlUeXBl OjpJbmxpbmVCb3g6IHRzIDw8ICJpbmxpbmUtYm94IjsgYnJlYWs7CiAgICAgY2FzZSBEaXNwbGF5 VHlwZTo6RmxleDogdHMgPDwgImZsZXgiOyBicmVhazsKLSAgICBjYXNlIERpc3BsYXlUeXBlOjpX ZWJLaXRGbGV4OiB0cyA8PCAid2ViLWtpdC1mbGV4IjsgYnJlYWs7CiAgICAgY2FzZSBEaXNwbGF5 VHlwZTo6SW5saW5lRmxleDogdHMgPDwgImlubGluZS1mbGV4IjsgYnJlYWs7Ci0gICAgY2FzZSBE aXNwbGF5VHlwZTo6V2ViS2l0SW5saW5lRmxleDogdHMgPDwgIndlYi1raXQtaW5saW5lLWZsZXgi OyBicmVhazsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpDb250ZW50czogdHMgPDwgImNvbnRlbnRz IjsgYnJlYWs7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6R3JpZDogdHMgPDwgImdyaWQiOyBicmVh azsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpJbmxpbmVHcmlkOiB0cyA8PCAiaW5saW5lLWdyaWQi OyBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZUNvbnN0YW50cy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlQ29uc3RhbnRzLmgKaW5kZXggMzg0Mjc5YzEzNWJhMjFkNGEwZThhMzQ1YjE0ODVmYzY4 MjJkYWRhNy4uNDk5MDRhNmYyMWVlNmQyNjFiODkyOWM2NzNjYjQ0MWMyYzk3NDc4NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3Rh bnRzLmgKQEAgLTkwNSw5ICs5MDUsNyBAQCBlbnVtIGNsYXNzIERpc3BsYXlUeXBlIDogdWludDhf dCB7CiAgICAgQm94LAogICAgIElubGluZUJveCwKICAgICBGbGV4LAotICAgIFdlYktpdEZsZXgs CiAgICAgSW5saW5lRmxleCwKLSAgICBXZWJLaXRJbmxpbmVGbGV4LAogICAgIENvbnRlbnRzLAog ICAgIEdyaWQsCiAgICAgSW5saW5lR3JpZCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlQWRqdXN0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVBZGp1c3Rl ci5jcHAKaW5kZXggMjhmMmFmYTE3OTE5MmU3M2M5NDljYTY2M2JkNTFiNzY3ZTUwZjZlNi4uMTBj OWM0MjM2ZGFiYTgwMjIwZmNiZjNhY2I4MzY4MTI3ZDdlMGUyZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVBZGp1c3Rlci5jcHAKQEAgLTEwMSw3ICsxMDEsNiBAQCBzdGF0aWMgRGlzcGxheVR5 cGUgZXF1aXZhbGVudEJsb2NrRGlzcGxheShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0 IERvY3VtZQogICAgIGNhc2UgRGlzcGxheVR5cGU6OlRhYmxlOgogICAgIGNhc2UgRGlzcGxheVR5 cGU6OkJveDoKICAgICBjYXNlIERpc3BsYXlUeXBlOjpGbGV4OgotICAgIGNhc2UgRGlzcGxheVR5 cGU6OldlYktpdEZsZXg6CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6R3JpZDoKICAgICBjYXNlIERp c3BsYXlUeXBlOjpGbG93Um9vdDoKICAgICAgICAgcmV0dXJuIGRpc3BsYXk7CkBAIC0xMTYsNyAr MTE1LDYgQEAgc3RhdGljIERpc3BsYXlUeXBlIGVxdWl2YWxlbnRCbG9ja0Rpc3BsYXkoY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBEb2N1bWUKICAgICBjYXNlIERpc3BsYXlUeXBlOjpJ bmxpbmVCb3g6CiAgICAgICAgIHJldHVybiBEaXNwbGF5VHlwZTo6Qm94OwogICAgIGNhc2UgRGlz cGxheVR5cGU6OklubGluZUZsZXg6Ci0gICAgY2FzZSBEaXNwbGF5VHlwZTo6V2ViS2l0SW5saW5l RmxleDoKICAgICAgICAgcmV0dXJuIERpc3BsYXlUeXBlOjpGbGV4OwogICAgIGNhc2UgRGlzcGxh eVR5cGU6OklubGluZUdyaWQ6CiAgICAgICAgIHJldHVybiBEaXNwbGF5VHlwZTo6R3JpZDsK