224850 2021-04-20 20:19:36 -0700 [LFC] Take "contain: size" into account when computing the preferred logical width 2021-04-23 00:17:15 -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 1752607 0 zalan 2021-04-20 20:19:36 -0700 https://www.w3.org/TR/css-contain-2/#size-containment 1752609 1 426639 zalan 2021-04-20 20:23:50 -0700 Created attachment 426639 Patch 1752717 2 ews-feeder 2021-04-21 06:37:05 -0700 Committed r276358 (236836@main): <https://commits.webkit.org/236836@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426639. 1753481 3 webkit-bug-importer 2021-04-23 00:17:15 -0700 <rdar://problem/77059642> 426639 2021-04-20 20:23:50 -0700 2021-04-21 06:37:06 -0700 Patch bug-224850-20210420202349.patch text/plain 5182 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDFlY2U5NTZjZWI0MWEx NTE2NjM3M2NmYTk2MjljNTZlNmE4YTdlZS4uZGE3MWQ3MTRhMjlhZjdmZDVmNGFiOTAxMWZhZDU3 ZTc3YzZjY2M0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA0LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gVGFrZSAiY29udGFp bjogc2l6ZSIgaW50byBhY2NvdW50IHdoZW4gY29tcHV0aW5nIHRoZSBwcmVmZXJyZWQgbG9naWNh bCB3aWR0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI0ODUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGludHJpbnNpYyBzaXplcyBvZiB0aGUgc2l6ZSBjb250YWlubWVudCBib3ggYXJlIGRldGVy bWluZWQgYXMgaWYgdGhlIGVsZW1lbnQgaGFkIG5vIGNvbnRlbnQsCisgICAgICAgIGZvbGxvd2lu ZyB0aGUgc2FtZSBsb2dpYyBhcyB3aGVuIHNpemluZyBhcyBpZiBlbXB0eS4KKworICAgICAgICAq IGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0 aEZvckZvcm1hdHRpbmdSb290KToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1Rh YmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJs ZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgor CiAyMDIxLTA0LTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ10gSW1wbGVtZW50IEJveDo6aXNTaXplQ29udGFpbm1lbnRCb3goKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGQ1NzI2ZTkwNDAxN2EzMzYx MDMyOGU3NGYyOWE4NjdhNjgyMjM5OGEuLjBhMWEyYjQxNmM2N2RlNWYyNDVkNTJjMTVkYjYzNDM1 OGRjY2I1YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKQEAgLTM2MSw2ICszNjEsMTIgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRo Q29uc3RyYWludHMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmkKICAgICAgICAg aWYgKCFpczxDb250YWluZXJCb3g+KGxheW91dEJveCkgfHwgIWRvd25jYXN0PENvbnRhaW5lckJv eD4obGF5b3V0Qm94KS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKICAgICAgICAgICAgIHJl dHVybiB7IH07CiAKKyAgICAgICAgaWYgKGxheW91dEJveC5pc1NpemVDb250YWlubWVudEJveCgp KSB7CisgICAgICAgICAgICAvLyBUaGUgaW50cmluc2ljIHNpemVzIG9mIHRoZSBzaXplIGNvbnRh aW5tZW50IGJveCBhcmUgZGV0ZXJtaW5lZCBhcyBpZiB0aGUgZWxlbWVudCBoYWQgbm8gY29udGVu dCwKKyAgICAgICAgICAgIC8vIGZvbGxvd2luZyB0aGUgc2FtZSBsb2dpYyBhcyB3aGVuIHNpemlu ZyBhcyBpZiBlbXB0eS4KKyAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAgIH0KKwogICAg ICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAg ICAgICAgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gTGF5b3V0Q29udGV4dDo6 Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZG93bmNhc3Q8Q29udGFpbmVyQm94PihsYXlvdXRCb3gp LCBsYXlvdXRTdGF0ZSgpKS0+Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7CiAg ICAgICAgICAgICBpZiAobG9naWNhbFdpZHRoLmlzTWluQ29udGVudCgpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDdlODMxNjcwNDdiN2U2Njg3MDk5YTg2ZDcxYzgx OTBhZjA0MzNmOGUuLmE1MWVhZmZjZGEzZWVjYzQzZTIxNWQxZDk2NDYxMDZjMGNjNWE5NzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTMxOCw4ICszMTgsMTMgQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoRm9yRm9y bWF0dGluZ1Jvb3QoY29uc3QgQm94JgogICAgIGF1dG8gY29uc3RyYWludHMgPSBJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzIHsgfTsKICAgICBpZiAoYXV0byBmaXhlZFdpZHRoID0gZ2VvbWV0cnko KS5maXhlZFZhbHVlKGZvcm1hdHRpbmdSb290LnN0eWxlKCkubG9naWNhbFdpZHRoKCkpKQogICAg ICAgICBjb25zdHJhaW50cyA9IHsgKmZpeGVkV2lkdGgsICpmaXhlZFdpZHRoIH07Ci0gICAgZWxz ZSBpZiAoaXM8Q29udGFpbmVyQm94Pihmb3JtYXR0aW5nUm9vdCkgJiYgZG93bmNhc3Q8Q29udGFp bmVyQm94Pihmb3JtYXR0aW5nUm9vdCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCi0gICAg ICAgIGNvbnN0cmFpbnRzID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQo ZG93bmNhc3Q8Q29udGFpbmVyQm94Pihmb3JtYXR0aW5nUm9vdCksIGxheW91dFN0YXRlKCkpLT5j b21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKKyAgICBlbHNlIHsKKyAgICAgICAg YXV0byBoYXNJbmZsb3dPckZsb2F0aW5nQ29udGVudCA9IGlzPENvbnRhaW5lckJveD4oZm9ybWF0 dGluZ1Jvb3QpICYmIGRvd25jYXN0PENvbnRhaW5lckJveD4oZm9ybWF0dGluZ1Jvb3QpLmhhc0lu Rmxvd09yRmxvYXRpbmdDaGlsZCgpOworICAgICAgICAvLyBUaGUgaW50cmluc2ljIHNpemVzIG9m IHRoZSBzaXplIGNvbnRhaW5tZW50IGJveCBhcmUgZGV0ZXJtaW5lZCBhcyBpZiB0aGUgZWxlbWVu dCBoYWQgbm8gY29udGVudC4KKyAgICAgICAgYXV0byBzaG91bGRJZ25vcmVDaGlsZENvbnRlbnQg PSBmb3JtYXR0aW5nUm9vdC5pc1NpemVDb250YWlubWVudEJveCgpOworICAgICAgICBpZiAoaGFz SW5mbG93T3JGbG9hdGluZ0NvbnRlbnQgJiYgIXNob3VsZElnbm9yZUNoaWxkQ29udGVudCkKKyAg ICAgICAgICAgIGNvbnN0cmFpbnRzID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0Nv bnRleHQoZG93bmNhc3Q8Q29udGFpbmVyQm94Pihmb3JtYXR0aW5nUm9vdCksIGxheW91dFN0YXRl KCkpLT5jb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKKyAgICB9CiAgICAgY29u c3RyYWludHMgPSBnZW9tZXRyeSgpLmNvbnN0cmFpbkJ5TWluTWF4V2lkdGgoZm9ybWF0dGluZ1Jv b3QsIGNvbnN0cmFpbnRzKTsKICAgICBjb25zdHJhaW50cy5leHBhbmQoZ2VvbWV0cnlGb3JCb3go Zm9ybWF0dGluZ1Jvb3QpLmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwogICAg IGZvcm1hdHRpbmdTdGF0ZSgpLnNldEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goZm9y bWF0dGluZ1Jvb3QsIGNvbnN0cmFpbnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IDNlMDUwMTVhNWYxNDgzOTZmMGJhODhhNzVkNGZlOTY1MGI1NDEzYzEuLjkwMmFmN2M1 ZWQ4OGQ1MDRjYWM0MjVhMTM1MjEwMDhiNmU1OGI5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtMzA1LDYgKzMwNSw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0Q2VsbChjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwsIExheW91dFVuaXQKIAog Rm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkKIHsKKyAgICBB U1NFUlQoIXJvb3QoKS5pc1NpemVDb250YWlubWVudEJveCgpKTsKICAgICAvLyBUYWJsZXMgaGF2 ZSBhIHNsaWdodHkgZGlmZmVyZW50IGNvbmNlcHQgb2Ygc2hyaW5rIHRvIGZpdC4gSXQncyByZWFs bHkgb25seSBkaWZmZXJlbnQgd2l0aCBub24tYXV0byAid2lkdGgiIHZhbHVlcywgd2hlcmUKICAg ICAvLyBhIGdlbmVyaWMgc2hyaW5rLXRvIGZpdCBibG9jayBsZXZlbCBib3ggbGlrZSBhIGZsb2F0 IGJveCB3b3VsZCBiZSBqdXN0IHNpemVkIHRvIHRoZSBjb21wdXRlZCB2YWx1ZSBvZiAid2lkdGgi LCB0YWJsZXMKICAgICAvLyBjYW4gYWN0dWFsbHkgYmUgc3RyZWNoZWQgd2F5IG92ZXIuCg==