232185 2021-10-22 16:10:50 -0700 ASSERT(parent->element()) triggered in Styleable::fromRenderer 2021-10-26 09:01:18 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 230008 1 gnavamarino webkit-unassigned dino graouts koivisto ntim webkit-bug-importer oldest_to_newest 1807931 0 gnavamarino 2021-10-22 16:10:50 -0700 We used to check that renderer.element() was not nullptr here before, but it looks like that was removed for some cases in a recent refactor (bug #230008). Adding it back seems to resolve the issue. 1807935 1 442214 gnavamarino 2021-10-22 16:15:20 -0700 Created attachment 442214 Patch 1808041 2 442214 ntim 2021-10-22 22:59:39 -0700 Comment on attachment 442214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442214&action=review > Source/WebCore/style/Styleable.cpp:57 > + if (!renderer.element()) > + return std::nullopt; This looks wrong, ::backdrop and ::marker renderers do not have any associated element, so the code below for ::backdrop & ::marker will just stop working altogether. I'm surprised no test has caught this so far. From a quick look at the render tree dump, overflow-y: -webkit-paged-y on <li> seems to put the marker renderer as a child of RenderMultiColumnFlowThread instead of RenderListItem. I'm glad the assert caught this, because it shows a real bug in the code. We should either: * In the `case PseudoId::Marker:` branch of this function, loop through renderer ancestors until we find a `RenderListItem`, and return that. * Simply disallow multi column flow for list items? See: https://webkit-search.igalia.com/webkit/rev/522cdac023da69b36fa895cbedea14e96f44d678/Source/WebCore/rendering/RenderBlockFlow.cpp#425-426 I wasn't able to make multicol work properly inside a list item, so maybe this is a good solution? Though not sure if there's any other feature which may wrap renderers and trigger this assert. > LayoutTests/fast/animation/css-animation-marker-crash.html:4 > + -webkit-mask-image: url(); maybe use a more common property like `background: green;` > LayoutTests/fast/animation/css-animation-marker-crash.html:15 > +<li>PASS</li> nit: PASS if this doesn't crash 1808063 3 442214 ntim 2021-10-23 07:39:50 -0700 Comment on attachment 442214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442214&action=review Here are some suggestions on how to address my previous comments. >> Source/WebCore/style/Styleable.cpp:57 >> + return std::nullopt; > > This looks wrong, ::backdrop and ::marker renderers do not have any associated element, so the code below for ::backdrop & ::marker will just stop working altogether. > > I'm surprised no test has caught this so far. > > From a quick look at the render tree dump, overflow-y: -webkit-paged-y on <li> seems to put the marker renderer as a child of RenderMultiColumnFlowThread instead of RenderListItem. > > I'm glad the assert caught this, because it shows a real bug in the code. We should either: > > * In the `case PseudoId::Marker:` branch of this function, loop through renderer ancestors until we find a `RenderListItem`, and return that. > > * Simply disallow multi column flow for list items? See: https://webkit-search.igalia.com/webkit/rev/522cdac023da69b36fa895cbedea14e96f44d678/Source/WebCore/rendering/RenderBlockFlow.cpp#425-426 > > I wasn't able to make multicol work properly inside a list item, so maybe this is a good solution? Though not sure if there's any other feature which may wrap renderers and trigger this assert. Let's loop through parent renderers for now, since column flow does work if you use `columns`. ``` case PseudoId::Marker: auto* ancestor = renderer.parent(); while (ancestor && !ancestor->element()) { ancestor = ancestor.parent(); } ASSERT(is<RenderListItem>(ancestor)); ASSERT(downcast<RenderListItem>(ancestor)->markerRenderer() == &renderer); return Styleable(*ancestor->element(), PseudoId::Marker); ``` Please file a followup bug to add a test for the correctness of `Styleable::fromRenderer` for `::backdrop` and `::marker`. >> LayoutTests/fast/animation/css-animation-marker-crash.html:4 >> + -webkit-mask-image: url(); > > maybe use a more common property like `background: green;` oh, only composited properties trigger this crash, maybe `opacity: 0`? > LayoutTests/fast/animation/css-animation-marker-crash.html:12 > + overflow-y: -webkit-paged-y; Can you use `columns: 3;` instead? It also triggers this crash, as it triggers column flow. It's more standard/common than overflow: -webkit-paged-y. 1808457 4 gnavamarino 2021-10-25 10:32:42 -0700 (In reply to Tim Nguyen (:ntim) from comment #3) > Comment on attachment 442214 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442214&action=review > > Here are some suggestions on how to address my previous comments. > > >> Source/WebCore/style/Styleable.cpp:57 > >> + return std::nullopt; > > > > This looks wrong, ::backdrop and ::marker renderers do not have any associated element, so the code below for ::backdrop & ::marker will just stop working altogether. > > > > I'm surprised no test has caught this so far. > > > > From a quick look at the render tree dump, overflow-y: -webkit-paged-y on <li> seems to put the marker renderer as a child of RenderMultiColumnFlowThread instead of RenderListItem. > > > > I'm glad the assert caught this, because it shows a real bug in the code. We should either: > > > > * In the `case PseudoId::Marker:` branch of this function, loop through renderer ancestors until we find a `RenderListItem`, and return that. > > > > * Simply disallow multi column flow for list items? See: https://webkit-search.igalia.com/webkit/rev/522cdac023da69b36fa895cbedea14e96f44d678/Source/WebCore/rendering/RenderBlockFlow.cpp#425-426 > > > > I wasn't able to make multicol work properly inside a list item, so maybe this is a good solution? Though not sure if there's any other feature which may wrap renderers and trigger this assert. > > Let's loop through parent renderers for now, since column flow does work if > you use `columns`. > > ``` > case PseudoId::Marker: > auto* ancestor = renderer.parent(); > while (ancestor && !ancestor->element()) { > ancestor = ancestor.parent(); > } > ASSERT(is<RenderListItem>(ancestor)); > ASSERT(downcast<RenderListItem>(ancestor)->markerRenderer() == &renderer); > return Styleable(*ancestor->element(), PseudoId::Marker); > ``` Thank you, I have made the recommended changes and can confirm this adresses the crash. > > Please file a followup bug to add a test for the correctness of > `Styleable::fromRenderer` for `::backdrop` and `::marker`. Thank you, I have filed bug #232248. > > >> LayoutTests/fast/animation/css-animation-marker-crash.html:4 > >> + -webkit-mask-image: url(); > > > > maybe use a more common property like `background: green;` > > oh, only composited properties trigger this crash, maybe `opacity: 0`? > > > LayoutTests/fast/animation/css-animation-marker-crash.html:12 > > + overflow-y: -webkit-paged-y; > > Can you use `columns: 3;` instead? It also triggers this crash, as it > triggers column flow. It's more standard/common than overflow: > -webkit-paged-y. Thank you, I have updated the test case to use both `columns: 3;` and `opacity: 0` and confirmed the issue is still caught. 1808464 5 442385 gnavamarino 2021-10-25 10:39:03 -0700 Created attachment 442385 Patch 1808539 6 442385 ntim 2021-10-25 12:55:44 -0700 Comment on attachment 442385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442385&action=review This looks fine to me, though I'm not a reviewer. > Source/WebCore/ChangeLog:10 > + loop through parent renderers as ::backdrop and ::marker renderers do not the problem here is that RenderMultiColumnFlowThread don't have associated renderers, so we have to loop through parents until we find the RenderListItem which has an associated element. 1808541 7 442385 ntim 2021-10-25 13:05:12 -0700 Comment on attachment 442385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442385&action=review >> Source/WebCore/ChangeLog:10 >> + loop through parent renderers as ::backdrop and ::marker renderers do not > > the problem here is that RenderMultiColumnFlowThread don't have associated renderers, so we have to loop through parents until we find the RenderListItem which has an associated element. don't have associated elements* 1808834 8 442385 koivisto 2021-10-26 06:57:39 -0700 Comment on attachment 442385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442385&action=review >>> Source/WebCore/ChangeLog:10 >>> + loop through parent renderers as ::backdrop and ::marker renderers do not >> >> the problem here is that RenderMultiColumnFlowThread don't have associated renderers, so we have to loop through parents until we find the RenderListItem which has an associated element. > > don't have associated elements* CSS term for a renderer without an associated element is "anonymous box" 1808853 9 442490 gnavamarino 2021-10-26 08:17:32 -0700 Created attachment 442490 Patch 1808854 10 gnavamarino 2021-10-26 08:18:45 -0700 (In reply to Tim Nguyen (:ntim) from comment #6) > Comment on attachment 442385 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442385&action=review > > This looks fine to me, though I'm not a reviewer. > > > Source/WebCore/ChangeLog:10 > > + loop through parent renderers as ::backdrop and ::marker renderers do not > > the problem here is that RenderMultiColumnFlowThread don't have associated > renderers, so we have to loop through parents until we find the > RenderListItem which has an associated element. Thank you, I have updated this to reflect in the ChangeLog. 1808875 11 ews-feeder 2021-10-26 09:00:32 -0700 Committed r284871 (243548@main): <https://commits.webkit.org/243548@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442490. 1808876 12 webkit-bug-importer 2021-10-26 09:01:18 -0700 <rdar://problem/84665480> 442214 2021-10-22 16:15:20 -0700 2021-10-25 10:39:00 -0700 Patch bug-232185-20211022161519.patch text/plain 3447 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uMzE5NGFlNjcyY2E4MTAwMGNkYmQwNTRiNmMzYTY5 MTc2NWVlMDcwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEwLTIyICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VS VChwYXJlbnQtPmVsZW1lbnQoKSkgdHJpZ2dlcmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIxODUg CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgdXNl ZCB0byBjaGVjayB0aGF0IHJlbmRlcmVyLmVsZW1lbnQoKSB3YXMgbm90IG51bGxwdHIgaGVyZSBi ZWZvcmUuIAorICAgICAgICBJdCBsb29rcyBsaWtlIHRoYXQgd2FzIHJlbW92ZWQgZm9yIHNvbWUg Y2FzZXMgKGJ1ZyAjMjMwMDA4KSBpbiBhIHJlY2VudCByZWZhY3Rvci4KKyAgICAgICAgQWRkaW5n IGl0IGJhY2sgYXMgcGFydCBvZiB0aGlzIHBhdGNoIHRvIHJlc29sdmUgdGhlIGlzc3VlLgorCisg ICAgICAgIFRlc3Q6IGZhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLmh0 bWwKKworICAgICAgICAqIHN0eWxlL1N0eWxlYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT dHlsZWFibGU6OmZyb21SZW5kZXJlcik6CisKIDIwMjEtMTAtMjAgIEJldGggRGFraW4gIDxiZGFr aW5AYXBwbGUuY29tPiBhbmQgRGFuYSBFc3RyYSA8ZGVzdHJhQGFwcGxlLmNvbT4KIAogICAgICAg ICBtYWNPUyBrZXktZHJpdmVuIHNtb290aCBzY3JvbGxpbmcgZG9lcyBub3Qgc3RvcCB3aGVuIGZv Y3VzIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZWFibGUuY3BwCmluZGV4IGNmYjA3NmZkNTQ0 ZTg5OWMwODJiNGJlMDNhYzA4NWZlYjlmNTY0NjkuLjAxOWMwMmU0MTBhNjY1N2JlOGE2ZTExMTQx NTA2NGVmOWY2ZjQwMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJs ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVhYmxlLmNwcApAQCAtNTMsNiAr NTMsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Y29uc3Qg U3R5bGVhYmxlPiBTdHlsZWFibGU6OmZyb21SZW5kZXJlcihjb25zdCBSZW5kZXJFbGVtZW50JiBy ZW5kZXJlcikKIHsKKyAgICBpZiAoIXJlbmRlcmVyLmVsZW1lbnQoKSkKKyAgICAgICAgcmV0dXJu IHN0ZDo6bnVsbG9wdDsKKyAgICAKICAgICBzd2l0Y2ggKHJlbmRlcmVyLnN0eWxlKCkuc3R5bGVU eXBlKCkpIHsKICAgICBjYXNlIFBzZXVkb0lkOjpCYWNrZHJvcDoKICAgICAgICAgZm9yIChhdXRv JiB0b3BMYXllckVsZW1lbnQgOiByZW5kZXJlci5kb2N1bWVudCgpLnRvcExheWVyRWxlbWVudHMo KSkgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGZjN2ZhNzE3NTVmOTkyOWVjNmMzYmY3ODE5ZDE1OTQ3OTAyZTc5ZjQuLjY3 ODdkYTVhZGU5NzZhZjg3NjdhODA5M2E2OWY0M2U0MTJmM2JhYTkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAyMS0xMC0yMiAgR2FicmllbCBOYXZhIE1hcmlubyAgPGduYXZhbWFyaW5vQGFwcGxl LmNvbT4KKworICAgICAgICBBU1NFUlQocGFyZW50LT5lbGVtZW50KCkpIHRyaWdnZXJlZCBpbiBT dHlsZWFibGU6OmZyb21SZW5kZXJlciAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMjE4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9hbmltYXRpb24vY3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jh c2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2FuaW1hdGlvbi9jc3MtYW5p bWF0aW9uLW1hcmtlci1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMS0xMC0yMCAgQXl1bWkgS29q aW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBbIG1hY09TIF0gaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy94aHIvZXZlbnQtdXBsb2FkLXByb2dyZXNzLWNyb3Nz b3JpZ2luLmFueS5odG1sIGlzIGEgZmxha3kgZmFpbHVyZS4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNo LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZWYyMmU5YTQzMWFkMDI3MjcxM2I3MWZkYzg3OTQw MTZjOGVmMTJmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24v Y3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1BB U1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24t bWFya2VyLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2FuaW1hdGlvbi9jc3MtYW5pbWF0 aW9uLW1hcmtlci1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRlYjAzMGUyZGFiYmYyY2EzOGQ3M2Q0 NTRkZDA1MWY2ZGMxOGZlYWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Fu aW1hdGlvbi9jc3MtYW5pbWF0aW9uLW1hcmtlci1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMTkgQEAK KzxzdHlsZT4KKyAgQGtleWZyYW1lcyBhMCB7CisgICAgZnJvbSB7CisgICAgICAtd2Via2l0LW1h c2staW1hZ2U6IHVybCgpOworICAgIH0KKyAgfQorICA6Om1hcmtlciB7CisgICAgYW5pbWF0aW9u LW5hbWU6IGEwOworICAgIGFuaW1hdGlvbi1kdXJhdGlvbjogMW1zOworICB9CisgIGxpIHsKKyAg ICBvdmVyZmxvdy15OiAtd2Via2l0LXBhZ2VkLXk7CisgIH0KKzwvc3R5bGU+Cis8bGk+UEFTUzwv bGk+Cis8c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICB0ZXN0UnVubmVy LmR1bXBBc1RleHQoKTsgCis8L3NjcmlwdD4K 442385 2021-10-25 10:39:03 -0700 2021-10-26 08:17:28 -0700 Patch bug-232185-20211025103902.patch text/plain 4002 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uOWJlOTMxZTA4NWExYjM0MjU0YTFhY2VjZDgxYzE1 YTE4OWZhNTU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTIyICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VS VChwYXJlbnQtPmVsZW1lbnQoKSkgdHJpZ2dlcmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIxODUK KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gTmd1eWVuLgorCisgICAgICAgIFByb3BlcnRpZXMg bGlrZSAnY29sdW1ucycgc2VlbXMgdG8gcHV0IHRoZSBtYXJrZXIgcmVuZGVyZXIgYXMgYSBjaGls ZCBvZgorICAgICAgICBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQgaW5zdGVhZCBvZiBSZW5k ZXJMaXN0SXRlbS4gV2UgdGh1cyBuZWVkIHRvCisgICAgICAgIGxvb3AgdGhyb3VnaCBwYXJlbnQg cmVuZGVyZXJzIGFzIDo6YmFja2Ryb3AgYW5kIDo6bWFya2VyIHJlbmRlcmVycyBkbyBub3QKKyAg ICAgICAgaGF2ZSBhbnkgYXNzb2NpYXRlZCBlbGVtZW50LgorCisgICAgICAgIFRlc3Q6IGZhc3Qv YW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLmh0bWwKKworICAgICAgICAqIHN0 eWxlL1N0eWxlYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWFibGU6OmZyb21SZW5k ZXJlcik6CisKIDIwMjEtMTAtMjAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPiBhbmQg RGFuYSBFc3RyYSA8ZGVzdHJhQGFwcGxlLmNvbT4KIAogICAgICAgICBtYWNPUyBrZXktZHJpdmVu IHNtb290aCBzY3JvbGxpbmcgZG9lcyBub3Qgc3RvcCB3aGVuIGZvY3VzIGNoYW5nZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZWFibGUuY3BwCmluZGV4IGNmYjA3NmZkNTQ0ZTg5OWMwODJiNGJlMDNhYzA4 NWZlYjlmNTY0NjkuLjczNTI2OTIyNmZlOTEzNmExNmZjMTdmMWQ5YzhjMTY2M2UwZGYxOGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVhYmxlLmNwcApAQCAtNjEsMTEgKzYxLDEyIEBAIGNvbnN0IHN0 ZDo6b3B0aW9uYWw8Y29uc3QgU3R5bGVhYmxlPiBTdHlsZWFibGU6OmZyb21SZW5kZXJlcihjb25z dCBSZW5kZXJFbGVtZW50CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQc2V1 ZG9JZDo6TWFya2VyOgotICAgICAgICBpZiAoYXV0byogcGFyZW50ID0gcmVuZGVyZXIucGFyZW50 KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVChwYXJlbnQtPmVsZW1lbnQoKSk7Ci0gICAgICAgICAg ICBBU1NFUlQoaXM8UmVuZGVyTGlzdEl0ZW0+KHBhcmVudCkpOwotICAgICAgICAgICAgQVNTRVJU KGRvd25jYXN0PFJlbmRlckxpc3RJdGVtPigqcGFyZW50KS5tYXJrZXJSZW5kZXJlcigpID09ICZy ZW5kZXJlcik7Ci0gICAgICAgICAgICByZXR1cm4gU3R5bGVhYmxlKCpwYXJlbnQtPmVsZW1lbnQo KSwgUHNldWRvSWQ6Ok1hcmtlcik7CisgICAgICAgIGlmIChhdXRvKiBhbmNlc3RvciA9IHJlbmRl cmVyLnBhcmVudCgpKSB7CisgICAgICAgICAgICB3aGlsZSAoYW5jZXN0b3IgJiYgIWFuY2VzdG9y LT5lbGVtZW50KCkpCisgICAgICAgICAgICAgICAgYW5jZXN0b3IgPSBhbmNlc3Rvci0+cGFyZW50 KCk7CisgICAgICAgICAgICBBU1NFUlQoaXM8UmVuZGVyTGlzdEl0ZW0+KGFuY2VzdG9yKSk7Cisg ICAgICAgICAgICBBU1NFUlQoZG93bmNhc3Q8UmVuZGVyTGlzdEl0ZW0+KGFuY2VzdG9yKS0+bWFy a2VyUmVuZGVyZXIoKSA9PSAmcmVuZGVyZXIpOworICAgICAgICAgICAgcmV0dXJuIFN0eWxlYWJs ZSgqYW5jZXN0b3ItPmVsZW1lbnQoKSwgUHNldWRvSWQ6Ok1hcmtlcik7CiAgICAgICAgIH0KICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBQc2V1ZG9JZDo6QWZ0ZXI6CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM3ZmE3MTc1 NWY5OTI5ZWM2YzNiZjc4MTlkMTU5NDc5MDJlNzlmNC4uOWRmZDJiNzlmYjg0MTBhYjNjYWJlMDUw NzYzMjA1NWRiNzI1YTQwMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIyICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VS VChwYXJlbnQtPmVsZW1lbnQoKSkgdHJpZ2dlcmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIxODUK KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gTmd1eWVuLgorCisgICAgICAgICogZmFzdC9hbmlt YXRpb24vY3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2FuaW1hdGlvbi9jc3MtYW5pbWF0aW9uLW1hcmtlci1jcmFzaC5odG1sOiBB ZGRlZC4KKwogMjAyMS0xMC0yMCAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNv bT4KIAogICAgICAgICBbIG1hY09TIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy94 aHIvZXZlbnQtdXBsb2FkLXByb2dyZXNzLWNyb3Nzb3JpZ2luLmFueS5odG1sIGlzIGEgZmxha3kg ZmFpbHVyZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1hbmlt YXRpb24tbWFya2VyLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0 aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5l NmIzMjMxMzQzZTFlMTRlNWNkZTI1MjI2MGQ4NDdlZjNjMzE0MzEwCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vY3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jhc2gt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1BBU1MgaWYgdGhpcyBkb2Vzbid0IGNyYXNoCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2FuaW1hdGlvbi9jc3MtYW5pbWF0aW9uLW1hcmtl ci1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vY3NzLWFuaW1hdGlvbi1t YXJrZXItY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MDM0MTY0NDVkYmU0NjNjZTQ2OTIyYjZkZGZk ZmY0NDgwMDBmZGYwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRp b24vY3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jhc2guaHRtbApAQCAtMCwwICsxLDE5IEBACis8c3R5 bGU+CisgIEBrZXlmcmFtZXMgYTAgeworICAgIGZyb20geworICAgICAgb3BhY2l0eTogMDsKKyAg ICB9CisgIH0KKyAgOjptYXJrZXIgeworICAgIGFuaW1hdGlvbi1uYW1lOiBhMDsKKyAgICBhbmlt YXRpb24tZHVyYXRpb246IDFtczsKKyAgfQorICBsaSB7CisgICAgY29sdW1uczogMzsKKyAgfQor PC9zdHlsZT4KKzxsaT5QQVNTIGlmIHRoaXMgZG9lc24ndCBjcmFzaDwvbGk+Cis8c2NyaXB0Pgor ICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsg Cis8L3NjcmlwdD4K 442490 2021-10-26 08:17:32 -0700 2021-10-26 09:00:33 -0700 Patch bug-232185-20211026081731.patch text/plain 4126 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uZGQ1ZTExYTMzMzZlZmM4ZDYyODk2N2NiZjAxMTBi YzE5NDRhODMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTIyICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VS VChwYXJlbnQtPmVsZW1lbnQoKSkgdHJpZ2dlcmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIxODUK KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gTmd1eWVuIGFuZCBBbnR0aSBLb2l2aXN0by4KKwor ICAgICAgICBUaGUgbWFya2VyIHJlbmRlcmVyIGNhbiBiZSBzZXQgYXMgYSBjaGlsZCBvZiBSZW5k ZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQKKyAgICAgICAgaW5zdGVhZCBvZiBSZW5kZXJMaXN0SXRl bSBpbiBzb21lIGluc3RhbmNlcy4gUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkIGlzCisgICAg ICAgIGFuIGFub255bW91cyBib3ggYW5kIGRvZXNuJ3QgaGF2ZSBhbiBhc3NvY2lhdGVkIGVsZW1l bnQsIHNvIHdlIGluc3RlYWQgc2hvdWxkCisgICAgICAgIGxvb3AgdGhyb3VnaCB0aGUgcGFyZW50 cyB1bnRpbCB3ZSBmaW5kIHRoZSBSZW5kZXJMaXN0SXRlbSB3aGljaCBkb2VzIGhhdmUgYW4KKyAg ICAgICAgYXNzb2NpYXRlZCBlbGVtZW50LgorCisgICAgICAgIFRlc3Q6IGZhc3QvYW5pbWF0aW9u L2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLmh0bWwKKworICAgICAgICAqIHN0eWxlL1N0eWxl YWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWFibGU6OmZyb21SZW5kZXJlcik6CisK IDIwMjEtMTAtMjAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPiBhbmQgRGFuYSBFc3Ry YSA8ZGVzdHJhQGFwcGxlLmNvbT4KIAogICAgICAgICBtYWNPUyBrZXktZHJpdmVuIHNtb290aCBz Y3JvbGxpbmcgZG9lcyBub3Qgc3RvcCB3aGVuIGZvY3VzIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZWFibGUuY3BwCmluZGV4IGNmYjA3NmZkNTQ0ZTg5OWMwODJiNGJlMDNhYzA4NWZlYjlmNTY0 NjkuLjczNTI2OTIyNmZlOTEzNmExNmZjMTdmMWQ5YzhjMTY2M2UwZGYxOGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvU3R5bGVhYmxlLmNwcApAQCAtNjEsMTEgKzYxLDEyIEBAIGNvbnN0IHN0ZDo6b3B0aW9u YWw8Y29uc3QgU3R5bGVhYmxlPiBTdHlsZWFibGU6OmZyb21SZW5kZXJlcihjb25zdCBSZW5kZXJF bGVtZW50CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQc2V1ZG9JZDo6TWFy a2VyOgotICAgICAgICBpZiAoYXV0byogcGFyZW50ID0gcmVuZGVyZXIucGFyZW50KCkpIHsKLSAg ICAgICAgICAgIEFTU0VSVChwYXJlbnQtPmVsZW1lbnQoKSk7Ci0gICAgICAgICAgICBBU1NFUlQo aXM8UmVuZGVyTGlzdEl0ZW0+KHBhcmVudCkpOwotICAgICAgICAgICAgQVNTRVJUKGRvd25jYXN0 PFJlbmRlckxpc3RJdGVtPigqcGFyZW50KS5tYXJrZXJSZW5kZXJlcigpID09ICZyZW5kZXJlcik7 Ci0gICAgICAgICAgICByZXR1cm4gU3R5bGVhYmxlKCpwYXJlbnQtPmVsZW1lbnQoKSwgUHNldWRv SWQ6Ok1hcmtlcik7CisgICAgICAgIGlmIChhdXRvKiBhbmNlc3RvciA9IHJlbmRlcmVyLnBhcmVu dCgpKSB7CisgICAgICAgICAgICB3aGlsZSAoYW5jZXN0b3IgJiYgIWFuY2VzdG9yLT5lbGVtZW50 KCkpCisgICAgICAgICAgICAgICAgYW5jZXN0b3IgPSBhbmNlc3Rvci0+cGFyZW50KCk7CisgICAg ICAgICAgICBBU1NFUlQoaXM8UmVuZGVyTGlzdEl0ZW0+KGFuY2VzdG9yKSk7CisgICAgICAgICAg ICBBU1NFUlQoZG93bmNhc3Q8UmVuZGVyTGlzdEl0ZW0+KGFuY2VzdG9yKS0+bWFya2VyUmVuZGVy ZXIoKSA9PSAmcmVuZGVyZXIpOworICAgICAgICAgICAgcmV0dXJuIFN0eWxlYWJsZSgqYW5jZXN0 b3ItPmVsZW1lbnQoKSwgUHNldWRvSWQ6Ok1hcmtlcik7CiAgICAgICAgIH0KICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBQc2V1ZG9JZDo6QWZ0ZXI6CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM3ZmE3MTc1NWY5OTI5ZWM2 YzNiZjc4MTlkMTU5NDc5MDJlNzlmNC4uYThiYTI5NDQ4YmMzMWI2ZWZkZTMzYzRmOGI2YjM3ZWEz MDg0NDcxOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIyICBHYWJyaWVsIE5hdmEg TWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VSVChwYXJlbnQt PmVsZW1lbnQoKSkgdHJpZ2dlcmVkIGluIFN0eWxlYWJsZTo6ZnJvbVJlbmRlcmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIxODUKKworICAgICAg ICBSZXZpZXdlZCBieSBUaW0gTmd1eWVuIGFuZCBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAq IGZhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZmFzdC9hbmltYXRpb24vY3NzLWFuaW1hdGlvbi1tYXJrZXItY3Jh c2guaHRtbDogQWRkZWQuCisKIDIwMjEtMTAtMjAgIEF5dW1pIEtvamltYSAgPGF5dW1pX2tvamlt YUBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMveGhyL2V2ZW50LXVwbG9hZC1wcm9ncmVzcy1jcm9zc29yaWdpbi5hbnkuaHRtbCBp cyBhIGZsYWt5IGZhaWx1cmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2FuaW1hdGlv bi9jc3MtYW5pbWF0aW9uLW1hcmtlci1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L2FuaW1hdGlvbi9jc3MtYW5pbWF0aW9uLW1hcmtlci1jcmFzaC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZTZiMzIzMTM0M2UxZTE0ZTVjZGUyNTIyNjBkODQ3ZWYzYzMxNDMxMAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFy a2VyLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTIGlmIHRoaXMgZG9lc24n dCBjcmFzaApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vY3NzLWFuaW1h dGlvbi1tYXJrZXItY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2Nzcy1h bmltYXRpb24tbWFya2VyLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDAzNDE2NDQ1ZGJlNDYzY2U0 NjkyMmI2ZGRmZGZmNDQ4MDAwZmRmMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvYW5pbWF0aW9uL2Nzcy1hbmltYXRpb24tbWFya2VyLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwx OSBAQAorPHN0eWxlPgorICBAa2V5ZnJhbWVzIGEwIHsKKyAgICBmcm9tIHsKKyAgICAgIG9wYWNp dHk6IDA7CisgICAgfQorICB9CisgIDo6bWFya2VyIHsKKyAgICBhbmltYXRpb24tbmFtZTogYTA7 CisgICAgYW5pbWF0aW9uLWR1cmF0aW9uOiAxbXM7CisgIH0KKyAgbGkgeworICAgIGNvbHVtbnM6 IDM7CisgIH0KKzwvc3R5bGU+Cis8bGk+UEFTUyBpZiB0aGlzIGRvZXNuJ3QgY3Jhc2g8L2xpPgor PHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgdGVzdFJ1bm5lci5kdW1w QXNUZXh0KCk7IAorPC9zY3JpcHQ+Cg==