139035 2014-11-24 15:25:09 -0800 Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak 2014-11-24 17:00:42 -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 kondapallykalyan mmaxfield oldest_to_newest 1050899 0 zalan 2014-11-24 15:25:09 -0800 and move logic to FlowContents. This is in preparation to support <br>. 1050900 1 242178 zalan 2014-11-24 15:32:17 -0800 Created attachment 242178 Patch 1050918 2 242178 commit-queue 2014-11-24 16:22:52 -0800 Comment on attachment 242178 Patch Rejecting attachment 242178 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 242178, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 9712efb79390b7a1afa94a8d5596cacc06d r176525 = 7076abaf2ba8b671c65abbdbd28ac975c12ba0c7 r176526 = ef27ea42f08d6334a7a12e2ba94282e6e5869e30 r176527 = 62bd3d223a98992992e47c5c037ecdc6e7665f0d r176528 = 5ae60b7a58d7bbb0ba241fc0a6e01bc434adaedd r176529 = c44f54edffa8a4d06bb67881fce44e4c9b7a724a Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.appspot.com/results/5886013125689344 1050929 3 zalan 2014-11-24 17:00:42 -0800 Committed r176531: <http://trac.webkit.org/changeset/176531> 242178 2014-11-24 15:32:17 -0800 2014-11-24 16:22:52 -0800 Patch bug-139035-20141124153237.patch text/plain 6852 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI1OTM1NmQ2OGQxZTBi NTU5ODM4YzNlZjRmZmZmMWRjZGQ1NjI2Yy4uMDA4YTBjYjYxZDllOTUwMmY4MjFjOTc1NDU3MzA5 YzBmYWI4ZGM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBSZW5hbWUgVGV4dEZyYWdtZW50OjptdXN0QnJlYWsgdG8gVGV4dEZyYWdtZW50Ojppc0xpbmVC cmVhaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5 MDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92 ZSBuZXcgbGluZSBsb2dpYyB0byBGbG93Q29udGVudHMgY2xhc3MuCisgICAgICAgIFRoaXMgaXMg aW4gcHJlcGFyYXRpb24gdG8gc3VwcG9ydCA8YnI+LgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBm dW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6VGV4dEZyYWdtZW50OjpUZXh0 RnJhZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6cmVtb3ZlVHJh aWxpbmdXaGl0ZXNwYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6Om5l eHRGcmFnbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpjcmVhdGVM aW5lUnVucyk6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVu dHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6 aXNOZXdsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250 ZW50czo6aXNOZXdsaW5lQ2hhcmFjdGVyKTogRGVsZXRlZC4KKwogMjAxNC0xMS0yNCAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBTdHls ZSBzdHJ1Y3QgZnJvbSBTaW1wbGVMaW5lTGF5b3V0LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCmluZGV4IDMwNjkwNDcxYjBiYzQwMTdmM2M0ZTRj MGQ3M2VhNjg0MTFhZmMxN2QuLjJlN2NiOTg4ZDhjZDM5MWE3MmY4YTQ3ZDIwMTlmNzAzNjFiYjYy MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAK QEAgLTIyMyw3ICsyMjMsNyBAQCBzdHJ1Y3QgVGV4dEZyYWdtZW50IHsKICAgICAgICAgLCBlbmQo MCkKICAgICAgICAgLCBpc1doaXRlc3BhY2VPbmx5KGZhbHNlKQogICAgICAgICAsIGlzQnJlYWth YmxlKGZhbHNlKQotICAgICAgICAsIG11c3RCcmVhayhmYWxzZSkKKyAgICAgICAgLCBpc0xpbmVC cmVhayhmYWxzZSkKICAgICAgICAgLCB3aWR0aCgwKQogICAgIHsKICAgICB9CkBAIC0yMzQsNyAr MjM0LDcgQEAgc3RydWN0IFRleHRGcmFnbWVudCB7CiAgICAgICAgICwgZW5kKHRleHRFbmQpCiAg ICAgICAgICwgaXNXaGl0ZXNwYWNlT25seShpc1doaXRlc3BhY2VPbmx5KQogICAgICAgICAsIGlz QnJlYWthYmxlKGZhbHNlKQotICAgICAgICAsIG11c3RCcmVhayhmYWxzZSkKKyAgICAgICAgLCBp c0xpbmVCcmVhayhmYWxzZSkKICAgICAgICAgLCB3aWR0aCh0ZXh0V2lkdGgpCiAgICAgewogICAg IH0KQEAgLTI0OSw3ICsyNDksNyBAQCBzdHJ1Y3QgVGV4dEZyYWdtZW50IHsKICAgICB1bnNpZ25l ZCBlbmQgOiAzMTsKICAgICBib29sIGlzV2hpdGVzcGFjZU9ubHkgOiAxOwogICAgIGJvb2wgaXNC cmVha2FibGU7Ci0gICAgYm9vbCBtdXN0QnJlYWs7CisgICAgYm9vbCBpc0xpbmVCcmVhazsKICAg ICBmbG9hdCB3aWR0aDsKIH07CiAKQEAgLTM4Niw3ICszODYsNyBAQCBzdGF0aWMgdm9pZCByZW1v dmVUcmFpbGluZ1doaXRlc3BhY2UoTGluZVN0YXRlJiBsaW5lU3RhdGUsIExheW91dDo6UnVuVmVj dG9yJiBsaQogICAgIH0KIAogICAgIC8vIElmIHdlIHNraXBwZWQgYW55IHdoaXRlc3BhY2UgYW5k IG5vdyB0aGUgbGluZSBlbmQgaXMgYSAicHJlc2VydmVkIiBuZXdsaW5lLCBza2lwIHRoZSBuZXds aW5lIHRvbyBhcyB3ZSBhcmUgd3JhcHBpbmcgdGhlIGxpbmUgaGVyZSBhbHJlYWR5LgotICAgIGlm IChsYXN0UG9zaXRpb24gIT0gbGluZVN0YXRlLnBvc2l0aW9uICYmIHN0eWxlLnByZXNlcnZlTmV3 bGluZSAmJiAhZmxvd0NvbnRlbnRzLmlzRW5kKGxpbmVTdGF0ZS5wb3NpdGlvbikgJiYgZmxvd0Nv bnRlbnRzLmlzTmV3bGluZUNoYXJhY3RlcihsaW5lU3RhdGUucG9zaXRpb24pKQorICAgIGlmIChs YXN0UG9zaXRpb24gIT0gbGluZVN0YXRlLnBvc2l0aW9uICYmIHN0eWxlLnByZXNlcnZlTmV3bGlu ZSAmJiAhZmxvd0NvbnRlbnRzLmlzRW5kKGxpbmVTdGF0ZS5wb3NpdGlvbikgJiYgZmxvd0NvbnRl bnRzLmlzTGluZUJyZWFrKGxpbmVTdGF0ZS5wb3NpdGlvbikpCiAgICAgICAgICsrbGluZVN0YXRl LnBvc2l0aW9uOwogfQogCkBAIC00NTYsMTYgKzQ1NiwxNiBAQCBzdGF0aWMgVGV4dEZyYWdtZW50 IG5leHRGcmFnbWVudCh1bnNpZ25lZCBwcmV2aW91c0ZyYWdtZW50RW5kLCBjb25zdCBGbG93Q29u dGVudAogICAgIC8vIDMuIG5vbi13aGl0ZXNwYWNlIGNoYXJhY3RlcnMuCiAgICAgY29uc3QgYXV0 byYgc3R5bGUgPSBmbG93Q29udGVudHMuc3R5bGUoKTsKICAgICBUZXh0RnJhZ21lbnQgZnJhZ21l bnQ7Ci0gICAgZnJhZ21lbnQubXVzdEJyZWFrID0gc3R5bGUucHJlc2VydmVOZXdsaW5lICYmIGZs b3dDb250ZW50cy5pc05ld2xpbmVDaGFyYWN0ZXIocHJldmlvdXNGcmFnbWVudEVuZCk7CisgICAg ZnJhZ21lbnQuaXNMaW5lQnJlYWsgPSBmbG93Q29udGVudHMuaXNMaW5lQnJlYWsocHJldmlvdXNG cmFnbWVudEVuZCk7CiAgICAgdW5zaWduZWQgc3BhY2VDb3VudCA9IDA7CiAgICAgdW5zaWduZWQg d2hpdGVzcGFjZUVuZCA9IHByZXZpb3VzRnJhZ21lbnRFbmQ7Ci0gICAgaWYgKCFmcmFnbWVudC5t dXN0QnJlYWspCisgICAgaWYgKCFmcmFnbWVudC5pc0xpbmVCcmVhaykKICAgICAgICAgd2hpdGVz cGFjZUVuZCA9IGZsb3dDb250ZW50cy5maW5kTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbihwcmV2 aW91c0ZyYWdtZW50RW5kLCBzcGFjZUNvdW50KTsKICAgICBmcmFnbWVudC5pc1doaXRlc3BhY2VP bmx5ID0gcHJldmlvdXNGcmFnbWVudEVuZCA8IHdoaXRlc3BhY2VFbmQ7CiAgICAgZnJhZ21lbnQu c3RhcnQgPSBwcmV2aW91c0ZyYWdtZW50RW5kOwogICAgIGlmIChmcmFnbWVudC5pc1doaXRlc3Bh Y2VPbmx5KQogICAgICAgICBmcmFnbWVudC5lbmQgPSB3aGl0ZXNwYWNlRW5kOwotICAgIGVsc2Ug aWYgKGZyYWdtZW50Lm11c3RCcmVhaykKKyAgICBlbHNlIGlmIChmcmFnbWVudC5pc0xpbmVCcmVh aykKICAgICAgICAgZnJhZ21lbnQuZW5kID0gZnJhZ21lbnQuc3RhcnQgKyAxOwogICAgIGVsc2UK ICAgICAgICAgZnJhZ21lbnQuZW5kID0gZmxvd0NvbnRlbnRzLmZpbmROZXh0QnJlYWthYmxlUG9z aXRpb24ocHJldmlvdXNGcmFnbWVudEVuZCArIDEpOwpAQCAtNDc4LDcgKzQ3OCw3IEBAIHN0YXRp YyBUZXh0RnJhZ21lbnQgbmV4dEZyYWdtZW50KHVuc2lnbmVkIHByZXZpb3VzRnJhZ21lbnRFbmQs IGNvbnN0IEZsb3dDb250ZW50CiAgICAgdW5zaWduZWQgZnJhZ21lbnRMZW5ndGggPSBmcmFnbWVu dC5lbmQgLSBmcmFnbWVudC5zdGFydDsKICAgICBpZiAoZnJhZ21lbnQuaXNDb2xsYXBzZWRXaGl0 ZXNwYWNlKQogICAgICAgICBmcmFnbWVudC53aWR0aCA9IHN0eWxlLnNwYWNlV2lkdGg7Ci0gICAg ZWxzZSBpZiAoZnJhZ21lbnQubXVzdEJyZWFrKQorICAgIGVsc2UgaWYgKGZyYWdtZW50LmlzTGlu ZUJyZWFrKQogICAgICAgICBmcmFnbWVudC53aWR0aCA9IDA7IC8vIE5ld2xpbmUgY2hhcmFjdGVy J3Mgd2lkdGggaXMgMC4KICAgICBlbHNlIGlmIChmcmFnbWVudExlbmd0aCA9PSBzcGFjZUNvdW50 KSAvLyBTcGFjZSBvbmx5LgogICAgICAgICBmcmFnbWVudC53aWR0aCA9IHN0eWxlLnNwYWNlV2lk dGggKiBzcGFjZUNvdW50OwpAQCAtNDk0LDcgKzQ5NCw3IEBAIHN0YXRpYyBib29sIGNyZWF0ZUxp bmVSdW5zKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMs IGNvCiAgICAgd2hpbGUgKCFmbG93Q29udGVudHMuaXNFbmQobGluZVN0YXRlLnBvc2l0aW9uKSkg ewogICAgICAgICAvLyBGaW5kIHRoZSBuZXh0IHRleHQgZnJhZ21lbnQuIFN0YXJ0IGZyb20gdGhl IGVuZCBvZiB0aGUgcHJldmlvdXMgZnJhZ21lbnQgLWN1cnJlbnQgbGluZSBlbmQuCiAgICAgICAg IFRleHRGcmFnbWVudCBmcmFnbWVudCA9IG5leHRGcmFnbWVudChsaW5lU3RhdGUucG9zaXRpb24s IGZsb3dDb250ZW50cywgbGluZVN0YXRlLndpZHRoKCkpOwotICAgICAgICBpZiAoKGxpbmVDYW5C ZVdyYXBwZWQgJiYgIWxpbmVTdGF0ZS5maXRzKGZyYWdtZW50LndpZHRoKSkgfHwgZnJhZ21lbnQu bXVzdEJyZWFrKSB7CisgICAgICAgIGlmICgobGluZUNhbkJlV3JhcHBlZCAmJiAhbGluZVN0YXRl LmZpdHMoZnJhZ21lbnQud2lkdGgpKSB8fCBmcmFnbWVudC5pc0xpbmVCcmVhaykgewogICAgICAg ICAgICAgLy8gT3ZlcmZsb3cgd3JhcHBpbmcgYmVoYXZpb3VyOgogICAgICAgICAgICAgLy8gMS4g TmV3bGluZSBjaGFyYWN0ZXI6IHdyYXBzIHRoZSBsaW5lIHVubGVzcyBpdCdzIHRyZWF0ZWQgYXMg d2hpdGVzcGFjZS4KICAgICAgICAgICAgIC8vIDIuIFdoaXRlc2FwY2UgY29sbGFwc2Ugb246IHdo aXRlc3BhY2UgaXMgc2tpcHBlZC4KQEAgLTUwMiw3ICs1MDIsNyBAQCBzdGF0aWMgYm9vbCBjcmVh dGVMaW5lUnVucyhMaW5lU3RhdGUmIGxpbmVTdGF0ZSwgTGF5b3V0OjpSdW5WZWN0b3ImIGxpbmVS dW5zLCBjbwogICAgICAgICAgICAgLy8gNC4gRmlyc3QsIG5vbi13aGl0ZXNwYWNlIGZyYWdtZW50 IGlzIGVpdGhlciB3cmFwcGVkIG9yIGtlcHQgb24gdGhlIGxpbmUuIChkZXBlbmRzIG9uIG92ZXJm bG93LXdyYXApCiAgICAgICAgICAgICAvLyA1LiBOb24td2hpdGVzcGFjZSBmcmFnbWVudCB3aGVu IHRoZXJlJ3MgYWxyZWFkeSBhbm90aGVyIGZyYWdtZW50IG9uIHRoZSBsaW5lIGdldHMgcHVzaGVk IHRvIHRoZSBuZXh0IGxpbmUuCiAgICAgICAgICAgICBib29sIGlzRmlyc3RGcmFnbWVudCA9ICFs aW5lU3RhdGUud2lkdGgoKTsKLSAgICAgICAgICAgIGlmIChmcmFnbWVudC5tdXN0QnJlYWspIHsK KyAgICAgICAgICAgIGlmIChmcmFnbWVudC5pc0xpbmVCcmVhaykgewogICAgICAgICAgICAgICAg IGlmIChpc0ZpcnN0RnJhZ21lbnQpCiAgICAgICAgICAgICAgICAgICAgIGxpbmVTdGF0ZS5hZGRV bmNvbW1pdHRlZChmcmFnbWVudCk7CiAgICAgICAgICAgICAgICAgZWxzZSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMu aAppbmRleCBjMzkxYjE0NmVhYmRhNzI5NDExNGNhYTI2ZTk3ZDVjZDkwZTdkNWRhLi4xNWYyNmIz YWM1NjhhZGQwOTcyOWI0OGIyOGEwZDBkZmUxZmVkOTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKQEAgLTQ1 LDcgKzQ1LDcgQEAgcHVibGljOgogCiAgICAgZmxvYXQgdGV4dFdpZHRoKHVuc2lnbmVkIGZyb20s IHVuc2lnbmVkIHRvLCBmbG9hdCB4UG9zaXRpb24pIGNvbnN0OwogCi0gICAgYm9vbCBpc05ld2xp bmVDaGFyYWN0ZXIodW5zaWduZWQgcG9zaXRpb24pIGNvbnN0OworICAgIGJvb2wgaXNMaW5lQnJl YWsodW5zaWduZWQgcG9zaXRpb24pIGNvbnN0OwogICAgIGJvb2wgaXNFbmQodW5zaWduZWQgcG9z aXRpb24pIGNvbnN0OwogCiAgICAgc3RydWN0IFNlZ21lbnQgewpAQCAtODcsMTEgKzg3LDExIEBA IHByaXZhdGU6CiAgICAgbXV0YWJsZSB1bnNpZ25lZCBtX2xhc3RTZWdtZW50SW5kZXg7CiB9Owog Ci1pbmxpbmUgYm9vbCBGbG93Q29udGVudHM6OmlzTmV3bGluZUNoYXJhY3Rlcih1bnNpZ25lZCBw b3NpdGlvbikgY29uc3QKK2lubGluZSBib29sIEZsb3dDb250ZW50czo6aXNMaW5lQnJlYWsodW5z aWduZWQgcG9zaXRpb24pIGNvbnN0CiB7CiAgICAgYXBwZW5kTmV4dFJlbmRlcmVyQ29udGVudElm TmVlZGVkKHBvc2l0aW9uKTsKICAgICBBU1NFUlQocG9zaXRpb24gPCBtX2xpbmVCcmVha0l0ZXJh dG9yLnN0cmluZygpLmxlbmd0aCgpKTsKLSAgICByZXR1cm4gbV9saW5lQnJlYWtJdGVyYXRvci5z dHJpbmcoKS5hdChwb3NpdGlvbikgPT0gJ1xuJzsKKyAgICByZXR1cm4gbV9zdHlsZS5wcmVzZXJ2 ZU5ld2xpbmUgJiYgbV9saW5lQnJlYWtJdGVyYXRvci5zdHJpbmcoKS5hdChwb3NpdGlvbikgPT0g J1xuJzsKIH0KIAogaW5saW5lIGJvb2wgRmxvd0NvbnRlbnRzOjppc0VuZCh1bnNpZ25lZCBwb3Np dGlvbikgY29uc3QK