140834 2015-01-23 12:54:48 -0800 Simple line layout: Refactor line wrapping logic. 2015-01-23 17:13:54 -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 1063751 0 zalan 2015-01-23 12:54:48 -0800 to make it more readable. 1063768 1 245244 zalan 2015-01-23 14:10:40 -0800 Created attachment 245244 Patch 1063829 2 245244 commit-queue 2015-01-23 17:13:49 -0800 Comment on attachment 245244 Patch Clearing flags on attachment: 245244 Committed r179048: <http://trac.webkit.org/changeset/179048> 1063830 3 commit-queue 2015-01-23 17:13:54 -0800 All reviewed patches have been landed. Closing bug. 245244 2015-01-23 14:10:40 -0800 2015-01-23 17:13:49 -0800 Patch bug-140834-20150123141042.patch text/plain 7067 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBlYWFmZDI2ZjdjYjkz MmYwNjFjMDFiYjFmNmU2Yzg4ZmFjZDJiMC4uMDdmYTgzNTA4NmM2NGU2Mjk1YzEzM2U5NTcyYzdl NTIyZDFlYTk3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBSZWZhY3RvciBsaW5lIHdyYXBwaW5nIGxvZ2ljLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwODM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgbW9yZSByZWFkYWJsZSBzdHJ1Y3R1cmUgdG8g ZGVhbCB3aXRoIHdyYXBwaW5nIGxvZ2ljLiAKKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rp b25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZUxpbmVSdW5zKToKKwogMjAx NS0wMS0yMyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIExldmVy YWdlIENTU1ZhbHVlUG9vbCdzIGZvbnQgZmFtaWx5IGNhY2hlIGluIENTU0NvbXB1dGVkU3R5bGVE ZWNsYXJhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQu Y3BwCmluZGV4IDQwZWY1ODc0OWFiYzg3YjQ0OTQyZjkyZGM4NmEwZTI2Mjg0MzQ3NjkuLjFkNWI0 Zjc3ZmU3ZTFmODhhMDE2M2Q5ZDdkN2E1MTI0MTEwNDM0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKQEAgLTQzOSw0MSArNDM5LDUwIEBAIHN0 YXRpYyBib29sIGNyZWF0ZUxpbmVSdW5zKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1 blZlY3RvciYgbGluZVJ1bnMsIGNvCiAgICAgY29uc3QgYXV0byYgc3R5bGUgPSBmbG93Q29udGVu dHMuc3R5bGUoKTsKICAgICBib29sIGxpbmVDYW5CZVdyYXBwZWQgPSBzdHlsZS53cmFwTGluZXMg fHwgc3R5bGUuYnJlYWtXb3JkT25PdmVyZmxvdzsKICAgICB3aGlsZSAoIWZsb3dDb250ZW50cy5p c0VuZChsaW5lU3RhdGUucG9zaXRpb24pKSB7Ci0gICAgICAgIC8vIEZpbmQgdGhlIG5leHQgdGV4 dCBmcmFnbWVudC4gU3RhcnQgZnJvbSB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBmcmFnbWVudCAt Y3VycmVudCBsaW5lIGVuZC4KLSAgICAgICAgRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQgZnJh Z21lbnQgPSBmbG93Q29udGVudHMubmV4dFRleHRGcmFnbWVudChsaW5lU3RhdGUucG9zaXRpb24s IGxpbmVTdGF0ZS53aWR0aCgpKTsKLSAgICAgICAgaWYgKChsaW5lQ2FuQmVXcmFwcGVkICYmICFs aW5lU3RhdGUuZml0cyhmcmFnbWVudC53aWR0aCkpIHx8IGZyYWdtZW50LnR5cGUgPT0gRmxvd0Nv bnRlbnRzOjpUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhaykgeworICAgICAgICAvLyBGaW5kIHRoZSBu ZXh0IHRleHQgZnJhZ21lbnQuCisgICAgICAgIGF1dG8gZnJhZ21lbnQgPSBmbG93Q29udGVudHMu bmV4dFRleHRGcmFnbWVudChsaW5lU3RhdGUucG9zaXRpb24sIGxpbmVTdGF0ZS53aWR0aCgpKTsK KyAgICAgICAgLy8gSGFyZCBsaW5lYnJlYWsuCisgICAgICAgIGlmIChmcmFnbWVudC50eXBlID09 IEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50OjpMaW5lQnJlYWspIHsKKyAgICAgICAgICAgIGlm IChsaW5lU3RhdGUud2lkdGgoKSkgeworICAgICAgICAgICAgICAgIC8vIE5vIG5lZWQgdG8gYWRk IHRoZSBuZXcgbGluZSBmcmFnbWVudCBpZiB0aGVyZSdzIGFscmVhZHkgY29udGVudCBvbiB0aGUg bGluZS4gV2UgYXJlIGFib3V0IHRvIGNsb3NlIHRoaXMgbGluZSBhbnl3YXkuCisgICAgICAgICAg ICAgICAgKytsaW5lU3RhdGUucG9zaXRpb247CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICBsaW5lU3RhdGUuYWRkVW5jb21taXR0ZWQoZnJhZ21lbnQpOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGxpbmVDYW5CZVdyYXBwZWQgJiYgIWxpbmVT dGF0ZS5maXRzKGZyYWdtZW50LndpZHRoKSkgewogICAgICAgICAgICAgLy8gT3ZlcmZsb3cgd3Jh cHBpbmcgYmVoYXZpb3VyOgotICAgICAgICAgICAgLy8gMS4gTmV3bGluZSBjaGFyYWN0ZXI6IHdy YXBzIHRoZSBsaW5lIHVubGVzcyBpdCdzIHRyZWF0ZWQgYXMgd2hpdGVzcGFjZS4KLSAgICAgICAg ICAgIC8vIDIuIFdoaXRlc2FwY2UgY29sbGFwc2Ugb246IHdoaXRlc3BhY2UgaXMgc2tpcHBlZC4K LSAgICAgICAgICAgIC8vIDMuIFdoaXRlc3BhY2UgY29sbGFwc2Ugb2ZmOiB3aGl0ZXNwYWNlIGlz IHdyYXBwZWQuCi0gICAgICAgICAgICAvLyA0LiBGaXJzdCwgbm9uLXdoaXRlc3BhY2UgZnJhZ21l bnQgaXMgZWl0aGVyIHdyYXBwZWQgb3Iga2VwdCBvbiB0aGUgbGluZS4gKGRlcGVuZHMgb24gb3Zl cmZsb3ctd3JhcCkKLSAgICAgICAgICAgIC8vIDUuIE5vbi13aGl0ZXNwYWNlIGZyYWdtZW50IHdo ZW4gdGhlcmUncyBhbHJlYWR5IGFub3RoZXIgZnJhZ21lbnQgb24gdGhlIGxpbmUgZ2V0cyBwdXNo ZWQgdG8gdGhlIG5leHQgbGluZS4KLSAgICAgICAgICAgIGJvb2wgaXNGaXJzdEZyYWdtZW50ID0g IWxpbmVTdGF0ZS53aWR0aCgpOwotICAgICAgICAgICAgaWYgKGZyYWdtZW50LnR5cGUgPT0gRmxv d0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhaykgewotICAgICAgICAgICAgICAgIGlm IChpc0ZpcnN0RnJhZ21lbnQpCi0gICAgICAgICAgICAgICAgICAgIGxpbmVTdGF0ZS5hZGRVbmNv bW1pdHRlZChmcmFnbWVudCk7Ci0gICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAg ICAgICAgIC8vIE5vIG5lZWQgdG8gYWRkIHRoZSBuZXcgbGluZSBmcmFnbWVudCBpZiB0aGVyZSdz IGFscmVhZHkgY29udGVudCBvbiB0aGUgbGluZS4gV2UgYXJlIGFib3V0IHRvIGNsb3NlIHRoaXMg bGluZSBhbnl3YXkuCi0gICAgICAgICAgICAgICAgICAgICsrbGluZVN0YXRlLnBvc2l0aW9uOwot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3R5bGUuY29sbGFwc2VX aGl0ZXNwYWNlICYmIGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6 OldoaXRlc3BhY2UpIHsKLSAgICAgICAgICAgICAgICAvLyBXaGl0ZXNwYWNlIGNvbGxhcHNlIGlz IG9uOiB3aGl0ZXNwYWNlIHRoYXQgZG9lc24ndCBmaXQgaXMgc2ltcGx5IHNraXBwZWQuCi0gICAg ICAgICAgICAgICAgbGluZVN0YXRlLnBvc2l0aW9uID0gZnJhZ21lbnQuZW5kOwotICAgICAgICAg ICAgfSBlbHNlIGlmIChmcmFnbWVudC50eXBlID09IEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50 OjpXaGl0ZXNwYWNlIHx8ICgoaXNGaXJzdEZyYWdtZW50ICYmIHN0eWxlLmJyZWFrV29yZE9uT3Zl cmZsb3cpIHx8ICFzdHlsZS53cmFwTGluZXMpKSB7IC8vICFzdHlsZS53cmFwTGluZXM6IGJ1ZzEz ODEwMihwcmVzZXJ2ZSBleGlzdGluZyBiZWhhdmlvcikKLSAgICAgICAgICAgICAgICAvLyBXaGl0 ZXNwYWNlIGNvbGxhcHNlIGlzIG9mZiBvciBub24td2hpdGVzcGFjZSBjb250ZW50LiBzcGxpdCB0 aGUgZnJhZ21lbnQ7IChtb2RpZmllZClmcmFnbWVudCAtPiB0aGlzIGxpbmVTdGF0ZSwgb3ZlZmxv d2VkRnJhZ21lbnQgLT4gbmV4dCBsaW5lLgotICAgICAgICAgICAgICAgIC8vIFdoZW4gdGhpcyBp cyB0aGUgb25seSAoZmlyc3QpIGZyYWdtZW50LCB0aGUgZmlyc3QgY2hhcmFjdGVyIHN0YXlzIG9u IHRoZSBsaW5lLCBldmVuIGlmIGl0IGRvZXMgbm90IGZpdC4KLSAgICAgICAgICAgICAgICBsaW5l U3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBzcGxpdEZyYWdtZW50VG9GaXRMaW5lKGZyYWdtZW50 LCBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGggLSBsaW5lU3RhdGUud2lkdGgoKSwgaXNGaXJzdEZy YWdtZW50LCBmbG93Q29udGVudHMpOwotICAgICAgICAgICAgICAgIGlmICghZnJhZ21lbnQuaXNF bXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIFdoaXRlc3BhY2UgZnJhZ21lbnRzIGNh biBnZXQgcHVzaGVkIGVudGlyZWx5IHRvIHRoZSBuZXh0IGxpbmUuCi0gICAgICAgICAgICAgICAg ICAgIGxpbmVTdGF0ZS5hZGRVbmNvbW1pdHRlZChmcmFnbWVudCk7CisgICAgICAgICAgICAvLyAx LiBXaGl0ZXNhcGNlIGNvbGxhcHNlIG9uOiB3aGl0ZXNwYWNlIGlzIHNraXBwZWQuIEp1bXAgdG8g bmV4dCBsaW5lLgorICAgICAgICAgICAgLy8gMi4gV2hpdGVzcGFjZSBjb2xsYXBzZSBvZmY6IHdo aXRlc3BhY2UgaXMgd3JhcHBlZC4KKyAgICAgICAgICAgIC8vIDMuIEZpcnN0LCBub24td2hpdGVz cGFjZSBmcmFnbWVudCBpcyBlaXRoZXIgd3JhcHBlZCBvciBrZXB0IG9uIHRoZSBsaW5lLiAoZGVw ZW5kcyBvbiBvdmVyZmxvdy13cmFwKQorICAgICAgICAgICAgLy8gNC4gTm9uLXdoaXRlc3BhY2Ug ZnJhZ21lbnQgd2hlbiB0aGVyZSdzIGFscmVhZHkgYW5vdGhlciBmcmFnbWVudCBvbiB0aGUgbGlu ZSBnZXRzIHB1c2hlZCB0byB0aGUgbmV4dCBsaW5lLgorICAgICAgICAgICAgYm9vbCBlbXB0eUxp bmUgPSAhbGluZVN0YXRlLndpZHRoKCk7CisgICAgICAgICAgICAvLyBXaGl0ZXNwYWNlIGZyYWdt ZW50LgorICAgICAgICAgICAgaWYgKGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0 RnJhZ21lbnQ6OldoaXRlc3BhY2UpIHsKKyAgICAgICAgICAgICAgICBpZiAoc3R5bGUuY29sbGFw c2VXaGl0ZXNwYWNlKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIFdoaXRlc3BhY2UgY29sbGFw c2UgaXMgb246IHdoaXRlc3BhY2UgdGhhdCBkb2Vzbid0IGZpdCBpcyBzaW1wbHkgc2tpcHBlZC4K KyAgICAgICAgICAgICAgICAgICAgbGluZVN0YXRlLnBvc2l0aW9uID0gZnJhZ21lbnQuZW5kOwor ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICB9IGVsc2UgaWYgKGlzRmlyc3RGcmFnbWVudCkgewotICAgICAgICAgICAgICAgIC8vIE5vbi1i cmVha2FibGUgbm9uLXdoaXRlc3BhY2UgZmlyc3QgZnJhZ21lbnQuIEFkZCBpdCB0byB0aGUgY3Vy cmVudCBsaW5lLiAtaXQgb3ZlcmZsb3dzIHRob3VnaC4KKyAgICAgICAgICAgICAgICAvLyBTcGxp dCB0aGUgZnJhZ21lbnQ7IChtb2RpZmllZClmcmFnbWVudCBzdGF5cyBvbiB0aGlzIGxpbmUsIG92 ZWZsb3dlZEZyYWdtZW50IGlzIHB1c2hlZCB0byBuZXh0IGxpbmUuCisgICAgICAgICAgICAgICAg bGluZVN0YXRlLm92ZWZsb3dlZEZyYWdtZW50ID0gc3BsaXRGcmFnbWVudFRvRml0TGluZShmcmFn bWVudCwgbGluZVN0YXRlLmF2YWlsYWJsZVdpZHRoIC0gbGluZVN0YXRlLndpZHRoKCksIGVtcHR5 TGluZSwgZmxvd0NvbnRlbnRzKTsKKyAgICAgICAgICAgICAgICBsaW5lU3RhdGUuYWRkVW5jb21t aXR0ZWQoZnJhZ21lbnQpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgLy8gTm9uLXdoaXRlc3BhY2UgZnJhZ21lbnQuICghc3R5bGUud3JhcExpbmVz OiBidWcxMzgxMDIocHJlc2VydmUgZXhpc3RpbmcgYmVoYXZpb3IpCisgICAgICAgICAgICBpZiAo KGVtcHR5TGluZSAmJiBzdHlsZS5icmVha1dvcmRPbk92ZXJmbG93KSB8fCAhc3R5bGUud3JhcExp bmVzKSB7CisgICAgICAgICAgICAgICAgLy8gU3BsaXQgdGhlIGZyYWdtZW50OyAobW9kaWZpZWQp ZnJhZ21lbnQgc3RheXMgb24gdGhpcyBsaW5lLCBvdmVmbG93ZWRGcmFnbWVudCBpcyBwdXNoZWQg dG8gbmV4dCBsaW5lLgorICAgICAgICAgICAgICAgIGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVu dCA9IHNwbGl0RnJhZ21lbnRUb0ZpdExpbmUoZnJhZ21lbnQsIGxpbmVTdGF0ZS5hdmFpbGFibGVX aWR0aCAtIGxpbmVTdGF0ZS53aWR0aCgpLCBlbXB0eUxpbmUsIGZsb3dDb250ZW50cyk7CisgICAg ICAgICAgICAgICAgbGluZVN0YXRlLmFkZFVuY29tbWl0dGVkKGZyYWdtZW50KTsKKyAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8vIE5vbi1icmVha2Fi bGUgbm9uLXdoaXRlc3BhY2UgZmlyc3QgZnJhZ21lbnQuIEFkZCBpdCB0byB0aGUgY3VycmVudCBs aW5lLiAtaXQgb3ZlcmZsb3dzIHRob3VnaC4KKyAgICAgICAgICAgIGlmIChlbXB0eUxpbmUpIHsK ICAgICAgICAgICAgICAgICBsaW5lU3RhdGUuYWRkVW5jb21taXR0ZWQoZnJhZ21lbnQpOwotICAg ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBOb24tYnJlYWthYmxlIG5vbi13 aGl0ZXNwYWNlIGZyYWdtZW50IHdoZW4gdGhlcmUncyBhbHJlYWR5IGEgZnJhZ21lbnQgb24gdGhl IGxpbmUuIFB1c2ggaXQgdG8gdGhlIG5leHQgbGluZS4KLSAgICAgICAgICAgICAgICBsaW5lU3Rh dGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBmcmFnbWVudDsKKyAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8vIE5vbi1icmVha2FibGUgbm9uLXdoaXRlc3Bh Y2UgZnJhZ21lbnQgd2hlbiB0aGVyZSdzIGFscmVhZHkgY29udGVudCBvbiB0aGUgbGluZS4gUHVz aCBpdCB0byB0aGUgbmV4dCBsaW5lLgorICAgICAgICAgICAgbGluZVN0YXRlLm92ZWZsb3dlZEZy YWdtZW50ID0gZnJhZ21lbnQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAg ICAvLyBXaGVuIHRoZSBjdXJyZW50IGZyYWdtZW50IGlzIGNvbGxhcHNlZCB3aGl0ZXNwYWNlLCB3 ZSBuZWVkIHRvIGNyZWF0ZSBhIHJ1biBmb3Igd2hhdCB3ZSd2ZSBwcm9jZXNzZWQgc28gZmFyLgo=