219235 2020-11-21 10:41:31 -0800 [LFC][IFC] Treat floats as soft wrap opportunities 2020-11-21 12:06:16 -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 1709767 0 zalan 2020-11-21 10:41:31 -0800 While floats are not part of the inline content and they are not supposed to introduce soft wrap opportunity, e.g. [text][float box][float box][text][float box][text] is essentially just [text][text][text] figuring out whether a float (or set of floats) should stay on the line or not (and handle potentially out of order inline items) brings in unnecessary complexity (and apparently Blink works like that too) 1709768 1 414766 zalan 2020-11-21 10:45:17 -0800 Created attachment 414766 Patch 1709782 2 ews-feeder 2020-11-21 12:05:18 -0800 Committed r270151: <https://trac.webkit.org/changeset/270151> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414766. 1709783 3 webkit-bug-importer 2020-11-21 12:06:16 -0800 <rdar://problem/71657211> 414766 2020-11-21 10:45:17 -0800 2020-11-21 12:05:18 -0800 Patch bug-219235-20201121104517.patch text/plain 5050 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ4OTY3Mzk0NDliY2Nk M2Q5N2RiMDE4NTFkYzJhM2NlYWMwNWUwMi4uZDI5YTcxODgyNWIxZGYwY2E5NTU5YjU5NDFiMTY4 NDI2NDhhMTI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTExLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUcmVhdCBm bG9hdHMgYXMgc29mdCB3cmFwIG9wcG9ydHVuaXRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTIzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoaWxlIGZsb2F0cyBhcmUgbm90IHBhcnQgb2YgdGhl IGlubGluZSBjb250ZW50IGFuZCB0aGV5IGFyZSBub3Qgc3VwcG9zZWQgdG8gaW50cm9kdWNlIHNv ZnQgd3JhcCBvcHBvcnR1bml0aWVzLAorICAgICAgICBlLmcuIFt0ZXh0XVtmbG9hdCBib3hdW2Zs b2F0IGJveF1bdGV4dF1bZmxvYXQgYm94XVt0ZXh0XSBpcyBlc3NlbnRpYWxseSBqdXN0IFt0ZXh0 XVt0ZXh0XVt0ZXh0XQorICAgICAgICBmaWd1cmluZyBvdXQgd2hldGhlciBhIGZsb2F0IChvciBz ZXQgb2YgZmxvYXRzKSBzaG91bGQgc3RheSBvbiB0aGUgbGluZSBvciBub3QgKGFuZCBoYW5kbGUg cG90ZW50aWFsbHkgb3V0IG9mIG9yZGVyIGlubGluZSBpdGVtcykKKyAgICAgICAgYnJpbmdzIGlu IHVubmVjZXNzYXJ5IGNvbXBsZXhpdHkgKGFuZCBhcHBhcmVudGx5IEJsaW5rIHdvcmtzIGxpa2Ug dGhpcyB0b28pLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBv cnR1bml0eSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpuZXh0V3Jh cE9wcG9ydHVuaXR5IGNvbnN0KToKKwogMjAyMC0xMS0yMSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBMYXlvdXRJbnRlZ3JhdGlv bjo6TGluZTo6cmVjdCBpcyB3YXkgdG9vIGFtYmlndW91cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CmluZGV4IGFhYzRhYjVjNmFiYzVhY2RmYjI4MjBjMDIyNWRlNTNiZDNhOWUxMWYuLjdhZjFiYTY1 ODg1MDFlNmY3YTgzNWY2M2I1YzQzZWJhOGNhODI5MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHAKQEAgLTc4LDggKzc4LDggQEAgc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0V3JhcE9wcG9y dHVuaXR5KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmUKICAgICAvLyBlLmcu IFtjb250YWluZXIgc3RhcnRdW3ByaW9yX2NvbnRpbnVvdXNfY29udGVudF1bY29udGFpbmVyIGVu ZF0gKDxzcGFuPnByaW9yX2NvbnRpbnVvdXNfY29udGVudDwvc3Bhbj4pCiAgICAgLy8gQW4gaW5j b21pbmcgPGltZz4gYm94IHdvdWxkIGVuYWJsZSB1cyB0byBjb21taXQgdGhlICI8c3Bhbj5wcmlv cl9jb250aW51b3VzX2NvbnRlbnQ8L3NwYW4+IiBjb250ZW50CiAgICAgLy8gYnV0IGFuIGluY29t aW5nIHRleHQgY29udGVudCB3b3VsZCBub3QgbmVjZXNzYXJpbHkuCi0gICAgQVNTRVJUKGN1cnJl bnQuaXNUZXh0KCkgfHwgY3VycmVudC5pc0JveCgpKTsKLSAgICBBU1NFUlQobmV4dC5pc1RleHQo KSB8fCBuZXh0LmlzQm94KCkpOworICAgIEFTU0VSVChjdXJyZW50LmlzVGV4dCgpIHx8IGN1cnJl bnQuaXNCb3goKSB8fCBjdXJyZW50LmlzRmxvYXQoKSk7CisgICAgQVNTRVJUKG5leHQuaXNUZXh0 KCkgfHwgbmV4dC5pc0JveCgpIHx8IG5leHQuaXNGbG9hdCgpKTsKICAgICBpZiAoY3VycmVudC5p c1RleHQoKSAmJiBuZXh0LmlzVGV4dCgpKSB7CiAgICAgICAgIGF1dG8mIGN1cnJlbnRJbmxpbmVU ZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjdXJyZW50KTsKICAgICAgICAgYXV0 byYgbmV4dElubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG5leHQpOwpA QCAtMTAyLDYgKzEwMiwxMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0 dW5pdHkoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgICAgICAvLyBb dGV4dC1dW3RleHRdIDogYWZ0ZXIgW2h5cGhlbl0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bw b3J0dW5pdHkuCiAgICAgICAgIHJldHVybiBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkoY3Vy cmVudElubGluZVRleHRJdGVtLCBuZXh0SW5saW5lVGV4dEl0ZW0pOwogICAgIH0KKyAgICBpZiAo Y3VycmVudC5pc0Zsb2F0KCkgfHwgbmV4dC5pc0Zsb2F0KCkpIHsKKyAgICAgICAgLy8gV2hpbGUg ZmxvYXRzIGFyZSBub3QgcGFydCBvZiB0aGUgaW5saW5lIGNvbnRlbnQgYW5kIHRoZXkgYXJlIG5v dCBzdXBwb3NlZCB0byBpbnRyb2R1Y2Ugc29mdCB3cmFwIG9wcG9ydHVuaXRpZXMsCisgICAgICAg IC8vIGUuZy4gW3RleHRdW2Zsb2F0IGJveF1bZmxvYXQgYm94XVt0ZXh0XVtmbG9hdCBib3hdW3Rl eHRdIGlzIGVzc2VudGlhbGx5IGp1c3QgW3RleHRdW3RleHRdW3RleHRdCisgICAgICAgIC8vIGZp Z3VyaW5nIG91dCB3aGV0aGVyIGEgZmxvYXQgKG9yIHNldCBvZiBmbG9hdHMpIHNob3VsZCBzdGF5 IG9uIHRoZSBsaW5lIG9yIG5vdCAoYW5kIGhhbmRsZSBwb3RlbnRpYWxseSBvdXQgb2Ygb3JkZXIg aW5saW5lIGl0ZW1zKQorICAgICAgICAvLyBicmluZ3MgaW4gdW5uZWNlc3NhcnkgY29tcGxleGl0 eS4KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQogICAgIGlmIChjdXJyZW50LmlzQm94KCkg fHwgbmV4dC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8gaXNJbWFnZUNvbnRlbnQgPSBjdXJyZW50 LmxheW91dEJveCgpLmlzSW1hZ2UoKSB8fCBuZXh0LmxheW91dEJveCgpLmlzSW1hZ2UoKTsKICAg ICAgICAgaWYgKGlzSW1hZ2VDb250ZW50KQpAQCAtNTE1LDIxICs1MjIsMjAgQEAgc2l6ZV90IExp bmVCdWlsZGVyOjpuZXh0V3JhcE9wcG9ydHVuaXR5KHNpemVfdCBzdGFydEluZGV4LCBjb25zdCBM aW5lQnVpbGRlcjo6SW4KICAgICAgICAgICAgIC8vIFdlIGFsd2F5cyBzdG9wIGF0IGV4cGxpY2l0 IHdyYXBwaW5nIG9wcG9ydHVuaXRpZXMgZS5nLiA8YnI+LiBUaGUgd3JhcCBwb3NpdGlvbiBpcyBh ZnRlciB0aGUgb3Bwb3J0dW5pdHkgcG9zaXRpb24uCiAgICAgICAgICAgICByZXR1cm4gKytpbmRl eDsKICAgICAgICAgfQotICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0Zsb2F0KCkpIHsKLSAgICAg ICAgICAgIC8vIEZsb2F0cyBhcmUgbm90IHBhcnQgb2YgdGhlIGlubGluZSBjb250ZW50LiBXZSBp Z25vcmUgdGhlbSBhcyBmYXIgYXMgd3JhcCBvcHBvcnR1bml0aWVzIGFyZSBjb25jZXJuZWQuCi0g ICAgICAgICAgICAvLyBbdGV4dF1bZmxvYXQgYm94XVt0ZXh0XSBpcyBlc3NlbnRpYWxseSBqdXN0 IFt0ZXh0XVt0ZXh0XQotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KICAgICAgICAg aWYgKGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVC b3hFbmQoKSkgewogICAgICAgICAgICAgLy8gVGhlcmUncyBubyB3cmFwcGluZyBvcHBvcnR1bml0 eSBiZXR3ZWVuIDxzcGFuPnRleHQsIDxzcGFuPjwvc3Bhbj4gb3IgPC9zcGFuPnRleHQuIAogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgQVNTRVJUKGlubGluZUl0ZW0u aXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0JveCgpKTsKKyAgICAgICAgQVNTRVJUKGlubGluZUl0 ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0JveCgpIHx8IGlubGluZUl0ZW0uaXNGbG9hdCgp KTsKICAgICAgICAgaWYgKCFwcmV2aW91c0lubGluZUl0ZW1JbmRleCkgewogICAgICAgICAgICAg cHJldmlvdXNJbmxpbmVJdGVtSW5kZXggPSBpbmRleDsKICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICB9Ci0gICAgICAgIGlmIChpc0F0U29mdFdyYXBPcHBvcnR1bml0eShtX2lubGluZUZv cm1hdHRpbmdDb250ZXh0LCBtX2lubGluZUl0ZW1zWypwcmV2aW91c0lubGluZUl0ZW1JbmRleF0s IG1faW5saW5lSXRlbXNbaW5kZXhdKSkgeworICAgICAgICBhdXRvJiBwcmV2aW91c0l0ZW0gPSBt X2lubGluZUl0ZW1zWypwcmV2aW91c0lubGluZUl0ZW1JbmRleF07CisgICAgICAgIGF1dG8mIGN1 cnJlbnRJdGVtID0gbV9pbmxpbmVJdGVtc1tpbmRleF07CisgICAgICAgIGlmIChpc0F0U29mdFdy YXBPcHBvcnR1bml0eShtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0LCBwcmV2aW91c0l0ZW0sIGN1 cnJlbnRJdGVtKSkgeworICAgICAgICAgICAgaWYgKCFwcmV2aW91c0l0ZW0uaXNUZXh0KCkgfHwg IWN1cnJlbnRJdGVtLmlzVGV4dCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBpbmRleDsKICAg ICAgICAgICAgIC8vIFRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgYmV0d2VlbiAncHJl dmlvdXNJbmxpbmVJdGVtSW5kZXgnIGFuZCAnaW5kZXgnLgogICAgICAgICAgICAgLy8gTm93IGZv cndhcmQtZmluZCBmcm9tIHRoZSBzdGFydCBwb3NpdGlvbiB0byBzZWUgd2hlcmUgd2UgY2FuIGFj dHVhbGx5IHdyYXAuCiAgICAgICAgICAgICAvLyBbZXgtXVthbXBsZV0gdnMuIFtleC1dW2NvbnRh aW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bYW1wbGVdCg==