235058 2022-01-10 19:57:34 -0800 automatic minimum block-size aspect-ratio rules should not apply to replaced elements 2022-01-13 18:54:36 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 heycam heycam bfulgham cathiechen changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1829718 0 heycam 2022-01-10 19:57:34 -0800 We apply the https://www.w3.org/TR/css-sizing-4/#aspect-ratio-minimum rule in RenderBox::constrainLogicalHeightByMinMax and RenderBox::constrainLogicalWidthInFragmentByMinMax, but we don't correctly check first that the element is non-replaced. For RenderBox::constrainLogicalHeightByMinMax, this can have the effect of increasing the computed min-height of a replaced element with an aspect-ratio to intrinsicContentHeight, if the element has a child. (The code that increases the automatic min-height to at least intrinsicContentHeight seems to be part of the unwritten rules about how `min-content: auto` applies to block elements.) Normally, replaced elements don't have children, but the way we check (looking at `firstChild()`) can return true for <video> elements with controls, <img> elements that have text recognition overlays, and possibly other cases where a UA shadow root has been attached. 1829720 1 heycam 2022-01-10 20:05:14 -0800 rdar://85505101 1829728 2 448830 heycam 2022-01-10 21:18:24 -0800 Created attachment 448830 Patch 1830387 3 449009 heycam 2022-01-12 15:51:36 -0800 Created attachment 449009 Patch 1830439 4 449009 cathiechen 2022-01-12 18:30:36 -0800 Comment on attachment 449009 Patch Hi Cameron, thanks for working on this! The patch looks good to me. 1830761 5 449009 zalan 2022-01-13 16:07:22 -0800 Comment on attachment 449009 Patch rs=me 1830784 6 ews-feeder 2022-01-13 18:54:32 -0800 Committed r288003 (246029@main): <https://commits.webkit.org/246029@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449009. 448830 2022-01-10 21:18:24 -0800 2022-01-12 15:51:32 -0800 Patch bug-235058-20220111161823.patch text/plain 7277 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZmODJhZDVjNWEyNmZk NDNjZjQ3Y2VlOTIzZThlYWQ3ZGM1ZDM2OS4uZGRlYWNjZWI2NGRiMWVjYzBlODgxYmQwZGM0ODlm OTJhZWNjZDZlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAxLTEwICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBseSBh dXRvbWF0aWMgbWluaW11bSBibG9jay1zaXplIGFzcGVjdC1yYXRpbyBydWxlcyB0byBub24tcmVw bGFjZWQgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNTA1OAorICAgICAgICA8cmRhcjovLzg1NTA1MTAxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBydWxlcyBpbiBodHRwczovL3d3 dy53My5vcmcvVFIvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorICAgICAgICB0 aGF0IGRlZmluZSB0aGUgYXV0b21hdGljIG1pbmltdW0gc2l6ZSBvZiBhbiBlbGVtZW50IHN1Ympl Y3QgdG8gYW4KKyAgICAgICAgYXNwZWN0LXJhdGlvIG9ubHkgYXBwbHkgaWYgdGhlIGVsZW1lbnQg aXMgbm9uLXJlcGxhY2VkLgorCisgICAgICAgIEluIGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1p bk1heCBzcGVjaWZpY2FsbHksIHdoZW4gbWluLWhlaWdodCBpcworICAgICAgICBhdXRvLCBhZnRl ciBhcHBseWluZyB0aGUgYXNwZWN0LXJhdGlvIHRvIHByb2R1Y2UgYW4gYXV0b21hdGljIG1pbmlt dW0KKyAgICAgICAgaGVpZ2h0LCB3ZSBidW1wIGl0IHVwIHRvIHRoZSBjb250ZW50IGhlaWdodCBp ZiB0aGUgZWxlbWVudCBoYXMKKyAgICAgICAgY2hpbGRyZW4uIFRoaXMsIHByZXN1bWFibHksIGlz IHRvIGFjY291bnQgZm9yIHRoZSB3YXkgdGhlIGhlaWdodCBvZiBhCisgICAgICAgIGJsb2NrIGlz IGNvbXB1dGVkIGluIENTUyAyLjIuIChBcyBDU1MgMi4yIGRvZXNuJ3QgaGF2ZSBhbiBhdXRvIHZh bHVlCisgICAgICAgIGZvciBtaW4taGVpZ2h0LCBhbmQgYSBDU1MgQmxvY2sgTGF5b3V0IG1vZHVs ZSBoYXMgbm90IGJlZW4gd3JpdHRlbiBpbgorICAgICAgICB0ZXJtcyBvZiBDU1MgU2l6aW5nIGNv bmNlcHRzLCB0aGVyZSBpcyBubyBjbGVhciBkZWZpbml0aW9uIG9mCisgICAgICAgIGF1dG9tYXRp YyBtaW5pbXVtIHNpemluZyBmb3IgYmxvY2tzIGF0IHRoZSBtb21lbnQuKSBJZiB3ZSBlcnJvbmVv dXNseQorICAgICAgICBhcHBseSB0aGlzIHRvIGEgcmVwbGFjZWQgZWxlbWVudCwgc3VjaCBhcyBh biBpbWFnZSBvciB2aWRlbywgaXQgY2FuCisgICAgICAgIGdldCBhIGNvbXB1dGVkIG1pbi1oZWln aHQgZXF1YWwgdG8gdGhlIGludHJpbnNpYyBoZWlnaHQgb2YgdGhlIGltYWdlLAorICAgICAgICB3 aGljaCBtYXkgYmUgbXVjaCBsYXJnZXIgdGhhbiBleHBlY3RlZC4KKworICAgICAgICBUaGlzIGNv bW1pdCBhZGRzIGFuIGlzUmVwbGFjZWQoKSBjaGVjayBmb3IgYm90aCBhdXRvbWF0aWMgbWluaW11 bQorICAgICAgICBsb2dpY2FsIHdpZHRoIGFuZCBoZWlnaHQgY2FsY3VsYXRpb25zLCBhbHRob3Vn aCBJIHdhcyB1bmFibGUgdG8gcHJvZHVjZQorICAgICAgICBhIHRlc3QgdG8gZXhlcmNpc2UgdGhl IGxvZ2ljYWwgd2lkdGggY2FzZSAod2hpY2ggZG9lcyBub3QgdGFrZSB0aGUKKyAgICAgICAgaW50 cmluc2ljIHNpemUgaW50byBhY2NvdW50IHdoZW4gY29tcHV0aW5nIHRoZSBhdXRvbWF0aWMgbWlu aW11bSkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvYXNwZWN0LXJhdGlvLW1pbi1oZWlnaHQt cmVwbGFjZWQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRC eU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxv Z2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisKIDIwMjItMDEtMDcgIEFsZXhleSBTaHZheWth ICA8YXNodmF5a2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBvYnNvbGV0ZSBET00gTGV2 ZWwgMiAiRE9NRm9jdXNJbiIgLyAiRE9NRm9jdXNPdXQiIGV2ZW50cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBiYzRjMzEwZThhY2M0YzBjMjk4YTMzODQzZmE1MjBj ZjJhOGIzMTVmLi4wOTNhNzc3ZDQwNjRlZWY3YjFjYmM5NDAxZjQ3YmM0MjFlYWFlYTg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjczLDEzICs2NzMsMTIgQEAg TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1p bk1heChMYXlvdXRVbml0IGxvZ2ljYWwKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4o bG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUs IHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21l bnQpKTsKICAgICBpZiAoYWxsb3dJbnRyaW5zaWMgPT0gQWxsb3dJbnRyaW5zaWM6Ok5vICYmIHN0 eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJu IGxvZ2ljYWxXaWR0aDsKLSAgICBhdXRvIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1p bldpZHRoKCk7Ci0gICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAmJiBtaW5MZW5n dGguaXNBdXRvKCkgJiYgKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgfHwgc3R5 bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01pbkNvbnRlbnQoKSB8fCBzdHlsZVRvVXNlLmxvZ2lj YWxXaWR0aCgpLmlzTWF4Q29udGVudCgpKSAmJiBlZmZlY3RpdmVPdmVyZmxvd0lubGluZURpcmVj dGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CisgICAgYXV0byBsb2dpY2FsTWluV2lkdGgg PSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpOworICAgIGlmIChsb2dpY2FsTWluV2lkdGgu aXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpICYm IChzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNh bFdpZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01h eENvbnRlbnQoKSkgJiYgIWlzUmVwbGFjZWQoKSAmJiBlZmZlY3RpdmVPdmVyZmxvd0lubGluZURp cmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3 ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCi0gICAgICAgIGlmIChzaG91bGRDb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGgg PSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAgICAgIGxvZ2ljYWxNaW5XaWR0 aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KTsKICAgICB9Ci0gICAgcmV0dXJuIHN0 ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhN aW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBy ZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVu dFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5XaWR0aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFn bWVudCkpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdo dEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgc3RkOjpvcHRpb25hbDxMYXlvdXRV bml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdApAQCAtNjkwLDcgKzY4OSw3IEBAIExh eW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0 VW5pdCBsb2dpY2FsSGVpZ2h0LCBzCiAgICAgICAgICAgICBsb2dpY2FsSGVpZ2h0ID0gc3RkOjpt aW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1ZSgpKTsKICAgICB9CiAgICAgYXV0byBsb2dpY2Fs TWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7Ci0gICAgaWYgKGxvZ2lj YWxNaW5IZWlnaHQuaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNw ZWN0UmF0aW8oKSAmJiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIGVmZmVjdGl2ZU92ZXJmbG93 QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlmIChsb2dpY2Fs TWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVj dFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiAhaXNSZXBsYWNlZCgpICYmIGVm ZmVjdGl2ZU92ZXJmbG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgewog ICAgICAgICBhdXRvIGhlaWdodEZyb21Bc3BlY3RSYXRpbyA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RS YXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSwgc3R5bGUoKS5i b3hTaXppbmdGb3JBc3BlY3RSYXRpbygpLCBsb2dpY2FsV2lkdGgoKSkgLSBib3JkZXJBbmRQYWRk aW5nTG9naWNhbEhlaWdodCgpOwogICAgICAgICBpZiAoZmlyc3RDaGlsZCgpKQogICAgICAgICAg ICAgaGVpZ2h0RnJvbUFzcGVjdFJhdGlvID0gc3RkOjptYXgoaGVpZ2h0RnJvbUFzcGVjdFJhdGlv LCAqaW50cmluc2ljQ29udGVudEhlaWdodCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjJjZWFiNmMzZTZkNmViMDJiYjEz NTgyNzZkYjhiNGIxYjM3M2YzOS4uOTU2NzllZGFmZGMzYzQxOTU2NzdmNjIwMGQzOTMwNDEzNTcz ZjYyZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAxLTEwICBDYW1lcm9uIE1jQ29ybWFj ayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBseSBhdXRvbWF0aWMgbWlu aW11bSBibG9jay1zaXplIGFzcGVjdC1yYXRpbyBydWxlcyB0byBub24tcmVwbGFjZWQgZWxlbWVu dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTA1 OAorICAgICAgICA8cmRhcjovLzg1NTA1MTAxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCByZXBsYWNlZCBlbGVtZW50cyB3aXRoIGNo aWxkIGNvbnRlbnQgKGluIHRoaXMgY2FzZSwgYQorICAgICAgICA8dmlkZW8+IGVsZW1lbnQncyBj b250cm9scyBpbiB0aGUgVUEgc2hhZG93IHRyZWUpIGRvbid0IGluZmx1ZW5jZSB0aGUKKyAgICAg ICAgYXV0b21hdGljIG1pbmltdW0gc2l6ZSBjYWxjdWxhdGlvbi4KKworICAgICAgICAqIGZhc3Qv Y3NzL2FzcGVjdC1yYXRpby1taW4taGVpZ2h0LXJlcGxhY2VkLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvY3NzL2FzcGVjdC1yYXRpby1taW4taGVpZ2h0LXJlcGxhY2VkLmh0 bWw6IEFkZGVkLgorCiAyMDIyLTAxLTA3ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyODM5MzUpOiBbIG1hY09TIHdrMSBdIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxl bWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L2RpYWxvZy1hdXRvZm9jdXMtbXVsdGlwbGUtdGltZXMu aHRtbCBpcyBhIGZsYWt5IGZhaWx1cmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3Nz L2FzcGVjdC1yYXRpby1taW4taGVpZ2h0LXJlcGxhY2VkLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRU ZXN0cy9mYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWluLWhlaWdodC1yZXBsYWNlZC1leHBlY3RlZC5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjk4MDAwOTc1ODBlODQ5MmNmNWIxMDdlOTY4OTljOGE3YTIwMGJlM2EK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWlu LWhlaWdodC1yZXBsYWNlZC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNCBAQAorPCFET0NUWVBF IGh0bWw+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBmbGV4OyI+CisgIDx2aWRlbyBjb250cm9scyB3 aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHllbGxvdzsi PjwvdmlkZW8+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2FzcGVj dC1yYXRpby1taW4taGVpZ2h0LXJlcGxhY2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9h c3BlY3QtcmF0aW8tbWluLWhlaWdodC1yZXBsYWNlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcxNzhlMGUw YmFjYzQwOTJmYzRmN2RiYzk4NWFlNzUyNzA2YWZkYTcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWluLWhlaWdodC1yZXBsYWNlZC5odG1sCkBA IC0wLDAgKzEsNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBmbGV4 OyI+CisgIDx2aWRlbyBjb250cm9scyB3aWR0aD0iMzAwIiBoZWlnaHQ9IjMwMCIgc3R5bGU9Im1h eC13aWR0aDogMTAwcHg7IGhlaWdodDogYXV0bzsgYXNwZWN0LXJhdGlvOiAxIC8gMTsgYmFja2dy b3VuZC1jb2xvcjogeWVsbG93OyI+PC92aWRlbz4KKzwvZGl2Pgo= 449009 2022-01-12 15:51:36 -0800 2022-01-13 18:54:35 -0800 Patch bug-235058-20220113105135.patch text/plain 7355 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZmODJhZDVjNWEyNmZk NDNjZjQ3Y2VlOTIzZThlYWQ3ZGM1ZDM2OS4uZTg0MGI1MGQxNWU1OTUyMTQ2ZDVlMjE2MzAyZGRi MTEzMzAyZGQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAxLTEwICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgT25seSBhcHBseSBh dXRvbWF0aWMgbWluaW11bSBibG9jay1zaXplIGFzcGVjdC1yYXRpbyBydWxlcyB0byBub24tcmVw bGFjZWQgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNTA1OAorICAgICAgICA8cmRhcjovLzg1NTA1MTAxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBydWxlcyBpbiBodHRwczovL3d3 dy53My5vcmcvVFIvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorICAgICAgICB0 aGF0IGRlZmluZSB0aGUgYXV0b21hdGljIG1pbmltdW0gc2l6ZSBvZiBhbiBlbGVtZW50IHN1Ympl Y3QgdG8gYW4KKyAgICAgICAgYXNwZWN0LXJhdGlvIG9ubHkgYXBwbHkgaWYgdGhlIGVsZW1lbnQg aXMgbm9uLXJlcGxhY2VkLgorCisgICAgICAgIEluIGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1p bk1heCBzcGVjaWZpY2FsbHksIHdoZW4gbWluLWhlaWdodCBpcworICAgICAgICBhdXRvLCBhZnRl ciBhcHBseWluZyB0aGUgYXNwZWN0LXJhdGlvIHRvIHByb2R1Y2UgYW4gYXV0b21hdGljIG1pbmlt dW0KKyAgICAgICAgaGVpZ2h0LCB3ZSBidW1wIGl0IHVwIHRvIHRoZSBjb250ZW50IGhlaWdodCBp ZiB0aGUgZWxlbWVudCBoYXMKKyAgICAgICAgY2hpbGRyZW4uIFRoaXMsIHByZXN1bWFibHksIGlz IHRvIGFjY291bnQgZm9yIHRoZSB3YXkgdGhlIGhlaWdodCBvZiBhCisgICAgICAgIGJsb2NrIGlz IGNvbXB1dGVkIGluIENTUyAyLjIuIChBcyBDU1MgMi4yIGRvZXNuJ3QgaGF2ZSBhbiBhdXRvIHZh bHVlCisgICAgICAgIGZvciBtaW4taGVpZ2h0LCBhbmQgYSBDU1MgQmxvY2sgTGF5b3V0IG1vZHVs ZSBoYXMgbm90IGJlZW4gd3JpdHRlbiBpbgorICAgICAgICB0ZXJtcyBvZiBDU1MgU2l6aW5nIGNv bmNlcHRzLCB0aGVyZSBpcyBubyBjbGVhciBkZWZpbml0aW9uIG9mCisgICAgICAgIGF1dG9tYXRp YyBtaW5pbXVtIHNpemluZyBmb3IgYmxvY2tzIGF0IHRoZSBtb21lbnQuKSBJZiB3ZSBlcnJvbmVv dXNseQorICAgICAgICBhcHBseSB0aGlzIHRvIGEgcmVwbGFjZWQgZWxlbWVudCwgc3VjaCBhcyBh biBpbWFnZSBvciB2aWRlbywgaXQgY2FuCisgICAgICAgIGdldCBhIGNvbXB1dGVkIG1pbi1oZWln aHQgZXF1YWwgdG8gdGhlIGludHJpbnNpYyBoZWlnaHQgb2YgdGhlIGltYWdlLAorICAgICAgICB3 aGljaCBtYXkgYmUgbXVjaCBsYXJnZXIgdGhhbiBleHBlY3RlZC4KKworICAgICAgICBUaGlzIGNv bW1pdCBhZGRzIGFuIGlzPFJlbmRlclJlcGxhY2VkPigpIGNoZWNrIGZvciBib3RoIGF1dG9tYXRp YworICAgICAgICBtaW5pbXVtIGxvZ2ljYWwgd2lkdGggYW5kIGhlaWdodCBjYWxjdWxhdGlvbnMs IGFsdGhvdWdoIEkgd2FzIHVuYWJsZSB0bworICAgICAgICBwcm9kdWNlIGEgdGVzdCB0byBleGVy Y2lzZSB0aGUgbG9naWNhbCB3aWR0aCBjYXNlICh3aGljaCBkb2VzIG5vdCB0YWtlCisgICAgICAg IHRoZSBpbnRyaW5zaWMgc2l6ZSBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgdGhlIGF1dG9t YXRpYyBtaW5pbXVtKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWlu LWhlaWdodC1yZXBsYWNlZC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5G cmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29u c3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4IGNvbnN0KToKKwogMjAyMi0wMS0wNyAgQWxleGV5 IFNodmF5a2EgIDxhc2h2YXlrYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG9ic29sZXRl IERPTSBMZXZlbCAyICJET01Gb2N1c0luIiAvICJET01Gb2N1c091dCIgZXZlbnRzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGJjNGMzMTBlOGFjYzRjMGMyOThhMzM4 NDNmYTUyMGNmMmE4YjMxNWYuLmMyODFjNjM5YmRiNzcyMWE1MDgwYmUwODhiYWFiOWI2MGVhOGM3 MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NzMsMTMgKzY3 MywxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFn bWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbAogICAgICAgICBsb2dpY2FsV2lkdGggPSBz dGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmco TWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNi LCBmcmFnbWVudCkpOwogICAgIGlmIChhbGxvd0ludHJpbnNpYyA9PSBBbGxvd0ludHJpbnNpYzo6 Tm8gJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQogICAgICAg ICByZXR1cm4gbG9naWNhbFdpZHRoOwotICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5s b2dpY2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYm IG1pbkxlbmd0aC5pc0F1dG8oKSAmJiAoc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8o KSB8fCBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzTWluQ29udGVudCgpIHx8IHN0eWxlVG9V c2UubG9naWNhbFdpZHRoKCkuaXNNYXhDb250ZW50KCkpICYmIGVmZmVjdGl2ZU92ZXJmbG93SW5s aW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKKyAgICBhdXRvIGxvZ2ljYWxN aW5XaWR0aCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7CisgICAgaWYgKGxvZ2ljYWxN aW5XaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKCkgJiYgKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgfHwgc3R5bGVUb1Vz ZS5sb2dpY2FsV2lkdGgoKS5pc01pbkNvbnRlbnQoKSB8fCBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0 aCgpLmlzTWF4Q29udGVudCgpKSAmJiAhaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAmJiBlZmZl Y3RpdmVPdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAg ICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCi0g ICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0g ICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7Cisg ICAgICAgIGxvZ2ljYWxNaW5XaWR0aCA9IExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KTsK ICAgICB9Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxX aWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBj YiwgZnJhZ21lbnQpKTsKKyAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5XaWR0aCwgYXZh aWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwg c3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdApA QCAtNjkwLDcgKzY4OSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2Fs SGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBzCiAgICAgICAgICAgICBs b2dpY2FsSGVpZ2h0ID0gc3RkOjptaW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1ZSgpKTsKICAg ICB9CiAgICAgYXV0byBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVp Z2h0KCk7Ci0gICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0 ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0 ICYmIGVmZmVjdGl2ZU92ZXJmbG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJs ZSkgeworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVM b2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAm JiAhaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAmJiBlZmZlY3RpdmVPdmVyZmxvd0Jsb2NrRGly ZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgYXV0byBoZWlnaHRGcm9t QXNwZWN0UmF0aW8gPSBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxl KCkubG9naWNhbEFzcGVjdFJhdGlvKCksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8o KSwgbG9naWNhbFdpZHRoKCkpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAg ICAgICAgaWYgKGZpcnN0Q2hpbGQoKSkKICAgICAgICAgICAgIGhlaWdodEZyb21Bc3BlY3RSYXRp byA9IHN0ZDo6bWF4KGhlaWdodEZyb21Bc3BlY3RSYXRpbywgKmludHJpbnNpY0NvbnRlbnRIZWln aHQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGIyY2VhYjZjM2U2ZDZlYjAyYmIxMzU4Mjc2ZGI4YjRiMWIzNzNmMzkuLjk1 Njc5ZWRhZmRjM2M0MTk1Njc3ZjYyMDBkMzkzMDQxMzU3M2Y2MmUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAyMi0wMS0xMCAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgor CisgICAgICAgIE9ubHkgYXBwbHkgYXV0b21hdGljIG1pbmltdW0gYmxvY2stc2l6ZSBhc3BlY3Qt cmF0aW8gcnVsZXMgdG8gbm9uLXJlcGxhY2VkIGVsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwNTgKKyAgICAgICAgPHJkYXI6Ly84NTUw NTEwMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0IHRoYXQgcmVwbGFjZWQgZWxlbWVudHMgd2l0aCBjaGlsZCBjb250ZW50IChpbiB0aGlzIGNh c2UsIGEKKyAgICAgICAgPHZpZGVvPiBlbGVtZW50J3MgY29udHJvbHMgaW4gdGhlIFVBIHNoYWRv dyB0cmVlKSBkb24ndCBpbmZsdWVuY2UgdGhlCisgICAgICAgIGF1dG9tYXRpYyBtaW5pbXVtIHNp emUgY2FsY3VsYXRpb24uCisKKyAgICAgICAgKiBmYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWluLWhl aWdodC1yZXBsYWNlZC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9h c3BlY3QtcmF0aW8tbWluLWhlaWdodC1yZXBsYWNlZC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0w NyAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OIChyMjgzOTM1KTogWyBtYWNPUyB3azEgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVu dC9kaWFsb2ctYXV0b2ZvY3VzLW11bHRpcGxlLXRpbWVzLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWluLWhlaWdo dC1yZXBsYWNlZC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXNwZWN0LXJh dGlvLW1pbi1oZWlnaHQtcmVwbGFjZWQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ODAwMDk3 NTgwZTg0OTJjZjViMTA3ZTk2ODk5YzhhN2EyMDBiZTNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvYXNwZWN0LXJhdGlvLW1pbi1oZWlnaHQtcmVwbGFjZWQtZXhwZWN0 ZWQuaHRtbApAQCAtMCwwICsxLDQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGRpdiBzdHlsZT0iZGlz cGxheTogZmxleDsiPgorICA8dmlkZW8gY29udHJvbHMgd2lkdGg9IjEwMCIgaGVpZ2h0PSIxMDAi IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7Ij48L3ZpZGVvPgorPC9kaXY+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9hc3BlY3QtcmF0aW8tbWluLWhlaWdodC1yZXBs YWNlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXNwZWN0LXJhdGlvLW1pbi1oZWlnaHQt cmVwbGFjZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mNzM5ZGNmOTU2YzVjN2U0N2YzYmRiMDEyYTc0MDk3 MDQ5ZmEwNDNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXNwZWN0 LXJhdGlvLW1pbi1oZWlnaHQtcmVwbGFjZWQuaHRtbApAQCAtMCwwICsxLDQgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsgZmxleC1kaXJlY3Rpb246IGNvbHVt bjsgYWxpZ24taXRlbXM6IHN0YXJ0OyI+CisgIDx2aWRlbyBjb250cm9scyB3aWR0aD0iMzAwIiBo ZWlnaHQ9IjMwMCIgc3R5bGU9IndpZHRoOiBhdXRvOyBtYXgtaGVpZ2h0OiAxMDBweDsgYXNwZWN0 LXJhdGlvOiAxIC8gMTsgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyI+PC92aWRlbz4KKzwvZGl2 Pgo=