168783 2017-02-23 09:50:28 -0800 Simple line layout: Adjust RunResolver::lineIndexForHeight with line struts. 2017-02-23 12:14:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue esprehn+autocc glenn koivisto kondapallykalyan simon.fraser webkit-bug-importer zalan oldest_to_newest 1280323 0 zalan 2017-02-23 09:50:28 -0800 Struts push lines down so the lineIndex = y / m_lineHeight is not correct anymore. 1280324 1 webkit-bug-importer 2017-02-23 09:50:56 -0800 <rdar://problem/30676449> 1280329 2 302525 zalan 2017-02-23 10:02:32 -0800 Created attachment 302525 Patch 1280333 3 302525 koivisto 2017-02-23 10:08:48 -0800 Comment on attachment 302525 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302525&action=review > Source/WebCore/rendering/SimpleLineLayoutResolver.cpp:147 > + if (!m_layout.hasLineStruts()) > + return lineIndexCandidate; Could we factor the struts case to a function so that the common case stays clean? Something like if (m_layout.hasLineStruts()) return adjustLineIndexForStruts(lineIndexCandidate,...); return lineIndexCandidate; 1280345 4 302530 zalan 2017-02-23 10:28:15 -0800 Created attachment 302530 Patch 1280394 5 commit-queue 2017-02-23 11:27:05 -0800 The commit-queue encountered the following flaky tests while processing attachment 302530: editing/spelling/spellcheck-async.html bug 160571 (authors: g.czajkowski@samsung.com and mark.lam@apple.com) The commit-queue is continuing to process your patch. 1280395 6 commit-queue 2017-02-23 11:27:10 -0800 The commit-queue encountered the following flaky tests while processing attachment 302530: The commit-queue is continuing to process your patch. 1280425 7 commit-queue 2017-02-23 12:13:40 -0800 The commit-queue encountered the following flaky tests while processing attachment 302530: editing/spelling/spellcheck-async.html bug 160571 (authors: g.czajkowski@samsung.com and mark.lam@apple.com) The commit-queue is continuing to process your patch. 1280426 8 302530 commit-queue 2017-02-23 12:14:11 -0800 Comment on attachment 302530 Patch Clearing flags on attachment: 302530 Committed r212912: <http://trac.webkit.org/changeset/212912> 1280427 9 commit-queue 2017-02-23 12:14:16 -0800 All reviewed patches have been landed. Closing bug. 302525 2017-02-23 10:02:32 -0800 2017-02-23 10:28:12 -0800 Patch bug-168783-20170223095944.patch text/plain 2808 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U1MjY3MzkyMmI3OTA4 NzE1ODhlZmFjM2ViNDNmMDk4ZTMzYzBkMS4uZTUyMWE2YWQ1M2U4ZmMwMmIyYWQ2YmY5Mzg5MzZk Yjc2NjFkYzc5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBBZGp1c3QgUnVuUmVzb2x2ZXI6OmxpbmVJbmRleEZvckhlaWdodCB3aXRoIGxpbmUgc3RydXRz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Nzgz CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDY3NjQ0OT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZXJlJ3MgYSBwYWdpbmF0aW9uIGdh cCBiZXR3ZWVuIGxpbmVzIHRoZSBzaW1wbGUgbGluZUluZGV4ID0geSAvIGxpbmVIZWlnaHQgZm9y bXVsYSBkb2VzIG5vdCB3b3JrIGFueW1vcmUuCisgICAgICAgIFRoaXMgcGF0Y2ggdGFrZXMgdGhl IGxpbmUgZ2FwcyBpbnRvIGFjY291bnQgYnkgb2Zmc2V0dGluZyB0aGUgeSBwb3NpdGlvbiBhY2Nv cmRpbmdseS4KKworICAgICAgICBOb3QgZW5hYmxlZCB5ZXQuCisKKyAgICAgICAgKiByZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBs ZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpsaW5lSW5kZXhGb3JIZWlnaHQpOgorCiAyMDE3LTAy LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxlIGxp bmUgbGF5b3V0OiBTZXQgdGhlIHBhZ2luYXRpb24gc3RydXQgb24gdGhlIGZsb3cgd2hlbiB0aGUg Zmlyc3QgbGluZSBkb2VzIG5vdCBmaXQgdGhlIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCmluZGV4IDg1OWIwODJk MTM2MDdjYmY3OWRjZDk5YWU0NjZjNWNhMTIzZmEwYTIuLmJkYzZiOTA1YzUxODM0YzQ5NGE1ZTU1 M2ZmYzZhOWFiNTc4ZGEwNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCkBAIC0xNDIsNyArMTQyLDI1IEBAIHVuc2ln bmVkIFJ1blJlc29sdmVyOjpsaW5lSW5kZXhGb3JIZWlnaHQoTGF5b3V0VW5pdCBoZWlnaHQsIElu ZGV4VHlwZSB0eXBlKSBjb25zCiAgICAgZWxzZQogICAgICAgICB5IC09IG1fYmFzZWxpbmUgLSBt X2FzY2VudDsKICAgICB5ID0gc3RkOjptYXg8ZmxvYXQ+KHksIDApOwotICAgIHJldHVybiBzdGQ6 Om1pbjx1bnNpZ25lZD4oeSAvIG1fbGluZUhlaWdodCwgbV9sYXlvdXQubGluZUNvdW50KCkgLSAx KTsKKyAgICBhdXRvIGxpbmVJbmRleENhbmRpZGF0ZSA9ICBzdGQ6Om1pbjx1bnNpZ25lZD4oeSAv IG1fbGluZUhlaWdodCwgbV9sYXlvdXQubGluZUNvdW50KCkgLSAxKTsKKyAgICBpZiAoIW1fbGF5 b3V0Lmhhc0xpbmVTdHJ1dHMoKSkKKyAgICAgICAgcmV0dXJuIGxpbmVJbmRleENhbmRpZGF0ZTsK KyAgICBhdXRvJiBzdHJ1dHMgPSBtX2xheW91dC5zdHJ1dHMoKTsKKyAgICAvLyBXZSBuZWVkIHRv IG9mZnNldCB0aGUgbGluZUluZGV4IHdpdGggbGluZSBzdHJ1dHMgd2hlbiB0aGVyZSdzIGFuIGFj dHVhbCBzdHJ1dCBiZWZvcmUgdGhlIGNhbmRpZGF0ZS4KKyAgICBhdXRvJiBzdHJ1dCA9IHN0cnV0 cy5maXJzdCgpOworICAgIGlmIChzdHJ1dC5saW5lQnJlYWsgPj0gbGluZUluZGV4Q2FuZGlkYXRl KQorICAgICAgICByZXR1cm4gbGluZUluZGV4Q2FuZGlkYXRlOworICAgIC8vIEp1bXAgb3ZlciB0 aGUgZmlyc3Qgc3RydXQgc2luY2Ugd2Uga25vdyB0aGF0IHRoZSBsaW5lIHdlIGFyZSBsb29raW5n IGZvciBpcyBiZXlvbmQgdGhlIHN0cnV0LgorICAgIHVuc2lnbmVkIHN0cnV0SW5kZXggPSAxOwor ICAgIGZsb2F0IHRvcFBvc2l0aW9uID0gc3RydXQubGluZUJyZWFrICogbV9saW5lSGVpZ2h0ICsg c3RydXQub2Zmc2V0OworICAgIGZvciAoYXV0byBsaW5lSW5kZXggPSBzdHJ1dC5saW5lQnJlYWs7 IGxpbmVJbmRleCA8IG1fbGF5b3V0LmxpbmVDb3VudCgpOyArK2xpbmVJbmRleCkgeworICAgICAg ICBpZiAoc3RydXRJbmRleCA8IHN0cnV0cy5zaXplKCkgJiYgc3RydXRzLmF0KHN0cnV0SW5kZXgp LmxpbmVCcmVhayA9PSBsaW5lSW5kZXgpCisgICAgICAgICAgICB0b3BQb3NpdGlvbiArPSBzdHJ1 dHMuYXQoc3RydXRJbmRleCsrKS5vZmZzZXQ7CisgICAgICAgIGlmICh5ID49IHRvcFBvc2l0aW9u ICYmIHkgPCAodG9wUG9zaXRpb24gKyBtX2xpbmVIZWlnaHQpKQorICAgICAgICAgICAgcmV0dXJu IGxpbmVJbmRleDsKKyAgICAgICAgdG9wUG9zaXRpb24gKz0gbV9saW5lSGVpZ2h0OworICAgIH0K KyAgICByZXR1cm4gbV9sYXlvdXQubGluZUNvdW50KCkgLSAxOwogfQogCiBSYW5nZTxSdW5SZXNv bHZlcjo6SXRlcmF0b3I+IFJ1blJlc29sdmVyOjpyYW5nZUZvclJlY3QoY29uc3QgTGF5b3V0UmVj dCYgcmVjdCkgY29uc3QK 302530 2017-02-23 10:28:15 -0800 2017-02-23 12:14:11 -0800 Patch bug-168783-20170223102526.patch text/plain 3828 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U1MjY3MzkyMmI3OTA4 NzE1ODhlZmFjM2ViNDNmMDk4ZTMzYzBkMS4uMWQ5Zjg0YzU2ZGZlMzcwYWNmM2I2MGExMmYwMDY5 ZmU4ZTRmNDI5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBBZGp1c3QgUnVuUmVzb2x2ZXI6OmxpbmVJbmRleEZvckhlaWdodCB3aXRoIGxpbmUgc3RydXRz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Nzgz CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDY3NjQ0OT4KKworICAgICAgICBSZXZpZXdlZCBi eSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBXaGVuIHRoZXJlJ3MgYSBwYWdpbmF0aW9uIGdh cCBiZXR3ZWVuIGxpbmVzIHRoZSBzaW1wbGUgbGluZUluZGV4ID0geSAvIGxpbmVIZWlnaHQgZm9y bXVsYSBkb2VzIG5vdCB3b3JrIGFueW1vcmUuCisgICAgICAgIFRoaXMgcGF0Y2ggdGFrZXMgdGhl IGxpbmUgZ2FwcyBpbnRvIGFjY291bnQgYnkgb2Zmc2V0dGluZyB0aGUgeSBwb3NpdGlvbiBhY2Nv cmRpbmdseS4KKworICAgICAgICBOb3QgZW5hYmxlZCB5ZXQuCisKKyAgICAgICAgKiByZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBs ZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpsaW5lSW5kZXhGb3JIZWlnaHQpOgorCiAyMDE3LTAy LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxlIGxp bmUgbGF5b3V0OiBTZXQgdGhlIHBhZ2luYXRpb24gc3RydXQgb24gdGhlIGZsb3cgd2hlbiB0aGUg Zmlyc3QgbGluZSBkb2VzIG5vdCBmaXQgdGhlIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCmluZGV4IDg1OWIwODJk MTM2MDdjYmY3OWRjZDk5YWU0NjZjNWNhMTIzZmEwYTIuLjBmYzdhYmU2MzFlZWViYTUwZGJkOGVl ZDZiNTY0NWNkOGM0ZjBlMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCkBAIC0xMzIsNiArMTMyLDI2IEBAIFJ1blJl c29sdmVyOjpSdW5SZXNvbHZlcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIGNvbnN0IExh eW91dCYgbGF5b3V0KQogewogfQogCit1bnNpZ25lZCBSdW5SZXNvbHZlcjo6YWRqdXN0TGluZUlu ZGV4Rm9yU3RydXRzKExheW91dFVuaXQgeSwgdW5zaWduZWQgbGluZUluZGV4Q2FuZGlkYXRlKSBj b25zdAoreworICAgIGF1dG8mIHN0cnV0cyA9IG1fbGF5b3V0LnN0cnV0cygpOworICAgIC8vIFdl IG5lZWQgdG8gb2Zmc2V0IHRoZSBsaW5lSW5kZXggd2l0aCBsaW5lIHN0cnV0cyB3aGVuIHRoZXJl J3MgYW4gYWN0dWFsIHN0cnV0IGJlZm9yZSB0aGUgY2FuZGlkYXRlLgorICAgIGF1dG8mIHN0cnV0 ID0gc3RydXRzLmZpcnN0KCk7CisgICAgaWYgKHN0cnV0LmxpbmVCcmVhayA+PSBsaW5lSW5kZXhD YW5kaWRhdGUpCisgICAgICAgIHJldHVybiBsaW5lSW5kZXhDYW5kaWRhdGU7CisgICAgLy8gSnVt cCBvdmVyIHRoZSBmaXJzdCBzdHJ1dCBzaW5jZSB3ZSBrbm93IHRoYXQgdGhlIGxpbmUgd2UgYXJl IGxvb2tpbmcgZm9yIGlzIGJleW9uZCB0aGUgc3RydXQuCisgICAgdW5zaWduZWQgc3RydXRJbmRl eCA9IDE7CisgICAgZmxvYXQgdG9wUG9zaXRpb24gPSBzdHJ1dC5saW5lQnJlYWsgKiBtX2xpbmVI ZWlnaHQgKyBzdHJ1dC5vZmZzZXQ7CisgICAgZm9yIChhdXRvIGxpbmVJbmRleCA9IHN0cnV0Lmxp bmVCcmVhazsgbGluZUluZGV4IDwgbV9sYXlvdXQubGluZUNvdW50KCk7ICsrbGluZUluZGV4KSB7 CisgICAgICAgIGlmIChzdHJ1dEluZGV4IDwgc3RydXRzLnNpemUoKSAmJiBzdHJ1dHMuYXQoc3Ry dXRJbmRleCkubGluZUJyZWFrID09IGxpbmVJbmRleCkKKyAgICAgICAgICAgIHRvcFBvc2l0aW9u ICs9IHN0cnV0cy5hdChzdHJ1dEluZGV4KyspLm9mZnNldDsKKyAgICAgICAgaWYgKHkgPj0gdG9w UG9zaXRpb24gJiYgeSA8ICh0b3BQb3NpdGlvbiArIG1fbGluZUhlaWdodCkpCisgICAgICAgICAg ICByZXR1cm4gbGluZUluZGV4OworICAgICAgICB0b3BQb3NpdGlvbiArPSBtX2xpbmVIZWlnaHQ7 CisgICAgfQorICAgIHJldHVybiBtX2xheW91dC5saW5lQ291bnQoKSAtIDE7Cit9CisKIHVuc2ln bmVkIFJ1blJlc29sdmVyOjpsaW5lSW5kZXhGb3JIZWlnaHQoTGF5b3V0VW5pdCBoZWlnaHQsIElu ZGV4VHlwZSB0eXBlKSBjb25zdAogewogICAgIEFTU0VSVChtX2xpbmVIZWlnaHQpOwpAQCAtMTQy LDcgKzE2MiwxMCBAQCB1bnNpZ25lZCBSdW5SZXNvbHZlcjo6bGluZUluZGV4Rm9ySGVpZ2h0KExh eW91dFVuaXQgaGVpZ2h0LCBJbmRleFR5cGUgdHlwZSkgY29ucwogICAgIGVsc2UKICAgICAgICAg eSAtPSBtX2Jhc2VsaW5lIC0gbV9hc2NlbnQ7CiAgICAgeSA9IHN0ZDo6bWF4PGZsb2F0Pih5LCAw KTsKLSAgICByZXR1cm4gc3RkOjptaW48dW5zaWduZWQ+KHkgLyBtX2xpbmVIZWlnaHQsIG1fbGF5 b3V0LmxpbmVDb3VudCgpIC0gMSk7CisgICAgYXV0byBsaW5lSW5kZXhDYW5kaWRhdGUgPSAgc3Rk OjptaW48dW5zaWduZWQ+KHkgLyBtX2xpbmVIZWlnaHQsIG1fbGF5b3V0LmxpbmVDb3VudCgpIC0g MSk7CisgICAgaWYgKG1fbGF5b3V0Lmhhc0xpbmVTdHJ1dHMoKSkKKyAgICAgICAgcmV0dXJuIGFk anVzdExpbmVJbmRleEZvclN0cnV0cyh5LCBsaW5lSW5kZXhDYW5kaWRhdGUpOworICAgIHJldHVy biBsaW5lSW5kZXhDYW5kaWRhdGU7CiB9CiAKIFJhbmdlPFJ1blJlc29sdmVyOjpJdGVyYXRvcj4g UnVuUmVzb2x2ZXI6OnJhbmdlRm9yUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNv bHZlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZl ci5oCmluZGV4IDQ3MmExZDJjODhhNWNjOTUzMGVhMWNiY2Q4NGQzNjdhOGY0NmVmNGQuLjUxMTk1 NmI0MTE3YTI3YzExNDkyOTViNmNmYzhmOWE2YzQ4ZDQ1M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmgKQEAgLTEyMSw2ICsx MjEsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGVudW0gY2xhc3MgSW5kZXhUeXBlIHsgRmly c3QsIExhc3QgfTsKICAgICB1bnNpZ25lZCBsaW5lSW5kZXhGb3JIZWlnaHQoTGF5b3V0VW5pdCwg SW5kZXhUeXBlKSBjb25zdDsKKyAgICB1bnNpZ25lZCBhZGp1c3RMaW5lSW5kZXhGb3JTdHJ1dHMo TGF5b3V0VW5pdCwgdW5zaWduZWQgbGluZUluZGV4Q2FuZGlkYXRlKSBjb25zdDsKIAogICAgIGNv bnN0IFJlbmRlckJsb2NrRmxvdyYgbV9mbG93UmVuZGVyZXI7CiAgICAgY29uc3QgTGF5b3V0JiBt X2xheW91dDsK