217306 2020-10-04 19:39:00 -0700 [LFC][Integration] Enable non-uniform line height content with floats 2020-10-05 08:29:16 -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 1694617 0 zalan 2020-10-04 19:39:00 -0700 ssia 1694618 1 410499 zalan 2020-10-04 19:41:51 -0700 Created attachment 410499 Patch 1694679 2 410514 zalan 2020-10-05 07:52:55 -0700 Created attachment 410514 Patch 1694691 3 ews-feeder 2020-10-05 08:28:36 -0700 Committed r267967: <https://trac.webkit.org/changeset/267967> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410514. 1694692 4 webkit-bug-importer 2020-10-05 08:29:16 -0700 <rdar://problem/69955233> 410499 2020-10-04 19:41:51 -0700 2020-10-05 07:52:54 -0700 Patch bug-217306-20201004194150.patch text/plain 3200 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc1MzY1MTRlMmEzNDM3 ZjlmZDlhNTUyMmRlOTliNjVhYjM2OGI4Yi4uOTcxODY3ZTBjODJmOTdhZTk3ODI2YmQyOGVhNmQ1 MzVkMmI1M2EwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEwLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEVuYWJsZSBub24tdW5pZm9ybSBsaW5lIGhlaWdodCBjb250ZW50IHdpdGggZmxvYXRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBKdXN0IEVXU2luZy4g d2Via2l0Lm9yZy9iLzIxNzMwNSBuZWVkcyB0byBsYW5kIGZpcnN0LiBMZXQncyBzZWUgd2hhdCBl bHNlIGJyZWFrcy4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkNvdmVyYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpj YW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbik6CisKIDIwMjAtMTAtMDQgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGbG9hdHNdIERvIG5vdCBhc3Nl cnQgd2hlbiByaWdodCBhbGlnbmVkIGZsb2F0IG92ZXJmbG93cyB0aGUgY29udGFpbmluZyBibG9j ayBvbiB0aGUgbGVmdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCmluZGV4IGRlMDYwNjgx N2EwYjEyNmEyNzNiMDM1NzdlMTU4OTJhOGMwZDI5YjEuLjhlMzM5NjQwZGI1NmFiOGU1NDc4YWQ5 ODhjODAwOGMwNGQzYzhhODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKQEAgLTMx OSwyMCArMzE5LDEyIEBAIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckxpbmVM YXlvdXRXaXRoUmVhc29uKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYKICAgICAgICAgQUREX1JFQVNP TlNfQU5EX1JFVFVSTl9JRl9ORUVERUQoc3R5bGVSZWFzb25zLCByZWFzb25zLCBpbmNsdWRlUmVh c29ucyk7CiAgICAgLy8gV2UgY2FuJ3QgdXNlIHRoZSBjb2RlIHBhdGggaWYgYW55IGxpbmVzIHdv dWxkIG5lZWQgdG8gYmUgc2hpZnRlZCBiZWxvdyBmbG9hdHMuIFRoaXMgaXMgYmVjYXVzZSB3ZSBk b24ndCBrZWVwIHBlci1saW5lIHkgY29vcmRpbmF0ZXMuCiAgICAgaWYgKGZsb3cuY29udGFpbnNG bG9hdHMoKSkgewotICAgICAgICBmbG9hdCBtaW5pbXVtV2lkdGhOZWVkZWQgPSBzdGQ6Om51bWVy aWNfbGltaXRzPGZsb2F0Pjo6bWF4KCk7Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgdGV4dFJl bmRlcmVyIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyVGV4dD4oZmxvdykpIHsKLSAgICAgICAgICAg IG1pbmltdW1XaWR0aE5lZWRlZCA9IHN0ZDo6bWluKG1pbmltdW1XaWR0aE5lZWRlZCwgdGV4dFJl bmRlcmVyLm1pbkxvZ2ljYWxXaWR0aCgpKTsKLQotICAgICAgICAgICAgZm9yIChhdXRvJiBmbG9h dGluZ09iamVjdCA6ICpmbG93LmZsb2F0aW5nT2JqZWN0U2V0KCkpIHsKLSAgICAgICAgICAgICAg ICBBU1NFUlQoZmxvYXRpbmdPYmplY3QpOwotICAgICAgICAgICAgICAgIC8vIGlmIGEgZmxvYXQg aGFzIGEgc2hhcGUsIHdlIGNhbm5vdCB0ZWxsIGlmIGNvbnRlbnQgd2lsbCBuZWVkIHRvIGJlIHNo aWZ0ZWQgdW50aWwgYWZ0ZXIgd2UgbGF5IGl0IG91dCwKLSAgICAgICAgICAgICAgICAvLyBzaW5j ZSB0aGUgYW1vdW50IG9mIHNwYWNlIGlzIG5vdCB1bmlmb3JtIGZvciB0aGUgaGVpZ2h0IG9mIHRo ZSBmbG9hdC4KLSAgICAgICAgICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3QtPnJlbmRlcmVyKCku c2hhcGVPdXRzaWRlSW5mbygpKQotICAgICAgICAgICAgICAgICAgICBTRVRfUkVBU09OX0FORF9S RVRVUk5fSUZfTkVFREVEKEZsb3dIYXNVbnN1cHBvcnRlZEZsb2F0LCByZWFzb25zLCBpbmNsdWRl UmVhc29ucyk7Ci0gICAgICAgICAgICAgICAgZmxvYXQgYXZhaWxhYmxlV2lkdGggPSBmbG93LmF2 YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckxpbmUoZmxvYXRpbmdPYmplY3QtPnkoKSwgRG9Ob3RJbmRl bnRUZXh0KTsKLSAgICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlV2lkdGggPCBtaW5pbXVtV2lk dGhOZWVkZWQpCi0gICAgICAgICAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9O RUVERUQoRmxvd0hhc1Vuc3VwcG9ydGVkRmxvYXQsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsK LSAgICAgICAgICAgIH0KKyAgICAgICAgZm9yIChhdXRvJiBmbG9hdGluZ09iamVjdCA6ICpmbG93 LmZsb2F0aW5nT2JqZWN0U2V0KCkpIHsKKyAgICAgICAgICAgIEFTU0VSVChmbG9hdGluZ09iamVj dCk7CisgICAgICAgICAgICAvLyBpZiBhIGZsb2F0IGhhcyBhIHNoYXBlLCB3ZSBjYW5ub3QgdGVs bCBpZiBjb250ZW50IHdpbGwgbmVlZCB0byBiZSBzaGlmdGVkIHVudGlsIGFmdGVyIHdlIGxheSBp dCBvdXQsCisgICAgICAgICAgICAvLyBzaW5jZSB0aGUgYW1vdW50IG9mIHNwYWNlIGlzIG5vdCB1 bmlmb3JtIGZvciB0aGUgaGVpZ2h0IG9mIHRoZSBmbG9hdC4KKyAgICAgICAgICAgIGlmIChmbG9h dGluZ09iamVjdC0+cmVuZGVyZXIoKS5zaGFwZU91dHNpZGVJbmZvKCkpCisgICAgICAgICAgICAg ICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFzVW5zdXBwb3J0ZWRGbG9h dCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgICAgICB9CiAgICAgfQogICAgIGF1dG8g Zm9udEFuZFRleHRSZWFzb25zID0gY2FuVXNlRm9yRm9udEFuZFRleHQoZmxvdywgaW5jbHVkZVJl YXNvbnMpOwo= 410514 2020-10-05 07:52:55 -0700 2020-10-05 08:28:37 -0700 Patch bug-217306-20201005075255.patch text/plain 3180 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc1MzY1MTRlMmEzNDM3 ZjlmZDlhNTUyMmRlOTliNjVhYjM2OGI4Yi4uMDBlNzY0YWViNjU3Y2ExZGIyNGM5Yjk0Mzk5NTBm MWY4YTNhM2Q2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEwLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEVuYWJsZSBub24tdW5pZm9ybSBsaW5lIGhlaWdodCBjb250ZW50IHdpdGggZmxvYXRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBhbmQgY292ZXJh Z2Ugbm93IHRoYXQgd2Ugc3VwcG9ydCBub24tdW5pZm9ybSBsaW5lIGhlaWdodHMuCisKKyAgICAg ICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y2FuVXNlRm9yTGluZUxheW91dFdp dGhSZWFzb24pOgorCiAyMDIwLTEwLTA0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bRmxvYXRzXSBEbyBub3QgYXNzZXJ0IHdoZW4gcmlnaHQgYWxpZ25l ZCBmbG9hdCBvdmVyZmxvd3MgdGhlIGNvbnRhaW5pbmcgYmxvY2sgb24gdGhlIGxlZnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCBkZTA2MDY4MTdhMGIxMjZhMjczYjAzNTc3ZTE1 ODkyYThjMGQyOWIxLi44ZTMzOTY0MGRiNTZhYjhlNTQ3OGFkOTg4YzgwMDhjMDRkM2M4YTgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCkBAIC0zMTksMjAgKzMxOSwxMiBAQCBPcHRp b25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbihjb25z dCBSZW5kZXJCbG9ja0Zsb3cmCiAgICAgICAgIEFERF9SRUFTT05TX0FORF9SRVRVUk5fSUZfTkVF REVEKHN0eWxlUmVhc29ucywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIC8vIFdlIGNh bid0IHVzZSB0aGUgY29kZSBwYXRoIGlmIGFueSBsaW5lcyB3b3VsZCBuZWVkIHRvIGJlIHNoaWZ0 ZWQgYmVsb3cgZmxvYXRzLiBUaGlzIGlzIGJlY2F1c2Ugd2UgZG9uJ3Qga2VlcCBwZXItbGluZSB5 IGNvb3JkaW5hdGVzLgogICAgIGlmIChmbG93LmNvbnRhaW5zRmxvYXRzKCkpIHsKLSAgICAgICAg ZmxvYXQgbWluaW11bVdpZHRoTmVlZGVkID0gc3RkOjpudW1lcmljX2xpbWl0czxmbG9hdD46Om1h eCgpOwotICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHRleHRSZW5kZXJlciA6IGNoaWxkcmVuT2ZU eXBlPFJlbmRlclRleHQ+KGZsb3cpKSB7Ci0gICAgICAgICAgICBtaW5pbXVtV2lkdGhOZWVkZWQg PSBzdGQ6Om1pbihtaW5pbXVtV2lkdGhOZWVkZWQsIHRleHRSZW5kZXJlci5taW5Mb2dpY2FsV2lk dGgoKSk7Ci0KLSAgICAgICAgICAgIGZvciAoYXV0byYgZmxvYXRpbmdPYmplY3QgOiAqZmxvdy5m bG9hdGluZ09iamVjdFNldCgpKSB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKGZsb2F0aW5nT2Jq ZWN0KTsKLSAgICAgICAgICAgICAgICAvLyBpZiBhIGZsb2F0IGhhcyBhIHNoYXBlLCB3ZSBjYW5u b3QgdGVsbCBpZiBjb250ZW50IHdpbGwgbmVlZCB0byBiZSBzaGlmdGVkIHVudGlsIGFmdGVyIHdl IGxheSBpdCBvdXQsCi0gICAgICAgICAgICAgICAgLy8gc2luY2UgdGhlIGFtb3VudCBvZiBzcGFj ZSBpcyBub3QgdW5pZm9ybSBmb3IgdGhlIGhlaWdodCBvZiB0aGUgZmxvYXQuCi0gICAgICAgICAg ICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LT5yZW5kZXJlcigpLnNoYXBlT3V0c2lkZUluZm8oKSkK LSAgICAgICAgICAgICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93 SGFzVW5zdXBwb3J0ZWRGbG9hdCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwotICAgICAgICAg ICAgICAgIGZsb2F0IGF2YWlsYWJsZVdpZHRoID0gZmxvdy5hdmFpbGFibGVMb2dpY2FsV2lkdGhG b3JMaW5lKGZsb2F0aW5nT2JqZWN0LT55KCksIERvTm90SW5kZW50VGV4dCk7Ci0gICAgICAgICAg ICAgICAgaWYgKGF2YWlsYWJsZVdpZHRoIDwgbWluaW11bVdpZHRoTmVlZGVkKQotICAgICAgICAg ICAgICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNVbnN1cHBv cnRlZEZsb2F0LCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7Ci0gICAgICAgICAgICB9CisgICAg ICAgIGZvciAoYXV0byYgZmxvYXRpbmdPYmplY3QgOiAqZmxvdy5mbG9hdGluZ09iamVjdFNldCgp KSB7CisgICAgICAgICAgICBBU1NFUlQoZmxvYXRpbmdPYmplY3QpOworICAgICAgICAgICAgLy8g aWYgYSBmbG9hdCBoYXMgYSBzaGFwZSwgd2UgY2Fubm90IHRlbGwgaWYgY29udGVudCB3aWxsIG5l ZWQgdG8gYmUgc2hpZnRlZCB1bnRpbCBhZnRlciB3ZSBsYXkgaXQgb3V0LAorICAgICAgICAgICAg Ly8gc2luY2UgdGhlIGFtb3VudCBvZiBzcGFjZSBpcyBub3QgdW5pZm9ybSBmb3IgdGhlIGhlaWdo dCBvZiB0aGUgZmxvYXQuCisgICAgICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3QtPnJlbmRlcmVy KCkuc2hhcGVPdXRzaWRlSW5mbygpKQorICAgICAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JF VFVSTl9JRl9ORUVERUQoRmxvd0hhc1Vuc3VwcG9ydGVkRmxvYXQsIHJlYXNvbnMsIGluY2x1ZGVS ZWFzb25zKTsKICAgICAgICAgfQogICAgIH0KICAgICBhdXRvIGZvbnRBbmRUZXh0UmVhc29ucyA9 IGNhblVzZUZvckZvbnRBbmRUZXh0KGZsb3csIGluY2x1ZGVSZWFzb25zKTsK