140789 2015-01-22 14:38:54 -0800 Simple line layout: Reset LineState when starting a new line. 2015-01-22 15:42:41 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn koivisto kondapallykalyan mmaxfield oldest_to_newest 1063471 0 zalan 2015-01-22 14:38:54 -0800 To be more explicit about what data we need to transfer from the previous line. 1063489 1 245170 zalan 2015-01-22 15:15:02 -0800 Created attachment 245170 Patch 1063492 2 245170 koivisto 2015-01-22 15:19:07 -0800 Comment on attachment 245170 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245170&action=review > Source/WebCore/rendering/SimpleLineLayout.cpp:362 > +static void initializeNewLine(LineState& lineState, const RenderBlockFlow& flow, const FlowContents& flowContents, unsigned lineStartRunIndex) You could return the new line instead of mutating the argument. 1063504 3 zalan 2015-01-22 15:42:41 -0800 Committed r178964: <http://trac.webkit.org/changeset/178964> 245170 2015-01-22 15:15:02 -0800 2015-01-22 15:19:07 -0800 Patch bug-140789-20150122151510.patch text/plain 6142 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWQ0MGYwNDU3NzMzNjdh OGJlMTQ2NWQ3ZWNiMGMzOWMzNjMzZWMwNy4uYWI3NTMyYzU4NjE3ZmJiNjUzMjYyMTE2OTgyNmI0 NmM4MDUzODU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE1LTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBSZXNldCBMaW5lU3RhdGUgd2hlbiBzdGFydGluZyBhIG5ldyBsaW5lLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNzg5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzZXQgTGluZVN0YXRlIHdoZW4g c3RhcnRpbmcgYSBuZXcgbGluZSB0byBlbnN1cmUgd2UgYWx3YXlzCisgICAgICAgIHN0YXJ0IHdp dGggYSBjbGVhbiBzdGF0ZS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OnVwZGF0ZUxpbmVDb25zdHJhaW5zKToKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmluaXRpYWxpemVOZXdMaW5lKToKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OnNwbGl0RnJhZ21lbnRUb0ZpdExpbmUpOgorICAg ICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y3JlYXRlVGV4dFJ1bnMpOgorCisyMDE1 LTAxLTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKICAgICAgICAgU2ltcGxl IGxpbmUgbGF5b3V0OiBNYWtlIHRyYWlsaW5nIHdoaXRlc3BhY2UgaGFuZGxpbmcgbW9yZSBleHBs aWNpdC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MDc3NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAK aW5kZXggMjQ3MjJmOTFkNWI3ZjAxN2RiOTkzMGQyYTU5OTVmNzI0ZjUyMjc4Mi4uMWUyYWJkMzI4 MDM3YzQ4ZWIzM2Q0NDIxYzFkOTQ3NzExMDdjMjRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtMzUwLDIxICszNTAsMzYgQEAgc3RhdGlj IHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlv dXQ6OlJ1blZlY3RvciYgbGkKICAgICAgICAgKytsaW5lU3RhdGUucG9zaXRpb247CiB9CiAKLXN0 YXRpYyB2b2lkIGluaXRpYWxpemVOZXdMaW5lKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBjb25zdCBG bG93Q29udGVudHMmIGZsb3dDb250ZW50cywgdW5zaWduZWQgbGluZVN0YXJ0UnVuSW5kZXgpCitz dGF0aWMgdm9pZCB1cGRhdGVMaW5lQ29uc3RyYWlucyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZs b3csIGZsb2F0JiBhdmFpbGFibGVXaWR0aCwgZmxvYXQmIGxvZ2ljYWxMZWZ0T2Zmc2V0KQogewor ICAgIExheW91dFVuaXQgaGVpZ2h0ID0gZmxvdy5sb2dpY2FsSGVpZ2h0KCk7CisgICAgTGF5b3V0 VW5pdCBsb2dpY2FsSGVpZ2h0ID0gZmxvdy5taW5MaW5lSGVpZ2h0Rm9yUmVwbGFjZWRSZW5kZXJl cihmYWxzZSwgMCk7CisgICAgZmxvYXQgbG9naWNhbFJpZ2h0T2Zmc2V0ID0gZmxvdy5sb2dpY2Fs UmlnaHRPZmZzZXRGb3JMaW5lKGhlaWdodCwgZmFsc2UsIGxvZ2ljYWxIZWlnaHQpOworICAgIGxv Z2ljYWxMZWZ0T2Zmc2V0ID0gZmxvdy5sb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoaGVpZ2h0LCBm YWxzZSwgbG9naWNhbEhlaWdodCk7CisgICAgYXZhaWxhYmxlV2lkdGggPSBzdGQ6Om1heDxmbG9h dD4oMCwgbG9naWNhbFJpZ2h0T2Zmc2V0IC0gbG9naWNhbExlZnRPZmZzZXQpOworfQorCitzdGF0 aWMgdm9pZCBpbml0aWFsaXplTmV3TGluZShMaW5lU3RhdGUmIGxpbmVTdGF0ZSwgY29uc3QgUmVu ZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBGbG93Q29udGVudHMmIGZsb3dDb250ZW50cywgdW5z aWduZWQgbGluZVN0YXJ0UnVuSW5kZXgpCit7CisgICAgTGluZVN0YXRlIHByZXZpb3VzTGluZSA9 IGxpbmVTdGF0ZTsKKworICAgIGxpbmVTdGF0ZSA9IExpbmVTdGF0ZSgpOworICAgIGxpbmVTdGF0 ZS5qdW1wVG8ocHJldmlvdXNMaW5lLnBvc2l0aW9uLCAwKTsKICAgICBsaW5lU3RhdGUubGluZVN0 YXJ0UnVuSW5kZXggPSBsaW5lU3RhcnRSdW5JbmRleDsKKyAgICB1cGRhdGVMaW5lQ29uc3RyYWlu cyhmbG93LCBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGgsIGxpbmVTdGF0ZS5sb2dpY2FsTGVmdE9m ZnNldCk7CiAgICAgLy8gU2tpcCBsZWFkaW5nIHdoaXRlc3BhY2UgaWYgY29sbGFwc2luZyB3aGl0 ZXNwYWNlLCB1bmxlc3MgdGhlcmUncyBhbiB1bmNvbW1pdHRlZCBmcmFnbWVudCBwdXNoZWQgZnJv bSB0aGUgcHJldmlvdXMgbGluZS4KICAgICAvLyBGSVhNRTogQmUgc21hcnRlciB3aGVuIHRoZSBy dW4gZnJvbSB0aGUgcHJldmlvdXMgbGluZSBkb2VzIG5vdCBmaXQgdGhlIGN1cnJlbnQgbGluZS4g UmlnaHQgbm93LCB3ZSBqdXN0IHJlcHJvY2VzcyBpdC4KLSAgICBpZiAobGluZVN0YXRlLm92ZWZs b3dlZEZyYWdtZW50LndpZHRoKSB7Ci0gICAgICAgIGlmIChsaW5lU3RhdGUuZml0cyhsaW5lU3Rh dGUub3ZlZmxvd2VkRnJhZ21lbnQud2lkdGgpKQotICAgICAgICAgICAgbGluZVN0YXRlLmFkZFVu Y29tbWl0dGVkKGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVudCk7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIGxpbmVTdGF0ZS5qdW1wVG8obGluZVN0YXRlLm92ZWZsb3dlZEZyYWdtZW50LnN0 YXJ0LCAwKTsgLy8gU3RhcnQgb3ZlciB3aXRoIHRoaXMgZnJhZ21lbnQuCisgICAgaWYgKHByZXZp b3VzTGluZS5vdmVmbG93ZWRGcmFnbWVudC53aWR0aCkgeworICAgICAgICBpZiAobGluZVN0YXRl LmZpdHMocHJldmlvdXNMaW5lLm92ZWZsb3dlZEZyYWdtZW50LndpZHRoKSkKKyAgICAgICAgICAg IGxpbmVTdGF0ZS5hZGRVbmNvbW1pdHRlZChwcmV2aW91c0xpbmUub3ZlZmxvd2VkRnJhZ21lbnQp OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIC8vIFN0YXJ0IG92ZXIgd2l0aCB0aGlzIGZy YWdtZW50LgorICAgICAgICAgICAgbGluZVN0YXRlLmp1bXBUbyhwcmV2aW91c0xpbmUub3ZlZmxv d2VkRnJhZ21lbnQuc3RhcnQsIDApOworICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAg dW5zaWduZWQgc3BhY2VDb3VudCA9IDA7Ci0gICAgICAgIGxpbmVTdGF0ZS5qdW1wVG8oZmxvd0Nv bnRlbnRzLnN0eWxlKCkuY29sbGFwc2VXaGl0ZXNwYWNlID8gZmxvd0NvbnRlbnRzLmZpbmROZXh0 Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKGxpbmVTdGF0ZS5wb3NpdGlvbiwgc3BhY2VDb3VudCkgOiBs aW5lU3RhdGUucG9zaXRpb24sIDApOworICAgICAgICBsaW5lU3RhdGUuanVtcFRvKGZsb3dDb250 ZW50cy5zdHlsZSgpLmNvbGxhcHNlV2hpdGVzcGFjZSA/IGZsb3dDb250ZW50cy5maW5kTmV4dE5v bldoaXRlc3BhY2VQb3NpdGlvbihwcmV2aW91c0xpbmUucG9zaXRpb24sIHNwYWNlQ291bnQpIDog cHJldmlvdXNMaW5lLnBvc2l0aW9uLCAwKTsKICAgICB9Ci0gICAgbGluZVN0YXRlLm92ZWZsb3dl ZEZyYWdtZW50ID0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQoKTsKIH0KIAogc3RhdGljIEZs b3dDb250ZW50czo6VGV4dEZyYWdtZW50IHNwbGl0RnJhZ21lbnRUb0ZpdExpbmUoRmxvd0NvbnRl bnRzOjpUZXh0RnJhZ21lbnQmIGZyYWdtZW50VG9TcGxpdCwgZmxvYXQgYXZhaWxhYmxlV2lkdGgs IGJvb2wga2VlcEF0TGVhc3RPbmVDaGFyYWN0ZXIsIGNvbnN0IEZsb3dDb250ZW50cyYgZmxvd0Nv bnRlbnRzKQpAQCAtNDAxLDcgKzQxNiw3IEBAIHN0YXRpYyBGbG93Q29udGVudHM6OlRleHRGcmFn bWVudCBzcGxpdEZyYWdtZW50VG9GaXRMaW5lKEZsb3dDb250ZW50czo6VGV4dEZyYWdtCiAgICAg ICAgICsrcmlnaHQ7CiAgICAgRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQgZnJhZ21lbnRGb3JO ZXh0TGluZShmcmFnbWVudFRvU3BsaXQpOwogICAgIGZyYWdtZW50VG9TcGxpdC5lbmQgPSByaWdo dDsKLSAgICBmcmFnbWVudFRvU3BsaXQud2lkdGggPSBmcmFnbWVudFRvU3BsaXQuaXNFbXB0eSgp ID8gMCA6IGZsb3dDb250ZW50cy50ZXh0V2lkdGgoZnJhZ21lbnRUb1NwbGl0LnN0YXJ0LCByaWdo dCwgMCk7CisgICAgZnJhZ21lbnRUb1NwbGl0LndpZHRoID0gZnJhZ21lbnRUb1NwbGl0LmlzRW1w dHkoKSA/IDAgOiBmbG93Q29udGVudHMudGV4dFdpZHRoKGZyYWdtZW50VG9TcGxpdC5zdGFydCwg ZnJhZ21lbnRUb1NwbGl0LmVuZCwgMCk7CiAKICAgICBmcmFnbWVudEZvck5leHRMaW5lLnN0YXJ0 ID0gZnJhZ21lbnRUb1NwbGl0LmVuZDsKICAgICBmcmFnbWVudEZvck5leHRMaW5lLndpZHRoIC09 IGZyYWdtZW50VG9TcGxpdC53aWR0aDsKQEAgLTUwOSwxNSArNTI0LDYgQEAgc3RhdGljIHZvaWQg c3BsaXRSdW5zQXRSZW5kZXJlckJvdW5kYXJ5KExheW91dDo6UnVuVmVjdG9yJiBsaW5lUnVucywg Y29uc3QgRmxvd0MKICAgICB9IHdoaWxlICgrK3J1bkluZGV4IDwgbGluZVJ1bnMuc2l6ZSgpKTsK IH0KIAotc3RhdGljIHZvaWQgdXBkYXRlTGluZUNvbnN0cmFpbnMoY29uc3QgUmVuZGVyQmxvY2tG bG93JiBmbG93LCBmbG9hdCYgYXZhaWxhYmxlV2lkdGgsIGZsb2F0JiBsb2dpY2FsTGVmdE9mZnNl dCkKLXsKLSAgICBMYXlvdXRVbml0IGhlaWdodCA9IGZsb3cubG9naWNhbEhlaWdodCgpOwotICAg IExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IGZsb3cubWluTGluZUhlaWdodEZvclJlcGxhY2Vk UmVuZGVyZXIoZmFsc2UsIDApOwotICAgIGZsb2F0IGxvZ2ljYWxSaWdodE9mZnNldCA9IGZsb3cu bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIGZhbHNlLCBsb2dpY2FsSGVpZ2h0KTsK LSAgICBsb2dpY2FsTGVmdE9mZnNldCA9IGZsb3cubG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGhl aWdodCwgZmFsc2UsIGxvZ2ljYWxIZWlnaHQpOwotICAgIGF2YWlsYWJsZVdpZHRoID0gc3RkOjpt YXg8ZmxvYXQ+KDAsIGxvZ2ljYWxSaWdodE9mZnNldCAtIGxvZ2ljYWxMZWZ0T2Zmc2V0KTsKLX0K LQogc3RhdGljIHZvaWQgY3JlYXRlVGV4dFJ1bnMoTGF5b3V0OjpSdW5WZWN0b3ImIHJ1bnMsIFJl bmRlckJsb2NrRmxvdyYgZmxvdywgdW5zaWduZWQmIGxpbmVDb3VudCkKIHsKICAgICBMYXlvdXRV bml0IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUgPSBmbG93LmJvcmRlckFuZFBhZGRpbmdCZWZvcmUo KTsKQEAgLTUyOCw4ICs1MzQsNyBAQCBzdGF0aWMgdm9pZCBjcmVhdGVUZXh0UnVucyhMYXlvdXQ6 OlJ1blZlY3RvciYgcnVucywgUmVuZGVyQmxvY2tGbG93JiBmbG93LCB1bnNpZwogCiAgICAgZG8g ewogICAgICAgICBmbG93LnNldExvZ2ljYWxIZWlnaHQobGluZUhlaWdodCAqIGxpbmVDb3VudCAr IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUpOwotICAgICAgICB1cGRhdGVMaW5lQ29uc3RyYWlucyhm bG93LCBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGgsIGxpbmVTdGF0ZS5sb2dpY2FsTGVmdE9mZnNl dCk7Ci0gICAgICAgIGluaXRpYWxpemVOZXdMaW5lKGxpbmVTdGF0ZSwgZmxvd0NvbnRlbnRzLCBy dW5zLnNpemUoKSk7CisgICAgICAgIGluaXRpYWxpemVOZXdMaW5lKGxpbmVTdGF0ZSwgZmxvdywg Zmxvd0NvbnRlbnRzLCBydW5zLnNpemUoKSk7CiAgICAgICAgIGlzRW5kT2ZDb250ZW50ID0gY3Jl YXRlTGluZVJ1bnMobGluZVN0YXRlLCBydW5zLCBmbG93Q29udGVudHMpOwogICAgICAgICBjbG9z ZUxpbmVFbmRpbmdBbmRBZGp1c3RSdW5zKGxpbmVTdGF0ZSwgcnVucywgbGluZUNvdW50LCBmbG93 Q29udGVudHMpOwogICAgIH0gd2hpbGUgKCFpc0VuZE9mQ29udGVudCk7Cg==