221295 2021-02-02 14:22:21 -0800 [LFC][IFC] Use the overflowing run to decide if the unbreakable content should stay on the current line 2021-02-03 06:29:14 -0800 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 1724887 0 zalan 2021-02-02 14:22:21 -0800 ssia 1724894 1 419067 zalan 2021-02-02 14:29:49 -0800 Created attachment 419067 Patch 1725112 2 ews-feeder 2021-02-03 06:28:23 -0800 Committed r272310: <https://trac.webkit.org/changeset/272310> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419067. 1725113 3 webkit-bug-importer 2021-02-03 06:29:14 -0800 <rdar://problem/73929650> 419067 2021-02-02 14:29:49 -0800 2021-02-03 06:28:24 -0800 Patch bug-221295-20210202142948.patch text/plain 5972 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkwMTQ3OGU0NjRjZDIw ODA0YjZlYTcyN2ZhYzU1NzM5ZjYwNjJmYi4uYzYxNjdlNzhjODg2MDNkMzBjNmVkNjcxNGRlMmJl MTc0NDc3YmY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgdGhl IG92ZXJmbG93aW5nIHJ1biB0byBkZWNpZGUgaWYgdGhlIHVuYnJlYWthYmxlIGNvbnRlbnQgc2hv dWxkIHN0YXkgb24gdGhlIGN1cnJlbnQgbGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhbiB1bmJyZWFrYWJsZSBzZXQgb2YgcnVucyBvdmVy ZmxvdyB0aGUgYXZhaWxhYmxlIHNwYWNlLCB3ZSBuZWVkIHRvIGNoZWNrIGlmIHRoZSBjb250ZW50 IGlzIGFsbG93ZWQgdG8gZ2V0IHdyYXBwZWQgdG8gdGhlIG5leHQgbGluZS4KKyAgICAgICAgTGV0 J3MgdXNlIHRoZSBfb3ZlcmZsb3dpbmdfIHJ1bidzIHN0eWxlIHRvIGRlY2lkZWQgaWYgdGhlIGNv bnRlbnQgc3RheXMgb24gdGhlIGxpbmUgKGUuZy4gd2hpdGUtc3BhY2U6IG5vd3JhcCkKKyAgICAg ICAgZS5nLiA8c3Bhbj48bm93cmFwPnRoaXNfY29udGVudF9zaG91bGRfbm90X3dyYXBwZWQ8L25v d3JhcD50aGlzX292ZXJmbG93czwvc3Bhbj4KKyAgICAgICAgXl4gaW4gdGhpcyBjYXNlIHRoZSBv dmVyZmxvd2luZyBydW4ncyBzdHlsZSBhbGxvd3Mgd3JhcHBpbmcgc28gd2Ugd3JhcCBlbnRpcmUg Y29udGVudCAoc2VlIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0 L292ZXJmbG93LXdyYXAvb3ZlcmZsb3ctd3JhcC1icmVhay13b3JkLXdoaXRlLXNwYWNlLWNyYXNo LTAwMi5odG1sKQorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29u dGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50 QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudCBjb25zdCk6CisKIDIwMjEtMDItMDIg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERp c2FibGUgaW5saW5lIGJveCBjb250ZW50IHdpdGggYm9yZGVyIGltYWdlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFr ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29u dGVudEJyZWFrZXIuY3BwCmluZGV4IGJhZjJhNzIyYzU1YWVjNjEzYWRmZmFhZWYxMDcyZGQ4Zjg0 MTI3MWUuLjE4MWU1MzA1YWY3ZmU2NWQxZjkzZmIyMjVlNTcxNGRhNmJlZjc5YjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRC cmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTIwMiw2ICsyMDIsNyBAQCBJbmxpbmVDb250ZW50 QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdD b250ZW50KGNvbgogICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCB9OwogICAg IH0KIAorICAgIHNpemVfdCBvdmVyZmxvd2luZ1J1bkluZGV4ID0gMDsKICAgICBpZiAoaXNUZXh0 Q29udGVudChjb250aW51b3VzQ29udGVudCkpIHsKICAgICAgICAgYXV0byB0cnlCcmVha2luZ1Rl eHRDb250ZW50ID0gWyZdKCkgLT4gT3B0aW9uYWw8UmVzdWx0PiB7CiAgICAgICAgICAgICAvLyAx LiBUaGlzIHRleHQgY29udGVudCBpcyBub3QgYnJlYWthYmxlLgpAQCAtMjA5LDYgKzIxMCw3IEBA IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nl c3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgICAgICAvLyAzLiBXZSBjYW4gYnJlYWsg dGhlIGNvbnRlbnQgYnV0IGl0IHN0aWxsIG92ZXJmbG93cy4KICAgICAgICAgICAgIC8vIDQuIE1h bmFnZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYmVmb3JlIHRoZSBvdmVyZmxvdyBwb2ludC4KICAg ICAgICAgICAgIGF1dG8gb3ZlcmZsb3dpbmdDb250ZW50ID0gcHJvY2Vzc092ZXJmbG93aW5nVGV4 dENvbnRlbnQoY29udGludW91c0NvbnRlbnQsIGxpbmVTdGF0dXMpOworICAgICAgICAgICAgb3Zl cmZsb3dpbmdSdW5JbmRleCA9IG92ZXJmbG93aW5nQ29udGVudC5ydW5JbmRleDsKICAgICAgICAg ICAgIGlmICghb3ZlcmZsb3dpbmdDb250ZW50LmJyZWFraW5nUG9zaXRpb24pCiAgICAgICAgICAg ICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgICAgIGF1dG8gdHJhaWxpbmdDb250ZW50ID0gb3Zl cmZsb3dpbmdDb250ZW50LmJyZWFraW5nUG9zaXRpb24tPnRyYWlsaW5nQ29udGVudDsKQEAgLTIz Niw2ICsyMzgsMTUgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50 QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgfTsKICAgICAg ICAgaWYgKGF1dG8gcmVzdWx0ID0gdHJ5QnJlYWtpbmdUZXh0Q29udGVudCgpKQogICAgICAgICAg ICAgcmV0dXJuICpyZXN1bHQ7CisgICAgfSBlbHNlIGlmIChjb250aW51b3VzQ29udGVudC5ydW5z KCkuc2l6ZSgpID4gMSkgeworICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIHZhcmlv dXMgY29udGVudC4KKyAgICAgICAgYXV0byYgcnVucyA9IGNvbnRpbnVvdXNDb250ZW50LnJ1bnMo KTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBydW5zLnNpemUoKTsgKytpKSB7Cisg ICAgICAgICAgICBpZiAocnVuc1tpXS5pbmxpbmVJdGVtLmlzQm94KCkpIHsKKyAgICAgICAgICAg ICAgICBvdmVyZmxvd2luZ1J1bkluZGV4ID0gaTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIElmIHdlIGFyZSBub3QgYWxs b3dlZCB0byBicmVhayB0aGlzIG92ZXJmbG93aW5nIGNvbnRlbnQsIHdlIHN0aWxsIG5lZWQgdG8g ZGVjaWRlIHdoZXRoZXIga2VlcCBpdCBvciB3cmFwIGl0IHRvIHRoZSBuZXh0IGxpbmUuCkBAIC0y NDQsMzMgKzI1NSwxNiBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRl bnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogICAgICAgICByZXR1cm4g eyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07CiAgICAgfQogICAgIC8v IE5vdyBlaXRoZXIgd3JhcCB0aGlzIGNvbnRlbnQgb3ZlciB0byB0aGUgbmV4dCBsaW5lIG9yIHJl dmVydCBiYWNrIHRvIGFuIGVhcmxpZXIgd3JhcHBpbmcgb3Bwb3J0dW5pdHksIG9yIG5vdCB3cmFw IGF0IGFsbC4KLSAgICBhdXRvIHNob3VsZFdyYXBUaGlzQ29udGVudFRvTmV4dExpbmUgPSBbJl0g eworICAgIGF1dG8gc2hvdWxkV3JhcFVuYnJlYWthYmxlQ29udGVudFRvTmV4dExpbmUgPSBbJl0g eworICAgICAgICBhdXRvIG92ZXJmbG93aW5nSW5saW5lSXRlbSA9IGNvbnRpbnVvdXNDb250ZW50 LnJ1bnMoKVtvdmVyZmxvd2luZ1J1bkluZGV4XS5pbmxpbmVJdGVtOworICAgICAgICBhdXRvJiBz dHlsZVRvVXNlID0gb3ZlcmZsb3dpbmdJbmxpbmVJdGVtLmlzQm94KCkgPyBvdmVyZmxvd2luZ0lu bGluZUl0ZW0ubGF5b3V0Qm94KCkucGFyZW50KCkuc3R5bGUoKSA6IG92ZXJmbG93aW5nSW5saW5l SXRlbS5sYXlvdXRCb3goKS5zdHlsZSgpOyAKICAgICAgICAgLy8gVGhlIGluZGl2aWR1YWwgcnVu cyBpbiB0aGlzIGNvbnRpbnVvdXMgY29udGVudCBkb24ndCBicmVhaywgbGV0J3MgY2hlY2sgaWYg d2UgYXJlIGFsbG93ZWQgdG8gd3JhcCB0aGlzIGNvbnRlbnQgdG8gbmV4dCBsaW5lIChlLmcuIHBy ZSB3b3VsZCBwcmV2ZW50IHVzIGZyb20gd3JhcHBpbmcpLgotICAgICAgICBhdXRvJiBydW5zID0g Y29udGludW91c0NvbnRlbnQucnVucygpOwotICAgICAgICBhdXRvJiBsYXN0SW5saW5lSXRlbSA9 IHJ1bnMubGFzdCgpLmlubGluZUl0ZW07CiAgICAgICAgIC8vIFBhcmVudCBzdHlsZSBkcml2ZXMg dGhlIHdyYXBwaW5nIGJlaGF2aW9yIGhlcmUuCiAgICAgICAgIC8vIGUuZy4gPGRpdiBzdHlsZT0i d2hpdGUtc3BhY2U6IG5vd3JhcCI+c29tZSB0ZXh0PGRpdiBzdHlsZT0iZGlzcGxheTogaW5saW5l LWJsb2NrOyB3aGl0ZS1zcGFjZTogcHJlLXdyYXAiPjwvZGl2PjwvZGl2Pi4KICAgICAgICAgLy8g V2hpbGUgdGhlIGlubGluZS1ibG9jayBoYXMgcHJlLXdyYXAgd2hpY2ggYWxsb3dzIHdyYXBwaW5n LCB0aGUgY29udGVudCBsaXZlcyBpbiBhIG5vd3JhcCBjb250ZXh0LgotICAgICAgICBpZiAobGFz dElubGluZUl0ZW0uaXNCb3goKSB8fCBsYXN0SW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkg fHwgbGFzdElubGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSkKLSAgICAgICAgICAgIHJldHVybiBp c1dyYXBwaW5nQWxsb3dlZChsYXN0SW5saW5lSXRlbS5sYXlvdXRCb3goKS5wYXJlbnQoKS5zdHls ZSgpKTsKLSAgICAgICAgaWYgKGxhc3RJbmxpbmVJdGVtLmlzVGV4dCgpKSB7Ci0gICAgICAgICAg ICBpZiAocnVucy5zaXplKCkgPT0gMSkgewotICAgICAgICAgICAgICAgIC8vIEZhc3QgcGF0aCBm b3IgdGhlIG1vc3QgY29tbW9uIGNhc2Ugb2YgYW4gaW5kaXZpZHVhbCB0ZXh0IGl0ZW0uCi0gICAg ICAgICAgICAgICAgcmV0dXJuIGlzV3JhcHBpbmdBbGxvd2VkKGxhc3RJbmxpbmVJdGVtLmxheW91 dEJveCgpLnN0eWxlKCkpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZm9yIChhdXRvJiBy dW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKHJ1bnMpKSB7Ci0gICAgICAgICAgICAgICAgYXV0 byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVtOwotICAgICAgICAgICAgICAgIGlmIChpbmxp bmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQo KSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGlzV3JhcHBpbmdBbGxvd2VkKGlubGluZUl0 ZW0ubGF5b3V0Qm94KCkucGFyZW50KCkuc3R5bGUoKSk7Ci0gICAgICAgICAgICAgICAgQVNTRVJU KCFpbmxpbmVJdGVtLmlzQm94KCkpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gVGhp cyBtdXN0IGJlIGEgc2V0IG9mIGluZGl2aWR1YWwgdGV4dCBydW5zLiBXZSBjb3VsZCBqdXN0IGNo ZWNrIHRoZSBsYXN0IGl0ZW0uCi0gICAgICAgICAgICByZXR1cm4gaXNXcmFwcGluZ0FsbG93ZWQo bGFzdElubGluZUl0ZW0ubGF5b3V0Qm94KCkuc3R5bGUoKSk7Ci0gICAgICAgIH0KLSAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1 cm4gaXNXcmFwcGluZ0FsbG93ZWQoc3R5bGVUb1VzZSk7CiAgICAgfTsKLSAgICBpZiAoc2hvdWxk V3JhcFRoaXNDb250ZW50VG9OZXh0TGluZSgpKQorICAgIGlmIChzaG91bGRXcmFwVW5icmVha2Fi bGVDb250ZW50VG9OZXh0TGluZSgpKQogICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6 V3JhcCwgSXNFbmRPZkxpbmU6OlllcyB9OwogICAgIGlmIChtX2hhc1dyYXBPcHBvcnR1bml0eUF0 UHJldmlvdXNQb3NpdGlvbikKICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OlJldmVy dFRvTGFzdFdyYXBPcHBvcnR1bml0eSwgSXNFbmRPZkxpbmU6OlllcyB9Owo=