185649 2018-05-15 08:55:35 -0700 [LFC] Make Display::Box box sizing aware 2018-05-16 07:50:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1424024 0 zalan 2018-05-15 08:55:35 -0700 box-sizing: content-box, border-box 1424028 1 340414 zalan 2018-05-15 09:03:09 -0700 Created attachment 340414 Patch 1424278 2 340414 koivisto 2018-05-16 02:14:48 -0700 Comment on attachment 340414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340414&action=review > Source/WebCore/layout/displaytree/DisplayBox.h:90 > + Box(EBoxSizing); Won't this need some sort of more generic strategy at some point? Presumably there are other style-dependent things in Display::Boxes. 1424311 3 zalan 2018-05-16 07:21:08 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 340414 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=340414&action=review > > > Source/WebCore/layout/displaytree/DisplayBox.h:90 > > + Box(EBoxSizing); > > Won't this need some sort of more generic strategy at some point? Presumably > there are other style-dependent things in Display::Boxes. Yeah, we definitely need some sort of more generic strategy for computed/resolved style values! (currently it's a combination of setters (padding, border) and through c'tor (box-sizing)). 1424321 4 340414 commit-queue 2018-05-16 07:50:00 -0700 Comment on attachment 340414 Patch Clearing flags on attachment: 340414 Committed r231846: <https://trac.webkit.org/changeset/231846> 1424322 5 commit-queue 2018-05-16 07:50:01 -0700 All reviewed patches have been landed. Closing bug. 1424323 6 webkit-bug-importer 2018-05-16 07:50:22 -0700 <rdar://problem/40293626> 340414 2018-05-15 09:03:09 -0700 2018-05-16 07:50:00 -0700 Patch bug-185649-20180515090308.patch text/plain 5866 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQyMTA4OGFkMjQ1MTEz MmExNDFhYWQ2YWNhODE3N2VjZDBhOTJjMy4uZWEyNWQxZGJlY2QyMGRlZTEwOTc4NjhlOTRmZDcy ZTIzZWExMjQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA1LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWFrZSBEaXNwbGF5 OjpCb3ggYm94IHNpemluZyBhd2FyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg1NjQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRGlzcGxheTo6Qm94Ojp3aWR0aCgpID09IERpc3BsYXk6OkJveDo6Y29u dGVudEJveCgpLndpZHRoKCkgPD0gYm94LXNpemluZzogY29udGVudC1ib3g7IChpbml0aWFsIGFu ZCBkZWZhdWx0IHZhbHVlKQorICAgICAgICBEaXNwbGF5OjpCb3g6OndpZHRoKCkgPT0gRGlzcGxh eTo6Qm94Ojpib3JkZXJCb3goKS53aWR0aCgpIDw9IGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisK KyAgICAgICAgKiBsYXlvdXQvTGF5b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxheW91dENvbnRleHQ6OmNyZWF0ZURpc3BsYXlCb3gpOgorICAgICAgICAqIGxheW91 dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6 OkJveDo6Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6bWFyZ2luQm94IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6Ym9yZGVyQm94IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6cGFkZGluZ0JveCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OmNvbnRlbnRCb3ggY29uc3QpOgorICAgICAgICAq IGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94Lmg6CisKIDIwMTgtMDUtMTUgIERpcmsgU2No dWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgbmV3IFNWR0RPTSBTVkdGRUJM RU5EIGNvbnN0YW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwCmluZGV4 IDY1OGY4Y2JjNTZlNGI4YTQ0NjI4NTcwOWY0MTc5NDk1MmYyYjNkMjkuLjc3MTg3ODZiZmRjZmFm ZjA5MjZiNjBhYzg3OTc1NDI0NmE0NjY1MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9MYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0 Q29udGV4dC5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgdm9pZCBMYXlvdXRDb250ZXh0Ojp1cGRhdGVM YXlvdXQoKQogCiBEaXNwbGF5OjpCb3gmIExheW91dENvbnRleHQ6OmNyZWF0ZURpc3BsYXlCb3go Y29uc3QgQm94JiBsYXlvdXRCb3gpCiB7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPERpc3BsYXk6OkJv eD4gZGlzcGxheUJveChuZXcgRGlzcGxheTo6Qm94KCkpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxE aXNwbGF5OjpCb3g+IGRpc3BsYXlCb3gobmV3IERpc3BsYXk6OkJveChsYXlvdXRCb3guc3R5bGUo KS5ib3hTaXppbmcoKSkpOwogICAgIGF1dG8qIGRpc3BsYXlCb3hQdHIgPSBkaXNwbGF5Qm94Lmdl dCgpOwogICAgIG1fbGF5b3V0VG9EaXNwbGF5Qm94LmFkZCgmbGF5b3V0Qm94LCBXVEZNb3ZlKGRp c3BsYXlCb3gpKTsKICAgICByZXR1cm4gKmRpc3BsYXlCb3hQdHI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAKaW5kZXggY2NkZjY0ODNjZDEy ZWNkMGNjNTM4NDQ5ZjFmNTJmNDU4ZTM5NmU2OC4uNTQ3ZmY3ODA4ZDdhN2I1N2FmZGYwYWZiNjBl YjFmOTI4MWJmYzU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0 cmVlL0Rpc3BsYXlCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJl ZS9EaXNwbGF5Qm94LmNwcApAQCAtMzUsNyArMzUsOCBAQCBuYW1lc3BhY2UgRGlzcGxheSB7CiAK IFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChCb3gpOwogCi1Cb3g6OkJveCgpCitCb3g6OkJv eChFQm94U2l6aW5nIGJveFNpemluZykKKyAgICA6IG1fYm94U2l6aW5nKGJveFNpemluZykKIHsK IH0KIApAQCAtNDYsNDEgKzQ3LDU2IEBAIEJveDo6fkJveCgpCiBMYXlvdXRSZWN0IEJveDo6bWFy Z2luQm94KCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxpZE1hcmdpbik7Ci0gICAgYXV0 byBtYXJnaW5Cb3ggPSByZWN0KCk7Ci0gICAgYXV0byB0b3BMZWZ0TWFyZ2luID0gTGF5b3V0U2l6 ZShtX21hcmdpbkxlZnQsIG1fbWFyZ2luVG9wKTsKLSAgICBtYXJnaW5Cb3guaW5mbGF0ZSh0b3BM ZWZ0TWFyZ2luKTsKKyAgICBhdXRvIG1hcmdpbkJveCA9IGJvcmRlckJveCgpOworCisgICAgbWFy Z2luQm94LnNoaWZ0WEVkZ2VUbyhtYXJnaW5Cb3gueCgpICsgbV9tYXJnaW5MZWZ0KTsKKyAgICBt YXJnaW5Cb3guc2hpZnRZRWRnZVRvKG1hcmdpbkJveC55KCkgKyBtX21hcmdpblRvcCk7CisgICAg bWFyZ2luQm94LnNoaWZ0TWF4WEVkZ2VUbyhtYXJnaW5Cb3gubWF4WCgpIC0gbV9tYXJnaW5SaWdo dCk7CisgICAgbWFyZ2luQm94LnNoaWZ0TWF4WUVkZ2VUbyhtYXJnaW5Cb3gubWF4WSgpIC0gbV9t YXJnaW5Cb3R0b20pOwogCi0gICAgYXV0byBib3R0b21SaWdodE1hcmdpbiA9IExheW91dFNpemUo bV9tYXJnaW5SaWdodCwgbV9tYXJnaW5Cb3R0b20pOwotICAgIG1hcmdpbkJveC5leHBhbmQoYm90 dG9tUmlnaHRNYXJnaW4pOwogICAgIHJldHVybiBtYXJnaW5Cb3g7CiB9CiAKIExheW91dFJlY3Qg Qm94Ojpib3JkZXJCb3goKSBjb25zdAogewotICAgIHJldHVybiBMYXlvdXRSZWN0KExheW91dFBv aW50KDAsIDApLCBzaXplKCkpOworICAgIGlmIChtX2JveFNpemluZyA9PSBCT1JERVJfQk9YKQor ICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCggeyB9LCBzaXplKCkpOworCisgICAgLy8gV2lkdGgg aXMgY29udGVudCBib3guCisgICAgQVNTRVJUKG1faGFzVmFsaWRCb3JkZXIpOworICAgIEFTU0VS VChtX2hhc1ZhbGlkUGFkZGluZyk7CisgICAgYXV0byBib3JkZXJCb3hTaXplID0gc2l6ZSgpOwor ICAgIGJvcmRlckJveFNpemUuZXhwYW5kKGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkgKyBw YWRkaW5nUmlnaHQoKSArIGJvcmRlclJpZ2h0KCkgLCBib3JkZXJUb3AoKSArIHBhZGRpbmdUb3Ao KSArIHBhZGRpbmdCb3R0b20oKSArIGJvcmRlckJvdHRvbSgpKTsKKyAgICByZXR1cm4gTGF5b3V0 UmVjdCggeyB9LCBib3JkZXJCb3hTaXplKTsKIH0KIAogTGF5b3V0UmVjdCBCb3g6OnBhZGRpbmdC b3goKSBjb25zdAogewogICAgIEFTU0VSVChtX2hhc1ZhbGlkQm9yZGVyKTsKICAgICBhdXRvIHBh ZGRpbmdCb3ggPSBib3JkZXJCb3goKTsKLSAgICBhdXRvIHRvcExlZnRCb3JkZXIgPSBMYXlvdXRT aXplKG1fYm9yZGVyTGVmdCwgbV9ib3JkZXJUb3ApOwotICAgIHBhZGRpbmdCb3guaW5mbGF0ZSgt dG9wTGVmdEJvcmRlcik7CiAKLSAgICBhdXRvIGJvdHRvbVJpZ2h0Qm9yZGVyID0gTGF5b3V0U2l6 ZShtX2JvcmRlclJpZ2h0LCBtX2JvcmRlckJvdHRvbSk7Ci0gICAgcGFkZGluZ0JveC5leHBhbmQo LWJvdHRvbVJpZ2h0Qm9yZGVyKTsKKyAgICBwYWRkaW5nQm94LnNoaWZ0WEVkZ2VUbyhwYWRkaW5n Qm94LngoKSArIG1fYm9yZGVyTGVmdCk7CisgICAgcGFkZGluZ0JveC5zaGlmdFlFZGdlVG8ocGFk ZGluZ0JveC55KCkgKyBtX2JvcmRlclRvcCk7CisgICAgcGFkZGluZ0JveC5zaGlmdE1heFhFZGdl VG8ocGFkZGluZ0JveC5tYXhYKCkgLSBtX2JvcmRlclJpZ2h0KTsKKyAgICBwYWRkaW5nQm94LnNo aWZ0TWF4WUVkZ2VUbyhwYWRkaW5nQm94Lm1heFkoKSAtIG1fYm9yZGVyQm90dG9tKTsKKwogICAg IHJldHVybiBwYWRkaW5nQm94OwogfQogCiBMYXlvdXRSZWN0IEJveDo6Y29udGVudEJveCgpIGNv bnN0CiB7CisgICAgaWYgKG1fYm94U2l6aW5nID09IENPTlRFTlRfQk9YKQorICAgICAgICByZXR1 cm4gTGF5b3V0UmVjdChMYXlvdXRQb2ludCgwLCAwKSwgc2l6ZSgpKTsKKworICAgIC8vIFdpZHRo IGlzIGJvcmRlciBib3guCiAgICAgQVNTRVJUKG1faGFzVmFsaWRQYWRkaW5nKTsKICAgICBhdXRv IGNvbnRlbnRCb3ggPSBwYWRkaW5nQm94KCk7Ci0gICAgYXV0byB0b3BMZWZ0UGFkZGluZyA9IExh eW91dFNpemUobV9wYWRkaW5nTGVmdCwgbV9wYWRkaW5nVG9wKTsKLSAgICBjb250ZW50Qm94Lmlu ZmxhdGUoLXRvcExlZnRQYWRkaW5nKTsKLSAgICAKLSAgICBhdXRvIGJvdHRvbVJpZ2h0UGFkZGlu ZyA9IExheW91dFNpemUobV9wYWRkaW5nUmlnaHQsIG1fcGFkZGluZ0JvdHRvbSk7Ci0gICAgY29u dGVudEJveC5leHBhbmQoLWJvdHRvbVJpZ2h0UGFkZGluZyk7CisKKyAgICBjb250ZW50Qm94LnNo aWZ0WEVkZ2VUbyhjb250ZW50Qm94LngoKSArIG1fcGFkZGluZ0xlZnQpOworICAgIGNvbnRlbnRC b3guc2hpZnRZRWRnZVRvKGNvbnRlbnRCb3gueSgpICsgbV9wYWRkaW5nVG9wKTsKKyAgICBjb250 ZW50Qm94LnNoaWZ0TWF4WEVkZ2VUbyhjb250ZW50Qm94Lm1heFgoKSAtIG1fcGFkZGluZ1JpZ2h0 KTsKKyAgICBjb250ZW50Qm94LnNoaWZ0TWF4WUVkZ2VUbyhjb250ZW50Qm94Lm1heFkoKSAtIG1f cGFkZGluZ0JvdHRvbSk7CisKICAgICByZXR1cm4gY29udGVudEJveDsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKaW5kZXggMzY4ZmRhZjBl Yjg1YjRkMmFjYWY2ODRmMjQxMjhlZDIwNjhiNWU4ZC4uMWViMTEzNjZjMDgxNTAzYjhmNGQ2ZGM3 N2ZjNTY4MjE1NzI2NWFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3Bs YXl0cmVlL0Rpc3BsYXlCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRy ZWUvRGlzcGxheUJveC5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiTGF5b3V0UG9pbnQu aCIKICNpbmNsdWRlICJMYXlvdXRSZWN0LmgiCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgorI2lu Y2x1ZGUgIlJlbmRlclN0eWxlQ29uc3RhbnRzLmgiCiAjaW5jbHVkZSA8d3RmL0lzb01hbGxvYy5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC04Niw3ICs4Nyw3IEBAIHB1YmxpYzoKICAgICBM YXlvdXRSZWN0IGNvbnRlbnRCb3goKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBCb3goKTsKKyAg ICBCb3goRUJveFNpemluZyk7CiAKICAgICB2b2lkIHNldFJlY3QoY29uc3QgTGF5b3V0UmVjdCYp OwogICAgIHZvaWQgc2V0VG9wTGVmdChjb25zdCBMYXlvdXRQb2ludCYpOwpAQCAtMTQxLDYgKzE0 Miw4IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtX3BhZGRpbmdCb3R0b207CiAgICAgTGF5 b3V0VW5pdCBtX3BhZGRpbmdSaWdodDsKIAorICAgIEVCb3hTaXppbmcgbV9ib3hTaXppbmcgeyBD T05URU5UX0JPWCB9OworCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGJvb2wgbV9oYXNWYWxp ZFRvcCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1ZhbGlkTGVmdCB7IGZhbHNlIH07Cg==