187126 2018-06-27 17:23:22 -0700 [LFC] Align inFlowNonReplacedHeightAndMargin() style with the rest of the compute functions. 2018-06-27 18:59:25 -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 1437194 0 zalan 2018-06-27 17:23:22 -0700 ssia 1437216 1 343779 zalan 2018-06-27 18:10:02 -0700 Created attachment 343779 Patch 1437228 2 zalan 2018-06-27 18:57:24 -0700 Committed r233297: <https://trac.webkit.org/changeset/233297> 1437229 3 webkit-bug-importer 2018-06-27 18:59:25 -0700 <rdar://problem/41557238> 343779 2018-06-27 18:10:02 -0700 2018-06-27 18:11:36 -0700 Patch bug-187126-20180627181000.patch text/plain 7621 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWEyYTllYzIyNjM3MWJm MTQzYTdmNjVhZWIxNDA5NzM5ZDc3YTYyYi4uOGEyYjFmMDhmNzYxNjcyNTlmZTczY2I5NmJmZTIw NjA3NzhmOGM5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE4LTA2LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQWxpZ24gaW5GbG93 Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oKSBzdHlsZSB3aXRoIHRoZSByZXN0IG9mIHRoZSBj b21wdXRlIGZ1bmN0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NzEyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorCiAy MDE4LTA2LTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q10gQWxpZ24gaW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbigpIHN0eWxlIHdpdGggdGhl IHJlc3Qgb2YgdGhlIGNvbXB1dGUgZnVuY3Rpb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDQ0MjEzMWFlYmE1MGY1ZTU2MjZhMGQzYzkwMDY0 ZjY3ZDhjZGVkMGQuLmQyN2JkZmNjZWNhYzYxYTNkZDU0NDUwZDM5NTZiNjAwNWJmMWQwY2MgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTYwLDcg KzYwLDggQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJnaW4gQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmkKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94 LmlzSW5GbG93KCkgJiYgIWxheW91dEJveC5yZXBsYWNlZCgpKTsKIAotICAgIGF1dG8gY29tcHV0 ZSA9IFsmXSgpIC0+IExheW91dFVuaXQgeworICAgIGF1dG8gY29tcHV0ZSA9IFsmXSgpIC0+IEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIHsKKwogICAgICAgICAv LyAxMC42LjMgQmxvY2stbGV2ZWwgbm9uLXJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93 IHdoZW4gJ292ZXJmbG93JyBjb21wdXRlcyB0byAndmlzaWJsZScKICAgICAgICAgLy8KICAgICAg ICAgLy8gSWYgJ21hcmdpbi10b3AnLCBvciAnbWFyZ2luLWJvdHRvbScgYXJlICdhdXRvJywgdGhl aXIgdXNlZCB2YWx1ZSBpcyAwLgpAQCAtNzQsMjEgKzc1LDI0IEBAIEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjppCiAgICAgICAgIC8vIE9ubHkgY2hpbGRyZW4gaW4gdGhlIG5vcm1hbCBmbG93IGFyZSB0 YWtlbiBpbnRvIGFjY291bnQgKGkuZS4sIGZsb2F0aW5nIGJveGVzIGFuZCBhYnNvbHV0ZWx5IHBv c2l0aW9uZWQgYm94ZXMgYXJlIGlnbm9yZWQsCiAgICAgICAgIC8vIGFuZCByZWxhdGl2ZWx5IHBv c2l0aW9uZWQgYm94ZXMgYXJlIGNvbnNpZGVyZWQgd2l0aG91dCB0aGVpciBvZmZzZXQpLiBOb3Rl IHRoYXQgdGhlIGNoaWxkIGJveCBtYXkgYmUgYW4gYW5vbnltb3VzIGJsb2NrIGJveC4KIAotICAg ICAgICBpZiAoIWxheW91dEJveC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSkgewot ICAgICAgICAgICAgLy8gRklYTUU6IE9ubHkgZml4ZWQgdmFsdWVzIHlldC4KLSAgICAgICAgICAg IHJldHVybiBsYXlvdXRCb3guc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkudmFsdWUoKTsKLSAgICAg ICAgfQotCi0gICAgICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlvdXRCb3gpIHx8ICFkb3duY2Fz dDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93Q2hpbGQoKSkKLSAgICAgICAgICAgIHJl dHVybiAwOwotCisgICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisgICAg ICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hG b3JMYXlvdXRCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPmNvbnRlbnRCb3hXaWR0 aCgpOwogICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJv eEZvckxheW91dEJveChsYXlvdXRCb3gpOworCisgICAgICAgIGF1dG8gbWFyZ2luVG9wID0gRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1h cmdpblRvcCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCkudmFsdWVfb3IoMCk7CisgICAgICAgIGF1 dG8gbWFyZ2luQm90dG9tID0gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZh bHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpbkJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCku dmFsdWVfb3IoMCk7CiAgICAgICAgIGF1dG8gYm9yZGVyQW5kUGFkZGluZ1RvcCA9IGRpc3BsYXlC b3guYm9yZGVyVG9wKCkgKyBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKTsKKyAgICAgICAgCisgICAg ICAgIGlmICghc3R5bGUubG9naWNhbEhlaWdodCgpLmlzQXV0bygpKQorICAgICAgICAgICAgcmV0 dXJuIHsgc3R5bGUubG9naWNhbEhlaWdodCgpLnZhbHVlKCksIHsgbWFyZ2luVG9wLCBtYXJnaW5C b3R0b20gfSB9OworCisgICAgICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlvdXRCb3gpIHx8ICFk b3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93Q2hpbGQoKSkKKyAgICAgICAg ICAgIHJldHVybiB7IDAsIHsgbWFyZ2luVG9wLCBtYXJnaW5Cb3R0b20gfSB9OwogCiAgICAgICAg IC8vIDEuIHRoZSBib3R0b20gZWRnZSBvZiB0aGUgbGFzdCBsaW5lIGJveCwgaWYgdGhlIGJveCBl c3RhYmxpc2hlcyBhIGlubGluZSBmb3JtYXR0aW5nIGNvbnRleHQgd2l0aCBvbmUgb3IgbW9yZSBs aW5lcwogICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQoKSkgewogICAgICAgICAgICAgLy8gaGVpZ2h0ID0gbGFzdExpbmVCb3goKS5ib3R0b20o KTsKLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIHsgMCwgeyBtYXJn aW5Ub3AsIG1hcmdpbkJvdHRvbSB9IH07CiAgICAgICAgIH0KIAogICAgICAgICAvLyAyLiB0aGUg Ym90dG9tIGVkZ2Ugb2YgdGhlIGJvdHRvbSAocG9zc2libHkgY29sbGFwc2VkKSBtYXJnaW4gb2Yg aXRzIGxhc3QgaW4tZmxvdyBjaGlsZCwgaWYgdGhlIGNoaWxkJ3MgYm90dG9tIG1hcmdpbi4uLgpA QCAtOTcsNyArMTAxLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRN YXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmkKICAgICAgICAgaWYgKCFN YXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50KCpsYXN0SW5G bG93Q2hpbGQpKSB7CiAgICAgICAgICAgICBhdXRvKiBsYXN0SW5GbG93RGlzcGxheUJveCA9IGxh eW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqbGFzdEluRmxvd0NoaWxkKTsKICAg ICAgICAgICAgIEFTU0VSVChsYXN0SW5GbG93RGlzcGxheUJveCk7Ci0gICAgICAgICAgICByZXR1 cm4gbGFzdEluRmxvd0Rpc3BsYXlCb3gtPmJvdHRvbSgpICsgbGFzdEluRmxvd0Rpc3BsYXlCb3gt Pm1hcmdpbkJvdHRvbSgpIC0gYm9yZGVyQW5kUGFkZGluZ1RvcDsKKyAgICAgICAgICAgIHJldHVy biB7IGxhc3RJbkZsb3dEaXNwbGF5Qm94LT5ib3R0b20oKSArIGxhc3RJbkZsb3dEaXNwbGF5Qm94 LT5tYXJnaW5Cb3R0b20oKSAtIGJvcmRlckFuZFBhZGRpbmdUb3AsIHsgbWFyZ2luVG9wLCBtYXJn aW5Cb3R0b20gfSB9OwogICAgICAgICB9CiAKICAgICAgICAgLy8gMy4gdGhlIGJvdHRvbSBib3Jk ZXIgZWRnZSBvZiB0aGUgbGFzdCBpbi1mbG93IGNoaWxkIHdob3NlIHRvcCBtYXJnaW4gZG9lc24n dCBjb2xsYXBzZSB3aXRoIHRoZSBlbGVtZW50J3MgYm90dG9tIG1hcmdpbgpAQCAtMTA3LDI5ICsx MTEsMjkgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJnaW4gQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmkKICAgICAgICAgaWYgKGluRmxvd0NoaWxk KSB7CiAgICAgICAgICAgICBhdXRvKiBpbkZsb3dEaXNwbGF5Qm94ID0gbGF5b3V0Q29udGV4dC5k aXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCppbkZsb3dDaGlsZCk7CiAgICAgICAgICAgICBBU1NFUlQo aW5GbG93RGlzcGxheUJveCk7Ci0gICAgICAgICAgICByZXR1cm4gaW5GbG93RGlzcGxheUJveC0+ dG9wKCkgKyBpbkZsb3dEaXNwbGF5Qm94LT5ib3JkZXJCb3goKS5oZWlnaHQoKSAtIGJvcmRlckFu ZFBhZGRpbmdUb3A7CisgICAgICAgICAgICByZXR1cm4geyBpbkZsb3dEaXNwbGF5Qm94LT50b3Ao KSArIGluRmxvd0Rpc3BsYXlCb3gtPmJvcmRlckJveCgpLmhlaWdodCgpIC0gYm9yZGVyQW5kUGFk ZGluZ1RvcCwgeyBtYXJnaW5Ub3AsIG1hcmdpbkJvdHRvbSB9IH07CiAgICAgICAgIH0KIAogICAg ICAgICAvLyA0LiB6ZXJvLCBvdGhlcndpc2UKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJl dHVybiB7IDAsIHsgbWFyZ2luVG9wLCBtYXJnaW5Cb3R0b20gfSB9OwogICAgIH07CiAKLSAgICBh dXRvIGhlaWdodCA9IGNvbXB1dGUoKTsKLSAgICBhdXRvIG1hcmdpblRvcCA9IE1hcmdpbkNvbGxh cHNlOjptYXJnaW5Ub3AobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKLSAgICBhdXRvIG1hcmdp bkJvdHRvbSA9ICBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQm90dG9tKGxheW91dENvbnRleHQsIGxh eW91dEJveCk7CisgICAgYXV0byBoZWlnaHRBbmRNYXJnaW4gPSBjb21wdXRlKCk7CisgICAgYXV0 byBjb2xsYXBzZWRNYXJnaW5Ub3AgPSBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVG9wKGxheW91dENv bnRleHQsIGxheW91dEJveCk7CisgICAgYXV0byBjb2xsYXBzZWRNYXJnaW5Cb3R0b20gPSAgTWFy Z2luQ29sbGFwc2U6Om1hcmdpbkJvdHRvbShsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogCiAg ICAgaWYgKCFpc1N0cmV0Y2hlZFRvVmlld3BvcnQobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KSkg ewotICAgICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVh bSA8PCAiW0hlaWdodF1bTWFyZ2luXSAtPiBpbmZsb3cgbm9uLXJlcGxhY2VkIC0+IGhlaWdodCgi IDw8IGhlaWdodCA8PCAicHgpIG1hcmdpbigiIDw8IG1hcmdpblRvcCA8PCAicHgsICIgPDwgbWFy Z2luQm90dG9tIDw8ICJweCkgLT4gbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwot ICAgICAgICByZXR1cm4geyBoZWlnaHQsIHsgbWFyZ2luVG9wLCBtYXJnaW5Cb3R0b20gfSB9Owor ICAgICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8 PCAiW0hlaWdodF1bTWFyZ2luXSAtPiBpbmZsb3cgbm9uLXJlcGxhY2VkIC0+IGhlaWdodCgiIDw8 IGhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPDwgInB4KSBtYXJnaW4oIiA8PCBjb2xsYXBzZWRNYXJn aW5Ub3AgPDwgInB4LCAiIDw8IGNvbGxhcHNlZE1hcmdpbkJvdHRvbSA8PCAicHgpIC0+IGxheW91 dEJveCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKKyAgICAgICAgcmV0dXJuIHsgaGVpZ2h0QW5k TWFyZ2luLmhlaWdodCwgeyBjb2xsYXBzZWRNYXJnaW5Ub3AsIGNvbGxhcHNlZE1hcmdpbkJvdHRv bSB9IH07CiAgICAgfQogCiAgICAgYXV0byBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0g bGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGluaXRpYWxDb250YWluaW5nQmxv Y2sobGF5b3V0Qm94KSktPmNvbnRlbnRCb3hIZWlnaHQoKTsKICAgICAvLyBTdHJldGNoIGJ1dCBu ZXZlciBvdmVyc3RyZXRjaCB3aXRoIHRoZSBtYXJnaW5zLgotICAgIGlmIChoZWlnaHQgKyBtYXJn aW5Ub3AgKyBtYXJnaW5Cb3R0b20gPCBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KQotICAg ICAgICBoZWlnaHQgPSBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gbWFyZ2luVG9wIC0g bWFyZ2luQm90dG9tOworICAgIGlmIChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0ICsgY29sbGFwc2Vk TWFyZ2luVG9wICsgY29sbGFwc2VkTWFyZ2luQm90dG9tIDwgaW5pdGlhbENvbnRhaW5pbmdCbG9j a0hlaWdodCkKKyAgICAgICAgaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCA9IGluaXRpYWxDb250YWlu aW5nQmxvY2tIZWlnaHQgLSBjb2xsYXBzZWRNYXJnaW5Ub3AgLSBjb2xsYXBzZWRNYXJnaW5Cb3R0 b207CiAKLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVh bSA8PCAiW0hlaWdodF1bTWFyZ2luXSAtPiBpbmZsb3cgbm9uLXJlcGxhY2VkIC0+IHN0cmVjaGVk IHRvIHZpZXdwb3J0IC0+IGhlaWdodCgiIDw8IGhlaWdodCA8PCAicHgpIG1hcmdpbigiIDw8IG1h cmdpblRvcCA8PCAicHgsICIgPDwgbWFyZ2luQm90dG9tIDw8ICJweCkgLT4gbGF5b3V0Qm94KCIg PDwgJmxheW91dEJveCA8PCAiKSIpOwotICAgIHJldHVybiB7IGhlaWdodCwgeyBtYXJnaW5Ub3As IG1hcmdpbkJvdHRvbSB9IH07CisgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0 TGF5b3V0LCBzdHJlYW0gPDwgIltIZWlnaHRdW01hcmdpbl0gLT4gaW5mbG93IG5vbi1yZXBsYWNl ZCAtPiBzdHJlY2hlZCB0byB2aWV3cG9ydCAtPiBoZWlnaHQoIiA8PCBoZWlnaHRBbmRNYXJnaW4u aGVpZ2h0IDw8ICJweCkgbWFyZ2luKCIgPDwgY29sbGFwc2VkTWFyZ2luVG9wIDw8ICJweCwgIiA8 PCBjb2xsYXBzZWRNYXJnaW5Cb3R0b20gPDwgInB4KSAtPiBsYXlvdXRCb3goIiA8PCAmbGF5b3V0 Qm94IDw8ICIpIik7CisgICAgcmV0dXJuIHsgaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCwgeyBjb2xs YXBzZWRNYXJnaW5Ub3AsIGNvbGxhcHNlZE1hcmdpbkJvdHRvbSB9IH07CiB9CiAKIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4 dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsCg==