189143 2018-08-29 20:29:32 -0700 [LFC][Floating] Use non-computed horizontal margins when intersecting floats with float avoiders. 2018-08-30 07:29: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 1455132 0 zalan 2018-08-29 20:29:32 -0700 ssia. 1455151 1 348483 zalan 2018-08-29 21:18:37 -0700 Created attachment 348483 Patch 1455211 2 zalan 2018-08-30 07:29:01 -0700 Committed r235502: <https://trac.webkit.org/changeset/235502> 1455212 3 webkit-bug-importer 2018-08-30 07:29:15 -0700 <rdar://problem/43884952> 348483 2018-08-29 21:18:37 -0700 2018-08-30 06:43:35 -0700 Patch Patch.txt text/plain 7010 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZDNlYTQ0ZTI3MS4uZTZmODZjNzI4N2QgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxOC0wOC0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0Zsb2F0aW5nXSBVc2Ugbm9uLWNvbXB1dGVkIGhvcml6b250YWwgbWFy Z2lucyB3aGVuIGludGVyc2VjdGluZyBmbG9hdHMgd2l0aCBmbG9hdCBhdm9pZGVycy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE0MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L1Zlcmlm aWNhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dENvbnRleHQ6OnZl cmlmeUFuZE91dHB1dE1pc21hdGNoaW5nTGF5b3V0VHJlZSBjb25zdCk6CisgICAgICAgICogbGF5 b3V0L2Zsb2F0cy9GbG9hdEF2b2lkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG bG9hdEF2b2lkZXI6OnNldEhvcml6b250YWxDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkZsb2F0QXZvaWRlcjo6aW5pdGlhbEhvcml6b250YWxQb3NpdGlvbiBjb25zdCk6 CisgICAgICAgICogbGF5b3V0L2Zsb2F0cy9GbG9hdEF2b2lkZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6RmxvYXRBdm9pZGVyOjptYXJnaW5Ub3AgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpGbG9hdEF2b2lkZXI6Om1hcmdpbkJvdHRvbSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0QXZvaWRlcjo6bWFyZ2luTGVmdCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0QXZvaWRlcjo6bWFyZ2luUmlnaHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdEF2b2lkZXI6Om1hcmdpbkJveFdpZHRoIGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0Qm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6RmxvYXRCb3g6OnJlY3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGbG9hdEJveDo6aG9yaXpvbnRhbFBvc2l0aW9uQ2FuZGlkYXRlKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6RmxvYXRCb3g6OnZlcnRpY2FsUG9zaXRpb25DYW5kaWRhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdEJveDo6aW5pdGlhbFZlcnRpY2FsUG9zaXRp b24gY29uc3QpOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRCb3guaDoKKwogMjAxOC0w OC0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW01h cmdpbnNdIEFkZCBub24tY29tcHV0ZWQgaG9yaXpvbnRhbCBtYXJnaW5zIHRvIERpc3BsYXlCb3gK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmNwcAppbmRleCAz Zjc5ZGY3OTBiZC4uYWY1MmQzNDQ2ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0QXZvaWRlci5jcHAKQEAgLTYxLDEwICs2MSw5IEBAIHZvaWQgRmxvYXRBdm9pZGVy OjpzZXRIb3Jpem9udGFsQ29uc3RyYWludHMoSG9yaXpvbnRhbENvbnN0cmFpbnRzIGhvcml6b250 YWxDb25zCiAgICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQgPSBtX2Nv bnRhaW5pbmdCbG9ja0Fic29sdXRlRGlzcGxheUJveC5sZWZ0KCkgKyBtX2NvbnRhaW5pbmdCbG9j a0Fic29sdXRlRGlzcGxheUJveC5jb250ZW50Qm94TGVmdCgpOwogICAgICAgICBhdXRvIGNvbnRh aW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCA9IGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hMZWZ0 ICsgbV9jb250YWluaW5nQmxvY2tBYnNvbHV0ZURpc3BsYXlCb3guY29udGVudEJveFdpZHRoKCk7 CiAgICAgICAgIC8vIEFsaWduIGl0IHdpdGggdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBsZWZ0IGVk Z2UgZmlyc3QuCi0gICAgICAgIGxlZnQgPSBzdGQ6Om1heChjb250YWluaW5nQmxvY2tDb250ZW50 Qm94TGVmdCArIG1fYWJzb2x1dGVEaXNwbGF5Qm94Lm1hcmdpbkxlZnQoKSwgbGVmdCk7CisgICAg ICAgIGxlZnQgPSBzdGQ6Om1heChjb250YWluaW5nQmxvY2tDb250ZW50Qm94TGVmdCArIG1hcmdp bkxlZnQoKSwgbGVmdCk7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSBpdCBkb2VzIG5vdCBvdmVyZmxv dyB0aGUgY29udGFpbmluZyBibG9jayBvbiB0aGUgcmlnaHQuCi0gICAgICAgIGF1dG8gbWFyZ2lu Qm94U2l6ZSA9IG1fYWJzb2x1dGVEaXNwbGF5Qm94Lm1hcmdpbkJveCgpLndpZHRoKCk7Ci0gICAg ICAgIGxlZnQgPSBzdGQ6Om1pbihsZWZ0LCBjb250YWluaW5nQmxvY2tDb250ZW50Qm94UmlnaHQg LSBtYXJnaW5Cb3hTaXplICsgbV9hYnNvbHV0ZURpc3BsYXlCb3gubWFyZ2luTGVmdCgpKTsKKyAg ICAgICAgbGVmdCA9IHN0ZDo6bWluKGxlZnQsIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdo dCAtIG1hcmdpbkJveFdpZHRoKCkgKyBtYXJnaW5MZWZ0KCkpOwogCiAgICAgICAgIHJldHVybiBs ZWZ0OwogICAgIH07CkBAIC05OSw4ICs5OCw4IEBAIFBvc2l0aW9uSW5Db250ZXh0Um9vdCBGbG9h dEF2b2lkZXI6OmluaXRpYWxIb3Jpem9udGFsUG9zaXRpb24oKSBjb25zdAogICAgIGF1dG8gY29u dGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQgPSBtX2NvbnRhaW5pbmdCbG9ja0Fic29sdXRlRGlz cGxheUJveC5sZWZ0KCkgKyBtX2NvbnRhaW5pbmdCbG9ja0Fic29sdXRlRGlzcGxheUJveC5jb250 ZW50Qm94TGVmdCgpOwogICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveFJpZ2h0ID0g Y29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQgKyBtX2NvbnRhaW5pbmdCbG9ja0Fic29sdXRl RGlzcGxheUJveC5jb250ZW50Qm94V2lkdGgoKTsKIAotICAgIGF1dG8gbGVmdCA9IGlzTGVmdEFs aWduZWQoKSA/IGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hMZWZ0IDogY29udGFpbmluZ0Jsb2Nr Q29udGVudEJveFJpZ2h0IC0gbV9hYnNvbHV0ZURpc3BsYXlCb3gubWFyZ2luQm94KCkud2lkdGgo KTsKLSAgICBsZWZ0ICs9IG1fYWJzb2x1dGVEaXNwbGF5Qm94Lm1hcmdpbkxlZnQoKTsKKyAgICBh dXRvIGxlZnQgPSBpc0xlZnRBbGlnbmVkKCkgPyBjb250YWluaW5nQmxvY2tDb250ZW50Qm94TGVm dCA6IGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCAtIG1hcmdpbkJveFdpZHRoKCk7Cisg ICAgbGVmdCArPSBtYXJnaW5MZWZ0KCk7CiAKICAgICByZXR1cm4gbGVmdDsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRBdm9pZGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5oCmluZGV4IDU1NTYyZWEwMDE0Li5j ZTkxZDljOTFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9h dEF2b2lkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRl ci5oCkBAIC02OCw2ICs2OCwxMyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBQb3NpdGlvbklu Q29udGV4dFJvb3QgaG9yaXpvbnRhbFBvc2l0aW9uQ2FuZGlkYXRlKEhvcml6b250YWxDb25zdHJh aW50cyk7CiAgICAgdmlydHVhbCBQb3NpdGlvbkluQ29udGV4dFJvb3QgdmVydGljYWxQb3NpdGlv bkNhbmRpZGF0ZShQb3NpdGlvbkluQ29udGV4dFJvb3QpOwogCisgICAgTGF5b3V0VW5pdCBtYXJn aW5Ub3AoKSBjb25zdCB7IHJldHVybiBkaXNwbGF5Qm94KCkubWFyZ2luVG9wKCk7IH0KKyAgICBM YXlvdXRVbml0IG1hcmdpbkJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIGRpc3BsYXlCb3goKS5tYXJn aW5Cb3R0b20oKTsgfQorICAgIExheW91dFVuaXQgbWFyZ2luTGVmdCgpIGNvbnN0IHsgcmV0dXJu IGRpc3BsYXlCb3goKS5ub25Db21wdXRlZE1hcmdpbkxlZnQoKTsgfQorICAgIExheW91dFVuaXQg bWFyZ2luUmlnaHQoKSBjb25zdCB7IHJldHVybiBkaXNwbGF5Qm94KCkubm9uQ29tcHV0ZWRNYXJn aW5SaWdodCgpOyB9CisKKyAgICBMYXlvdXRVbml0IG1hcmdpbkJveFdpZHRoKCkgY29uc3QgeyBy ZXR1cm4gbWFyZ2luTGVmdCgpICsgZGlzcGxheUJveCgpLndpZHRoKCkgKyBtYXJnaW5SaWdodCgp OyB9CisKICAgICBjb25zdCBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlKCkgY29uc3QgeyBy ZXR1cm4gbV9mbG9hdGluZ1N0YXRlOyB9CiAgICAgY29uc3QgQm94JiBsYXlvdXRCb3goKSBjb25z dCB7IHJldHVybiAqbV9sYXlvdXRCb3g7IH0KICAgICBjb25zdCBEaXNwbGF5OjpCb3gmIGRpc3Bs YXlCb3goKSBjb25zdCB7IHJldHVybiBtX2Fic29sdXRlRGlzcGxheUJveDsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdEJveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0Qm94LmNwcAppbmRleCAyOTA3MzZmYThmZi4uMjdhYjM0 MThhNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRCb3guY3BwCkBAIC00 MCwyNyArNDAsMzMgQEAgRmxvYXRCb3g6OkZsb2F0Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBj b25zdCBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlLCBjb24KIHsKIH0KIAorRGlzcGxheTo6 Qm94OjpSZWN0IEZsb2F0Qm94OjpyZWN0KCkgY29uc3QKK3sKKyAgICBhdXRvIHJlY3QgPSBkaXNw bGF5Qm94KCkucmVjdCgpOworICAgIHJldHVybiB7IHJlY3QudG9wKCkgLSBtYXJnaW5Ub3AoKSwg cmVjdC5sZWZ0KCkgLSBtYXJnaW5MZWZ0KCksIG1hcmdpbkxlZnQoKSArIHJlY3Qud2lkdGgoKSAr IG1hcmdpblJpZ2h0KCksIG1hcmdpblRvcCgpICsgcmVjdC5oZWlnaHQoKSArIG1hcmdpbkJvdHRv bSgpIH07Cit9CisKIFBvc2l0aW9uSW5Db250ZXh0Um9vdCBGbG9hdEJveDo6aG9yaXpvbnRhbFBv c2l0aW9uQ2FuZGlkYXRlKEhvcml6b250YWxDb25zdHJhaW50cyBob3Jpem9udGFsQ29uc3RyYWlu dHMpCiB7CiAgICAgYXV0byBwb3NpdGlvbkNhbmRpZGF0ZSA9IGlzTGVmdEFsaWduZWQoKSA/ICpo b3Jpem9udGFsQ29uc3RyYWludHMubGVmdCA6ICpob3Jpem9udGFsQ29uc3RyYWludHMucmlnaHQg LSByZWN0KCkud2lkdGgoKTsKLSAgICBwb3NpdGlvbkNhbmRpZGF0ZSArPSBkaXNwbGF5Qm94KCku bWFyZ2luTGVmdCgpOworICAgIHBvc2l0aW9uQ2FuZGlkYXRlICs9IG1hcmdpbkxlZnQoKTsKIAog ICAgIHJldHVybiBwb3NpdGlvbkNhbmRpZGF0ZTsKIH0KIAogUG9zaXRpb25JbkNvbnRleHRSb290 IEZsb2F0Qm94Ojp2ZXJ0aWNhbFBvc2l0aW9uQ2FuZGlkYXRlKFBvc2l0aW9uSW5Db250ZXh0Um9v dCB2ZXJ0aWNhbENvbnN0cmFpbnQpCiB7Ci0gICAgcmV0dXJuIHZlcnRpY2FsQ29uc3RyYWludCAr IGRpc3BsYXlCb3goKS5tYXJnaW5Ub3AoKTsKKyAgICByZXR1cm4gdmVydGljYWxDb25zdHJhaW50 ICsgbWFyZ2luVG9wKCk7CiB9CiAKIFBvc2l0aW9uSW5Db250ZXh0Um9vdCBGbG9hdEJveDo6aW5p dGlhbFZlcnRpY2FsUG9zaXRpb24oKSBjb25zdAogewogICAgIC8vIEluY29taW5nIGZsb2F0IGNh bm5vdCBiZSBwbGFjZWQgaGlnaGVyIHRoYW4gZXhpc3RpbmcgZmxvYXRzIChtYXJnaW4gYm94IG9m IHRoZSBsYXN0IGZsb2F0KS4KICAgICAvLyBUYWtlIHRoZSBzdGF0aWMgcG9zaXRpb24gKHdoZXJl IHRoZSBib3ggd291bGQgZ28gaWYgaXQgd2Fzbid0IGZsb2F0aW5nKSBhbmQgYWRqdXN0IGl0IHdp dGggdGhlIGxhc3QgZmxvYXQuCi0gICAgYXV0byB0b3AgPSBGbG9hdEF2b2lkZXI6OmluaXRpYWxW ZXJ0aWNhbFBvc2l0aW9uKCkgLSBkaXNwbGF5Qm94KCkubWFyZ2luVG9wKCk7CisgICAgYXV0byB0 b3AgPSBGbG9hdEF2b2lkZXI6OmluaXRpYWxWZXJ0aWNhbFBvc2l0aW9uKCkgLSBtYXJnaW5Ub3Ao KTsKICAgICBpZiAoYXV0byBsYXN0RmxvYXQgPSBmbG9hdGluZ1N0YXRlKCkubGFzdCgpKQogICAg ICAgICB0b3AgPSBzdGQ6Om1heCh0b3AsIGxhc3RGbG9hdC0+cmVjdFdpdGhNYXJnaW4oKS50b3Ao KSk7Ci0gICAgdG9wICs9IGRpc3BsYXlCb3goKS5tYXJnaW5Ub3AoKTsKKyAgICB0b3AgKz0gbWFy Z2luVG9wKCk7CiAKICAgICByZXR1cm4gdG9wOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdEJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0 cy9GbG9hdEJveC5oCmluZGV4IGVkN2VkYWUyNDU0Li4zMmZiM2MyMDE4YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdEJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mbG9hdHMvRmxvYXRCb3guaApAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBGbG9h dEJveCA6IHB1YmxpYyBGbG9hdEF2b2lkZXIgewogcHVibGljOgogICAgIEZsb2F0Qm94KGNvbnN0 IEJveCYsIGNvbnN0IEZsb2F0aW5nU3RhdGUmLCBjb25zdCBMYXlvdXRDb250ZXh0Jik7CiAKLSAg ICBEaXNwbGF5OjpCb3g6OlJlY3QgcmVjdCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGRpc3BsYXlC b3goKS5yZWN0V2l0aE1hcmdpbigpOyB9CisgICAgRGlzcGxheTo6Qm94OjpSZWN0IHJlY3QoKSBj b25zdCBmaW5hbDsKIAogcHJpdmF0ZToKICAgICBib29sIGlzTGVmdEFsaWduZWQoKSBjb25zdCBm aW5hbCB7IHJldHVybiBsYXlvdXRCb3goKS5pc0xlZnRGbG9hdGluZ1Bvc2l0aW9uZWQoKTsgfQo=