225013 2021-04-23 20:37:47 -0700 [LFC] Ignore content height and width when 'contain: size' is present 2021-04-24 06:11:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1753827 0 zalan 2021-04-23 20:37:47 -0700 https://www.w3.org/TR/css-contain-2/#size-containment 1753828 1 426974 zalan 2021-04-23 20:48:57 -0700 Created attachment 426974 Patch 1753840 2 ews-feeder 2021-04-24 06:10:52 -0700 Committed r276548 (236988@main): <https://commits.webkit.org/236988@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426974. 1753841 3 webkit-bug-importer 2021-04-24 06:11:16 -0700 <rdar://problem/77105066> 426974 2021-04-23 20:48:57 -0700 2021-04-24 06:10:53 -0700 Patch bug-225013-20210423204856.patch text/plain 4956 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgyMDU0NzRhYmM2N2Ey OTFhYWI3OTY5ZGFjOWVjZmI5NDljMDg1Ny4uZTRiOWZiNzU1YTI4MjcyZTZlZDJmNTI2MzNlYjA0 ZGRiYjNlYzMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSWdub3JlIGNvbnRl bnQgaGVpZ2h0IGFuZCB3aWR0aCB3aGVuICdjb250YWluOiBzaXplJyBpcyBwcmVzZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUwMTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc2l6ZSBj b250YWlubWVudCBmb3IgInNocmluayB0byBmaXQgd2lkdGgiIGFuZCBmb3IgImhlaWdodDogYXV0 byIgZm9ybWF0dGluZyBjb250ZXh0IHJvb3RzLiAgICAKKyAgICAgICAgaHR0cHM6Ly93d3cudzMu b3JnL1RSL2Nzcy1jb250YWluLTIvI3NpemUtY29udGFpbm1lbnQuCisKKyAgICAgICAgKiBsYXlv dXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29udGVudEhlaWdodEZvckZvcm1hdHRp bmdDb250ZXh0Um9vdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6c2hyaW5rVG9GaXRXaWR0aCk6CisKIDIwMjEtMDQtMjAgIEJh c3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAgIFtjbGFuZ10g UmVtb3ZlIGltcGxpY2l0IGNhc3QgcmVsYXRlZCB3YXJuaW5ncy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBlZDdjODgy Yjk5M2E5NTIzYjhiMjNkYjU3NDk3NzJhMTJiYzQ5ZjZlLi45ZWIxOTY1N2I4YmU3MTk5YWEzZmZj MjA2ZjU3MjFhNzJjZDYyYzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xNzUsOSArMTc1LDEzIEBAIExheW91dFVu aXQgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGlu Z0NvbnRleHRSb290KGNvCiB7CiAgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5lc3Rh Ymxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgIEFTU0VSVChpc0hlaWdodEF1dG8oZm9y bWF0dGluZ0NvbnRleHRSb290KSB8fCBmb3JtYXR0aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNU YWJsZUZvcm1hdHRpbmdDb250ZXh0KCkgfHwgZm9ybWF0dGluZ0NvbnRleHRSb290LmlzVGFibGVD ZWxsKCkpOwotICAgIGlmICghZm9ybWF0dGluZ0NvbnRleHRSb290Lmhhc0luRmxvd09yRmxvYXRp bmdDaGlsZCgpKQotICAgICAgICByZXR1cm4geyB9OwotICAgIHJldHVybiBMYXlvdXRDb250ZXh0 OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGNvbnN0X2Nh c3Q8TGF5b3V0U3RhdGUmPihsYXlvdXRTdGF0ZSgpKSktPnVzZWRDb250ZW50SGVpZ2h0KCk7Cisg ICAgYXV0byB1c2VkQ29udGVudEhlaWdodCA9IExheW91dFVuaXQgeyB9OyAKKyAgICBhdXRvIGhh c0NvbnRlbnQgPSBmb3JtYXR0aW5nQ29udGV4dFJvb3QuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxk KCk7CisgICAgLy8gVGhlIHVzZWQgaGVpZ2h0IG9mIHRoZSBjb250YWlubWVudCBib3ggaXMgZGV0 ZXJtaW5lZCBhcyBpZiBwZXJmb3JtaW5nIGEgbm9ybWFsIGxheW91dCBvZiB0aGUgYm94LCBleGNl cHQgdGhhdCBpdCBpcyB0cmVhdGVkIGFzIGhhdmluZyBubyBjb250ZW50LgorICAgIGF1dG8gc2hv dWxkSWdub3JlQ29udGVudCA9IGZvcm1hdHRpbmdDb250ZXh0Um9vdC5pc1NpemVDb250YWlubWVu dEJveCgpOworICAgIGlmIChoYXNDb250ZW50ICYmICFzaG91bGRJZ25vcmVDb250ZW50KQorICAg ICAgICB1c2VkQ29udGVudEhlaWdodCA9IExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdD b250ZXh0KGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgY29uc3RfY2FzdDxMYXlvdXRTdGF0ZSY+KGxh eW91dFN0YXRlKCkpKS0+dXNlZENvbnRlbnRIZWlnaHQoKTsKKyAgICByZXR1cm4gdXNlZENvbnRl bnRIZWlnaHQ7CiB9CiAKIE9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6Y29tcHV0ZWRWYWx1ZShjb25zdCBMZW5ndGgmIGdlb21ldHJ5UHJvcGVydHksIExh eW91dFVuaXQgY29udGFpbmluZ0Jsb2NrV2lkdGgpIGNvbnN0CkBAIC0yNzgsMTAgKzI4MiwxMCBA QCBMYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6c3RhdGljSG9yaXpvbnRh bFBvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaQogICAgIHJldHVybiBsZWZ0IC0gaG9yaXpvbnRhbENv bnN0cmFpbnRzLmxvZ2ljYWxMZWZ0OwogfQogCi1MYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6c2hyaW5rVG9GaXRXaWR0aChjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290LCBM YXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKQorTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OnNocmlua1RvRml0V2lkdGgoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJv b3QsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpCiB7Ci0gICAgTE9HX1dJVEhfU1RSRUFNKEZv cm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltXaWR0aF0gLT4gc2hyaW5rIHRvIGZp dCAtPiB1bnN1cHBvcnRlZCAtPiB3aWR0aCgiIDw8IExheW91dFVuaXQgeyB9IDw8ICJweCkgbGF5 b3V0Qm94OiAiIDw8ICZmb3JtYXR0aW5nUm9vdCA8PCAiKSIpOwotICAgIEFTU0VSVChmb3JtYXR0 aW5nUm9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOworICAgIExPR19XSVRIX1NU UkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbV2lkdGhdIC0+IHNocmlu ayB0byBmaXQgLT4gdW5zdXBwb3J0ZWQgLT4gd2lkdGgoIiA8PCBMYXlvdXRVbml0IHsgfSA8PCAi cHgpIGxheW91dEJveDogIiA8PCAmZm9ybWF0dGluZ0NvbnRleHRSb290IDw8ICIpIik7CisgICAg QVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0 KCkpOwogCiAgICAgLy8gQ2FsY3VsYXRpb24gb2YgdGhlIHNocmluay10by1maXQgd2lkdGggaXMg c2ltaWxhciB0byBjYWxjdWxhdGluZyB0aGUgd2lkdGggb2YgYSB0YWJsZSBjZWxsIHVzaW5nIHRo ZSBhdXRvbWF0aWMgdGFibGUgbGF5b3V0IGFsZ29yaXRobS4KICAgICAvLyBSb3VnaGx5OiBjYWxj dWxhdGUgdGhlIHByZWZlcnJlZCB3aWR0aCBieSBmb3JtYXR0aW5nIHRoZSBjb250ZW50IHdpdGhv dXQgYnJlYWtpbmcgbGluZXMgb3RoZXIgdGhhbiB3aGVyZSBleHBsaWNpdCBsaW5lIGJyZWFrcyBv Y2N1ciwKQEAgLTI5MSw4ICsyOTUsMTEgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OnNocmlua1RvRml0V2lkdGgoY29uc3QgQm94JiBmb3JtYXR0aW5nUm8KIAogICAg IC8vIFRoZW4gdGhlIHNocmluay10by1maXQgd2lkdGggaXM6IG1pbihtYXgocHJlZmVycmVkIG1p bmltdW0gd2lkdGgsIGF2YWlsYWJsZSB3aWR0aCksIHByZWZlcnJlZCB3aWR0aCkuCiAgICAgYXV0 byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyB7 IH07Ci0gICAgaWYgKGlzPENvbnRhaW5lckJveD4oZm9ybWF0dGluZ1Jvb3QpICYmIGRvd25jYXN0 PENvbnRhaW5lckJveD4oZm9ybWF0dGluZ1Jvb3QpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgp KSB7Ci0gICAgICAgIGF1dG8mIHJvb3QgPSBkb3duY2FzdDxDb250YWluZXJCb3g+KGZvcm1hdHRp bmdSb290KTsKKyAgICBhdXRvIGhhc0NvbnRlbnQgPSBpczxDb250YWluZXJCb3g+KGZvcm1hdHRp bmdDb250ZXh0Um9vdCkgJiYgZG93bmNhc3Q8Q29udGFpbmVyQm94Pihmb3JtYXR0aW5nQ29udGV4 dFJvb3QpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpOworICAgIC8vIFRoZSB1c2VkIHdpZHRo IG9mIHRoZSBjb250YWlubWVudCBib3ggaXMgZGV0ZXJtaW5lZCBhcyBpZiBwZXJmb3JtaW5nIGEg bm9ybWFsIGxheW91dCBvZiB0aGUgYm94LCBleGNlcHQgdGhhdCBpdCBpcyB0cmVhdGVkIGFzIGhh dmluZyBubyBjb250ZW50LgorICAgIGF1dG8gc2hvdWxkSWdub3JlQ29udGVudCA9IGZvcm1hdHRp bmdDb250ZXh0Um9vdC5pc1NpemVDb250YWlubWVudEJveCgpOyAgCisgICAgaWYgKGhhc0NvbnRl bnQgJiYgIXNob3VsZElnbm9yZUNvbnRlbnQpIHsKKyAgICAgICAgYXV0byYgcm9vdCA9IGRvd25j YXN0PENvbnRhaW5lckJveD4oZm9ybWF0dGluZ0NvbnRleHRSb290KTsKICAgICAgICAgYXV0byYg Zm9ybWF0dGluZ1N0YXRlRm9yUm9vdCA9IGxheW91dFN0YXRlKCkuZW5zdXJlRm9ybWF0dGluZ1N0 YXRlKHJvb3QpOwogICAgICAgICBhdXRvIHByZWNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJh aW50cyA9IGZvcm1hdHRpbmdTdGF0ZUZvclJvb3QuaW50cmluc2ljV2lkdGhDb25zdHJhaW50cygp OwogICAgICAgICBpZiAoIXByZWNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cykK