184329 2018-04-05 07:42:15 -0700 [LayoutReloaded] Collect floating boxes in inline formatting context and layout them first. 2018-04-05 08:22:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1412039 0 zalan 2018-04-05 07:42:15 -0700 It is this simple. 1412040 1 337262 zalan 2018-04-05 07:46:21 -0700 Created attachment 337262 Patch 1412043 2 zalan 2018-04-05 08:21:22 -0700 Committed r230299: <https://trac.webkit.org/changeset/230299> 1412044 3 webkit-bug-importer 2018-04-05 08:22:23 -0700 <rdar://problem/39207688> 337262 2018-04-05 07:46:21 -0700 2018-04-05 07:46:21 -0700 Patch bug-184329-20180405074619.patch text/plain 7220 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTcxY2Q4MWY4ZjIwMzg2MzgxMTIwMzk1MjVhYWIyYjg2 MzY1YWNhYy4uMWNiNTllNjU3MDM0NGFhYzlhNjk1ZGEwNjQ4ZWIxNzViNDdlNDM3MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE4LTA0LTA1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBDb2xsZWN0IGZsb2F0aW5nIGJveGVzIGluIGlubGluZSBmb3Jt YXR0aW5nIGNvbnRleHQgYW5kIGxheW91dCB0aGVtIGZpcnN0LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MzI5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGV0J3MgZG8gdGhpcyBmb3Igbm93LiBUaGVy ZSBtaWdodCBiZSBzb21lIGNhc2VzIHdoZXJlIHRoaXMgdmlvbGF0ZXMgbGF5b3V0LgorCisgICAg ICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQu anM6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX291dE9mRmxvd0Rlc2Nl bmRhbnRzKToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKiBMYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmpzOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBl LmxheW91dCk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2hh bmRsZUZsb2F0aW5nQm94ZXMpOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJv dG90eXBlLl9oYW5kbGVGbG9hdGluZ0JveCk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5wcm90b3R5cGUuX2Zsb2F0aW5nQm94ZXMpOgorICAgICAgICAoSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbDoKKyAg ICAgICAgKiBMYXlvdXRSZWxvYWRlZC90ZXN0L211bHRpcGxlLWxlZnQtZmxvYXRzLW9uLWxpbmUt c2ltcGxlLmh0bWw6IEFkZGVkLgorCiAyMDE4LTA0LTAzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgZmxvYXRpbmcg dG8gSW5saW5lRm9ybWF0dGluZ0NvbnRleHQKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXggMjVi NzU1Njk3OTczNTMzYWZhZWQzZDUyYjU2YmZkZDYyYWQ5YjJlYS4uNGY1YzQ3NWJlOWZiNDMzOGNl N2YyZWUzMzY5NGUxM2Q0Y2M3MGU2MiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKQEAgLTE0OCw1 ICsxNDgsNCBAQCBjbGFzcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgIH0KICAgICAgICAg cmV0dXJuIG91dE9mRmxvd0JveGVzOwogICAgIH0KLQogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXggYmFjZDhm YTg4YTU3YTAzYmZmNmM4YTkzMTVhZTJlYmQ2YzliOGM0Ni4uODljMTQ3MTBiMjQ4MDM4ZmI0ZDdi ZDg2N2NlYTgwN2MxMDljYmI3NiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5q cworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0zNyw3ICszNywxMCBAQCBjbGFz cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAg ICAgICAgLy8gVGhpcyBpcyBhIHBvc3Qtb3JkZXIgdHJlZSB0cmF2ZXJzYWwgbGF5b3V0LgogICAg ICAgICAvLyBUaGUgcm9vdCBjb250YWluZXIgbGF5b3V0IGlzIGRvbmUgaW4gdGhlIGZvcm1hdHRp bmcgY29udGV4dCBpdCBsaXZlcyBpbiwgbm90IHRoYXQgb25lIGl0IGNyZWF0ZXMsIHNvIGxldCdz IHN0YXJ0IHdpdGggdGhlIGZpcnN0IGNoaWxkLgogICAgICAgICB0aGlzLm1fbGluZSA9IHRoaXMu X2NyZWF0ZU5ld0xpbmUoKTsKLSAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0aGlzLmZv cm1hdHRpbmdSb290KCkuZmlyc3RDaGlsZCgpKTsKKyAgICAgICAgLy8gQ29sbGVjdCBmbG9hdGlu ZyBib3hlcyBhbmQgbGF5b3V0IHRoZW0gZmlyc3QuCisgICAgICAgIHRoaXMuX2hhbmRsZUZsb2F0 aW5nQm94ZXMoKTsKKyAgICAgICAgLy8KKyAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0 aGlzLmZvcm1hdHRpbmdSb290KCkuZmlyc3RJbkZsb3dDaGlsZCgpKTsKICAgICAgICAgd2hpbGUg KHRoaXMuX2Rlc2NlbmRhbnROZWVkc0xheW91dCgpKSB7CiAgICAgICAgICAgICAvLyBUcmF2ZXJz IGRvd24gb24gdGhlIGRlc2NlbmRhbnRzIHVudGlsIHdlIGZpbmQgYSBsZWFmIG5vZGUuCiAgICAg ICAgICAgICB3aGlsZSAodHJ1ZSkgewpAQCAtNDgsMTggKzUxLDE2IEBAIGNsYXNzIElubGluZUZv cm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICBpZiAoIWxheW91dEJveC5pc0NvbnRhaW5lcigpIHx8ICFs YXlvdXRCb3guaGFzQ2hpbGQoKSkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShsYXlvdXRCb3guZmlyc3RDaGlsZCgpKTsK KyAgICAgICAgICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveC5maXJzdElu Rmxvd0NoaWxkKCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgd2hpbGUgKHRoaXMuX2Rl c2NlbmRhbnROZWVkc0xheW91dCgpKSB7CiAgICAgICAgICAgICAgICAgbGV0IGxheW91dEJveCA9 IHRoaXMuX25leHRJbkxheW91dFF1ZXVlKCk7CiAgICAgICAgICAgICAgICAgaWYgKGxheW91dEJv eCBpbnN0YW5jZW9mIExheW91dC5JbmxpbmVCb3gpCiAgICAgICAgICAgICAgICAgICAgIHRoaXMu X2hhbmRsZUlubGluZUJveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKGxh eW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgICAgICB0aGlz Ll9oYW5kbGVGbG9hdGluZ0JveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIC8vIFdlIGFy ZSBkb25lIHdpdGggbGF5aW5nIG91dCB0aGlzIGJveC4KICAgICAgICAgICAgICAgICB0aGlzLl9y ZW1vdmVGcm9tTGF5b3V0UXVldWUobGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94Lm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9M YXlvdXRRdWV1ZShsYXlvdXRCb3gubmV4dFNpYmxpbmcoKSk7CisgICAgICAgICAgICAgICAgaWYg KGxheW91dEJveC5uZXh0SW5GbG93U2libGluZygpKSB7CisgICAgICAgICAgICAgICAgICAgIHRo aXMuX2FkZFRvTGF5b3V0UXVldWUobGF5b3V0Qm94Lm5leHRJbkZsb3dTaWJsaW5nKCkpOwogICAg ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 CkBAIC04OCw3ICs4OSwxNyBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRz IEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgfQogICAgIH0KIAorICAgIF9oYW5kbGVGbG9h dGluZ0JveGVzKCkgeworICAgICAgICBsZXQgZmxvYXRpbmdCb3hlcyA9IHRoaXMuX2Zsb2F0aW5n Qm94ZXMoKTsKKyAgICAgICAgZm9yIChsZXQgZmxvYXRpbmdCb3ggb2YgZmxvYXRpbmdCb3hlcykg eworICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShmbG9hdGluZ0JveCk7CisgICAg ICAgICAgICB0aGlzLl9oYW5kbGVGbG9hdGluZ0JveChmbG9hdGluZ0JveCk7CisgICAgICAgICAg ICB0aGlzLl9yZW1vdmVGcm9tTGF5b3V0UXVldWUoZmxvYXRpbmdCb3gpOworICAgICAgICB9Cisg ICAgfQorCiAgICAgX2hhbmRsZUZsb2F0aW5nQm94KGZsb2F0aW5nQm94KSB7CisgICAgICAgIHRo aXMubGF5b3V0U3RhdGUoKS5sYXlvdXQoZmxvYXRpbmdCb3gpOwogICAgICAgICB0aGlzLl9jb21w dXRlRmxvYXRpbmdXaWR0aChmbG9hdGluZ0JveCk7CiAgICAgICAgIHRoaXMuX2NvbXB1dGVGbG9h dGluZ0hlaWdodChmbG9hdGluZ0JveCk7CiAgICAgICAgIHRoaXMuZmxvYXRpbmdDb250ZXh0KCku Y29tcHV0ZVBvc2l0aW9uKGZsb2F0aW5nQm94KTsKQEAgLTE0MSw1ICsxNTIsMzMgQEAgY2xhc3Mg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAg ICAgICAgICByZXR1cm4gcm9vdC5jb250ZW50Qm94KCkubGVmdCgpOwogICAgICAgICByZXR1cm4g dmVydGljYWxQb3NpdGlvbiAtIHJvb3RMZWZ0OwogICAgICB9CisKKyAgICBfZmxvYXRpbmdCb3hl cygpIHsKKyAgICAgICAgQVNTRVJUKHRoaXMuZm9ybWF0dGluZ1Jvb3QoKS5maXJzdENoaWxkKCkp OworICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBoaWdobHkgaW5lZmZpY2llbnQgYnV0IHdpbGwg ZG8gZm9yIG5vdy4KKyAgICAgICAgbGV0IGZsb2F0aW5nQm94ZXMgPSBuZXcgQXJyYXkoKTsKKyAg ICAgICAgbGV0IHN0YWNrID0gbmV3IEFycmF5KCk7CisgICAgICAgIHN0YWNrLnB1c2godGhpcy5m b3JtYXR0aW5nUm9vdCgpLmZpcnN0Q2hpbGQoKSk7CisgICAgICAgIHdoaWxlIChzdGFjay5sZW5n dGgpIHsKKyAgICAgICAgICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgICAgICAgICAgbGV0IGJv eCA9IHN0YWNrW3N0YWNrLmxlbmd0aCAtIDFdOworICAgICAgICAgICAgICAgIGlmIChib3guaXNG bG9hdGluZ1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgICAgICAgICAgICAgZmxvYXRpbmdCb3hlcy5w dXNoKGJveCk7CisgICAgICAgICAgICAgICAgaWYgKGJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdD b250ZXh0KCkpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGlm ICghYm94LmlzQ29udGFpbmVyKCkgfHwgIWJveC5oYXNDaGlsZCgpKQorICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBzdGFjay5wdXNoKGJveC5maXJzdENoaWxkKCkp OworICAgICAgICAgICAgfQorICAgICAgICAgICAgd2hpbGUgKHN0YWNrLmxlbmd0aCkgeworICAg ICAgICAgICAgICAgIGxldCBib3ggPSBzdGFjay5wb3AoKTsKKyAgICAgICAgICAgICAgICBpZiAo Ym94Lm5leHRTaWJsaW5nKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgc3RhY2sucHVzaChib3gu bmV4dFNpYmxpbmcoKSk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZmxvYXRpbmdC b3hlczsKKyAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3Qv aW5kZXguaHRtbCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbAppbmRleCAy OTJhMTZjNzczNDYxMDE1YWVlNjE5YzFhYWUxNDNiNmVlMTRhZjRkLi4zMjc5YjFhMjAwOGEyYzg4 ZTlhM2JlYzQxZmZiZDVlMmNjZDRlYzY2IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC90ZXN0L2luZGV4Lmh0bWwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmRleC5o dG1sCkBAIC02Nyw3ICs2Nyw4IEBAIGxldCB0ZXN0RmlsZXMgPSBbCiAgICAgImlubGluZS1mb3Jt YXR0aW5nLWNvbnRleHQtd2l0aC1mbG9hdHMuaHRtbCIsCiAgICAgImlubGluZS13aXRoLWZsb2F0 cy1yaWdodC1sZWZ0LXNpbXBsZS5odG1sIiwKICAgICAiaW5saW5lLWZvcm1hdHRpbmctY29udGV4 dC13aXRoLWZsb2F0czIuaHRtbCIsCi0gICAgImZsb2F0LWlzLWluc2lkZS1pbmxpbmUtZm9ybWF0 dGluZy1jb250ZXh0LXNpbXBsZS5odG1sIgorICAgICJmbG9hdC1pcy1pbnNpZGUtaW5saW5lLWZv cm1hdHRpbmctY29udGV4dC1zaW1wbGUuaHRtbCIsCisgICAgIm11bHRpcGxlLWxlZnQtZmxvYXRz LW9uLWxpbmUtc2ltcGxlLmh0bWwiCiBdOwogCiBsZXQgZGVidWdUaGlzID0gW107CmRpZmYgLS1n aXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L211bHRpcGxlLWxlZnQtZmxvYXRzLW9uLWxp bmUtc2ltcGxlLmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L211bHRpcGxlLWxlZnQt ZmxvYXRzLW9uLWxpbmUtc2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWY4ODg1ZjgwZTRkMTYzY2Nk YzYwZjUxZDNlZmFiMTNkYzkxNmU2NAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL0xheW91dFJl bG9hZGVkL3Rlc3QvbXVsdGlwbGUtbGVmdC1mbG9hdHMtb24tbGluZS1zaW1wbGUuaHRtbApAQCAt MCwwICsxLDYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxkaXY+PGRpdiBz dHlsZT0iZmxvYXQ6IGxlZnQ7IHdpZHRoOiAxMHB4OyBoZWlnaHQ6IDEwcHg7Ij48L2Rpdj5mb29i YXIgZm9vYmFyPGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQ7IHdpZHRoOiAxMHB4OyBoZWlnaHQ6IDEw cHg7Ij48L2Rpdj48ZGl2IHN0eWxlPSJmbG9hdDogbGVmdDsgd2lkdGg6IDEwcHg7IGhlaWdodDog MTBweDsiPjwvZGl2PjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=