123398 2013-10-27 15:12:06 -0700 Enable center and right text alignment for simple lines 2013-10-27 16:06:11 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 943993 0 koivisto 2013-10-27 15:12:06 -0700 More coverage 943998 1 215279 koivisto 2013-10-27 15:18:17 -0700 Created attachment 215279 patch 944000 2 215279 kling 2013-10-27 15:24:46 -0700 Comment on attachment 215279 patch r=me 944004 3 koivisto 2013-10-27 16:06:11 -0700 http://trac.webkit.org/changeset/158098 215279 2013-10-27 15:18:17 -0700 2013-10-27 15:24:46 -0700 patch simple-line-text-align.patch text/plain 5415 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODA5NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTEwLTI3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBFbmFibGUgY2VudGVyIGFuZCBy aWdodCB0ZXh0IGFsaWdubWVudCBmb3Igc2ltcGxlIGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzOTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXBwb3J0IHRleHQtYWxpZ246Y2VudGVyIGFu ZCB0ZXh0LWFsaWduOnJpZ2h0IG9uIHNpbXBsZSBsaW5lIGxheW91dCBwYXRoLgorCisgICAgICAg ICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2lt cGxlTGluZUxheW91dDo6Y2FuVXNlRm9yKToKKyAgICAgICAgCisgICAgICAgICAgICB0ZXh0LWFs aWduOmp1c3RpZnkgaXMgc3RpbGwgbm90IHN1cHBvcnRlZC4KKworICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlNp bXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZUxpbmVzKToKKyAgICAgICAgCisgICAgICAgICAgICBEbyBh IHJvdW5kaW5nIGRhbmNlIHRoYXQgbWF0Y2hlcyB0aGUgbGluZSBib3hlcy4KKworICAgICAgICAq IHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Lmg6CisgICAgICAgIAorICAgICAgICAgICAgQWRk IGxlZnQgcG9zaXRpb24gdG8gbGluZXMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFJlc29sdmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpS ZXNvbHZlcjo6TGluZTo6cmVjdCk6CisgICAgICAgIAorICAgICAgICAgICAgV2Ugbm93IGRvIHJv dW5kaW5nIGR1cmluZyBsYXlvdXQuCisKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlv dXQ6OlJlc29sdmVyOjpMaW5lOjpiYXNlbGluZSk6CisKIDIwMTMtMTAtMjYgIFRpbSBIb3J0b24g IDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY10gUmVtb3ZlIFdlYlRp bGVkTGF5ZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dC5jcHAJKHJldmlzaW9uIDE1ODA4NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODgsOCArODgsNyBAQCBib29s IGNhblVzZUZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsCiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9ICpmbG93LnN0eWxl KCk7Ci0gICAgLy8gSXQgc2hvdWRuJ3QgYmUgaGFyZCB0byBzdXBwb3J0IG90aGVyIGFsaWdubWVu dHMuCi0gICAgaWYgKHN0eWxlLnRleHRBbGlnbigpICE9IExFRlQgJiYgc3R5bGUudGV4dEFsaWdu KCkgIT0gV0VCS0lUX0xFRlQgJiYgc3R5bGUudGV4dEFsaWduKCkgIT0gVEFTVEFSVCkKKyAgICBp ZiAoc3R5bGUudGV4dEFsaWduKCkgPT0gSlVTVElGWSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIC8vIE5vbi12aXNpYmxlIG92ZXJmbG93IHNob3VsZCBiZSBwcmV0dHkgZWFzeSB0byBzdXBw b3J0LgogICAgIGlmIChzdHlsZS5vdmVyZmxvd1goKSAhPSBPVklTSUJMRSB8fCBzdHlsZS5vdmVy Zmxvd1koKSAhPSBPVklTSUJMRSkKQEAgLTIxMSw2ICsyMTAsMjcgQEAgc3RhdGljIGZsb2F0IHRl eHRXaWR0aChjb25zdCBSZW5kZXJUZXh0JgogICAgIHJldHVybiBzdHlsZS5mb250KCkud2lkdGgo cnVuKTsKIH0KIAorc3RhdGljIGZsb2F0IGNvbXB1dGVMaW5lTGVmdChFVGV4dEFsaWduIHRleHRB bGlnbiwgZmxvYXQgcmVtYWluaW5nV2lkdGgpCit7CisgICAgc3dpdGNoICh0ZXh0QWxpZ24pIHsK KyAgICBjYXNlIExFRlQ6CisgICAgY2FzZSBXRUJLSVRfTEVGVDoKKyAgICBjYXNlIFRBU1RBUlQ6 CisgICAgICAgIHJldHVybiAwOworICAgIGNhc2UgUklHSFQ6CisgICAgY2FzZSBXRUJLSVRfUklH SFQ6CisgICAgY2FzZSBUQUVORDoKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4PGZsb2F0PihyZW1h aW5pbmdXaWR0aCwgMCk7CisgICAgY2FzZSBDRU5URVI6CisgICAgY2FzZSBXRUJLSVRfQ0VOVEVS OgorICAgICAgICByZXR1cm4gc3RkOjptYXg8ZmxvYXQ+KHJlbWFpbmluZ1dpZHRoIC8gMiwgMCk7 CisgICAgY2FzZSBKVVNUSUZZOgorICAgICAgICBicmVhazsKKyAgICB9CisgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKIHN0ZDo6dW5pcXVlX3B0cjxMaW5lcz4g Y3JlYXRlTGluZXMoUmVuZGVyQmxvY2tGbG93JiBmbG93KQogewogICAgIGF1dG8gbGluZXMgPSBz dGQ6Om1ha2VfdW5pcXVlPExpbmVzPigpOwpAQCAtMjIxLDYgKzI0MSw3IEBAIHN0ZDo6dW5pcXVl X3B0cjxMaW5lcz4gY3JlYXRlTGluZXMoUmVuZGUKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGUgPSAqZmxvdy5zdHlsZSgpOwogICAgIGNvbnN0IHVuc2lnbmVkIHRleHRMZW5ndGggPSB0ZXh0 UmVuZGVyZXIudGV4dExlbmd0aCgpOwogCisgICAgRVRleHRBbGlnbiB0ZXh0QWxpZ24gPSBzdHls ZS50ZXh0QWxpZ24oKTsKICAgICBmbG9hdCB3b3JkVHJhaWxpbmdTcGFjZVdpZHRoID0gc3R5bGUu Zm9udCgpLndpZHRoKFRleHRSdW4oJnNwYWNlLCAxKSk7CiAKICAgICBMYXp5TGluZUJyZWFrSXRl cmF0b3IgbGluZUJyZWFrSXRlcmF0b3IodGV4dFJlbmRlcmVyLnRleHQoKSwgc3R5bGUubG9jYWxl KCkpOwpAQCAtMjY4LDEwICsyODksMTQgQEAgc3RkOjp1bmlxdWVfcHRyPExpbmVzPiBjcmVhdGVM aW5lcyhSZW5kZQogICAgICAgICBpZiAobGluZVN0YXJ0T2Zmc2V0ID09IGxpbmVFbmRPZmZzZXQp CiAgICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBmbG9hdCBhbGlnbmVkTGVmdCA9IGNv bXB1dGVMaW5lTGVmdCh0ZXh0QWxpZ24sIGxpbmVXaWR0aC5hdmFpbGFibGVXaWR0aCgpIC0gbGlu ZVdpZHRoLmNvbW1pdHRlZFdpZHRoKCkpOworICAgICAgICBmbG9hdCBhbGlnbmVkUmlnaHQgPSBh bGlnbmVkTGVmdCArIGxpbmVXaWR0aC5jb21taXR0ZWRXaWR0aCgpOworCiAgICAgICAgIExpbmUg bGluZTsKICAgICAgICAgbGluZS50ZXh0T2Zmc2V0ID0gbGluZVN0YXJ0T2Zmc2V0OwogICAgICAg ICBsaW5lLnRleHRMZW5ndGggPSBsaW5lRW5kT2Zmc2V0IC0gbGluZVN0YXJ0T2Zmc2V0OwotICAg ICAgICBsaW5lLndpZHRoID0gbGluZVdpZHRoLmNvbW1pdHRlZFdpZHRoKCk7CisgICAgICAgIGxp bmUubGVmdCA9IGZsb29yKGFsaWduZWRMZWZ0KTsKKyAgICAgICAgbGluZS53aWR0aCA9IGNlaWwo YWxpZ25lZFJpZ2h0KSAtIGxpbmUubGVmdDsKIAogICAgICAgICBsaW5lcy0+YXBwZW5kKGxpbmUp OwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlv dXQuaAkocmV2aXNpb24gMTU4MDg3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuaAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQCBib29sIGNhblVz ZUZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmKTsKIHN0cnVjdCBMaW5lIHsKICAgICB1bnNpZ25l ZCB0ZXh0T2Zmc2V0OwogICAgIHVuc2lnbmVkIHRleHRMZW5ndGg7CisgICAgZmxvYXQgbGVmdDsK ICAgICBmbG9hdCB3aWR0aDsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmgJKHJldmlzaW9uIDE1ODA4NykKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAkod29y a2luZyBjb3B5KQpAQCAtOTgsMTUgKzk4LDE3IEBAIGlubGluZSBMYXlvdXRSZWN0IFJlc29sdmVy OjpMaW5lOjpyZWN0KCkKIHsKICAgICBhdXRvJiBsaW5lID0gbV9yZXNvbHZlci5tX2xpbmVzW21f bGluZUluZGV4XTsKIAotICAgIExheW91dFBvaW50IGxpbmVQb3NpdGlvbigwLCBtX3Jlc29sdmVy Lm1fbGluZUhlaWdodCAqIG1fbGluZUluZGV4ICsgbV9yZXNvbHZlci5tX2Jhc2VsaW5lIC0gbV9y ZXNvbHZlci5tX2FzY2VudCk7Ci0gICAgTGF5b3V0U2l6ZSBsaW5lU2l6ZShjZWlsZWRMYXlvdXRV bml0KGxpbmUud2lkdGgpLCBtX3Jlc29sdmVyLm1fYXNjZW50ICsgbV9yZXNvbHZlci5tX2Rlc2Nl bnQpOworICAgIExheW91dFBvaW50IGxpbmVQb3NpdGlvbihsaW5lLmxlZnQsIG1fcmVzb2x2ZXIu bV9saW5lSGVpZ2h0ICogbV9saW5lSW5kZXggKyBtX3Jlc29sdmVyLm1fYmFzZWxpbmUgLSBtX3Jl c29sdmVyLm1fYXNjZW50KTsKKyAgICBMYXlvdXRTaXplIGxpbmVTaXplKGxpbmUud2lkdGgsIG1f cmVzb2x2ZXIubV9hc2NlbnQgKyBtX3Jlc29sdmVyLm1fZGVzY2VudCk7CiAgICAgcmV0dXJuIExh eW91dFJlY3QobGluZVBvc2l0aW9uICsgbV9yZXNvbHZlci5tX2NvbnRlbnRPZmZzZXQsIGxpbmVT aXplKTsKIH0KIAogaW5saW5lIExheW91dFBvaW50IFJlc29sdmVyOjpMaW5lOjpiYXNlbGluZSgp IGNvbnN0CiB7CisgICAgYXV0byYgbGluZSA9IG1fcmVzb2x2ZXIubV9saW5lc1ttX2xpbmVJbmRl eF07CisKICAgICBmbG9hdCBiYXNlbGluZVkgPSBtX3Jlc29sdmVyLm1fbGluZUhlaWdodCAqIG1f bGluZUluZGV4ICsgbV9yZXNvbHZlci5tX2Jhc2VsaW5lOwotICAgIHJldHVybiBMYXlvdXRQb2lu dCgwLCBiYXNlbGluZVkpICsgbV9yZXNvbHZlci5tX2NvbnRlbnRPZmZzZXQ7CisgICAgcmV0dXJu IExheW91dFBvaW50KGxpbmUubGVmdCwgYmFzZWxpbmVZKSArIG1fcmVzb2x2ZXIubV9jb250ZW50 T2Zmc2V0OwogfQogCiBpbmxpbmUgU3RyaW5nIFJlc29sdmVyOjpMaW5lOjp0ZXh0KCkgY29uc3QK