124130 2013-11-10 15:11:35 -0800 Use start/end instead of textOffset/textLength for simple text runs 2013-11-10 15:45:42 -0800 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 949181 0 koivisto 2013-11-10 15:11:35 -0800 Code gets slightly nicer. 949182 1 216539 koivisto 2013-11-10 15:14:24 -0800 Created attachment 216539 patch 949183 2 koivisto 2013-11-10 15:45:42 -0800 https://trac.webkit.org/r159032 216539 2013-11-10 15:14:24 -0800 2013-11-10 15:27:53 -0800 patch simple-line-start-end.patch text/plain 6347 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTExLTEwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2Ugc3RhcnQvZW5kIGluc3Rl YWQgb2YgdGV4dE9mZnNldC90ZXh0TGVuZ3RoIGZvciBzaW1wbGUgdGV4dCBydW5zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQxMzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoZSBjb2Rl IHJlYWRzIGJldHRlciB0aGlzIHdheS4KKworICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZVRl eHRSdW5zKToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5oOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuOjpSdW4pOgorICAgICAgICAqIHJlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmg6CisgICAgICAgIChXZWJDb3JlOjpTaW1w bGVMaW5lTGF5b3V0OjpmaW5kVGV4dENhcmV0TWluaW11bU9mZnNldCk6CisgICAgICAgIChXZWJD b3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpmaW5kVGV4dENhcmV0TWF4aW11bU9mZnNldCk6CisgICAg ICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpjb250YWluc1RleHRDYXJldE9mZnNldCk6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojppc1RleHRSZW5kZXJlZCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oOgorICAgICAgICAo V2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCk6CisKIDIw MTMtMTEtMTAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIElt cGxlbWVudCB3aGl0ZS1zcGFjZSBwcm9wZXJ0eSBvbiBzaW1wbGUgbGluZSBsYXlvdXQgcGF0aApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAko cmV2aXNpb24gMTU5MDMwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTAsNyArMzEwLDcgQEAgdm9pZCBjcmVhdGVU ZXh0UnVucyhMYXlvdXQ6OlJ1blZlY3RvciYgcgogICAgICAgICAgICAgICAgIGlmICh3b3JkU3Rh cnQgPiBsaW5lU3RhcnQpCiAgICAgICAgICAgICAgICAgICAgIGxpbmVSdW5zLmFwcGVuZChSdW4o bGluZUVuZCwgbGluZVJ1bnMubGFzdCgpLnJpZ2h0KSk7CiAgICAgICAgICAgICAgICAgbGluZVJ1 bnMubGFzdCgpLnJpZ2h0ID0gbGluZVJ1bnMubGFzdCgpLmxlZnQ7Ci0gICAgICAgICAgICAgICAg bGluZVJ1bnMubGFzdCgpLnRleHRMZW5ndGggPSAxOworICAgICAgICAgICAgICAgIGxpbmVSdW5z Lmxhc3QoKS5lbmQgPSBsaW5lRW5kICsgMTsKICAgICAgICAgICAgICAgICBsaW5lRW5kID0gd29y ZEVuZDsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KQEAgLTM0Myw3ICsz NDMsNyBAQCB2b2lkIGNyZWF0ZVRleHRSdW5zKExheW91dDo6UnVuVmVjdG9yJiByCiAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBJbmNsdWRlIG5ld2xpbmUgdG8gdGhpcyBydW4gdG9vLgogICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKHdoaXRlc3BhY2VFbmQgPCB0ZXh0TGVuZ3RoICYmIHRl eHRbd2hpdGVzcGFjZUVuZF0gPT0gJ1xuJykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAr K3doaXRlc3BhY2VFbmQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICBsaW5lUnVucy5sYXN0KCku dGV4dExlbmd0aCA9IHdoaXRlc3BhY2VFbmQgLSBsaW5lUnVucy5sYXN0KCkudGV4dE9mZnNldDsK KyAgICAgICAgICAgICAgICAgICAgICAgIGxpbmVSdW5zLmxhc3QoKS5lbmQgPSB3aGl0ZXNwYWNl RW5kOwogICAgICAgICAgICAgICAgICAgICAgICAgbGluZVJ1bnMubGFzdCgpLnJpZ2h0ID0gbGlu ZVdpZHRoLmF2YWlsYWJsZVdpZHRoKCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBsaW5lRW5k ID0gd2hpdGVzcGFjZUVuZDsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtMzU1 LDcgKzM1NSw3IEBAIHZvaWQgY3JlYXRlVGV4dFJ1bnMoTGF5b3V0OjpSdW5WZWN0b3ImIHIKICAg ICAgICAgICAgICAgICAvLyBUaGVyZSB3ZXJlIG1vcmUgdGhhbiBvbmUgY29uc2VjdXRpdmUgd2hp dGVzcGFjZS4KICAgICAgICAgICAgICAgICBBU1NFUlQod29yZElzUHJlY2VkZWRCeVdoaXRlc3Bh Y2UpOwogICAgICAgICAgICAgICAgIC8vIEluY2x1ZGUgc3BhY2UgdG8gdGhlIGVuZCBvZiB0aGUg cHJldmlvdXMgcnVuLgotICAgICAgICAgICAgICAgIGxpbmVSdW5zLmxhc3QoKS50ZXh0TGVuZ3Ro Kys7CisgICAgICAgICAgICAgICAgbGluZVJ1bnMubGFzdCgpLmVuZCsrOwogICAgICAgICAgICAg ICAgIGxpbmVSdW5zLmxhc3QoKS5yaWdodCArPSBzcGFjZVdpZHRoOwogICAgICAgICAgICAgICAg IC8vIFN0YXJ0IGEgbmV3IHJ1biBvbiB0aGUgc2FtZSBsaW5lLgogICAgICAgICAgICAgICAgIGxp bmVSdW5zLmFwcGVuZChSdW4od29yZFN0YXJ0ICsgMSwgbGluZVJ1bnMubGFzdCgpLnJpZ2h0KSk7 CkBAIC0zNjQsNyArMzY0LDcgQEAgdm9pZCBjcmVhdGVUZXh0UnVucyhMYXlvdXQ6OlJ1blZlY3Rv ciYgcgogICAgICAgICAgICAgbGluZVdpZHRoLmNvbW1pdCgpOwogCiAgICAgICAgICAgICBsaW5l UnVucy5sYXN0KCkucmlnaHQgPSBsaW5lV2lkdGguY29tbWl0dGVkV2lkdGgoKTsKLSAgICAgICAg ICAgIGxpbmVSdW5zLmxhc3QoKS50ZXh0TGVuZ3RoID0gd29yZEVuZCAtIGxpbmVSdW5zLmxhc3Qo KS50ZXh0T2Zmc2V0OworICAgICAgICAgICAgbGluZVJ1bnMubGFzdCgpLmVuZCA9IHdvcmRFbmQ7 CiAKICAgICAgICAgICAgIGxpbmVFbmQgPSB3b3JkRW5kOwogICAgICAgICAgICAgaWYgKGNvbGxh cHNlV2hpdGVzcGFjZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXQuaAkocmV2aXNpb24gMTU4ODg4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTYgKzQ0LDE2IEBAIGJv b2wgY2FuVXNlRm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYpOwogCiBzdHJ1Y3QgUnVuIHsKICAg ICBSdW4oKSB7IH0KLSAgICBSdW4odW5zaWduZWQgdGV4dE9mZnNldCwgZmxvYXQgbGVmdCkKLSAg ICAgICAgOiB0ZXh0T2Zmc2V0KHRleHRPZmZzZXQpCi0gICAgICAgICwgdGV4dExlbmd0aCgwKQor ICAgIFJ1bih1bnNpZ25lZCBzdGFydCwgZmxvYXQgbGVmdCkKKyAgICAgICAgOiBzdGFydChzdGFy dCkKKyAgICAgICAgLCBlbmQoc3RhcnQpCiAgICAgICAgICwgaXNFbmRPZkxpbmUoZmFsc2UpCiAg ICAgICAgICwgbGVmdChsZWZ0KQogICAgICAgICAsIHJpZ2h0KGxlZnQpCiAgICAgeyB9CiAKLSAg ICB1bnNpZ25lZCB0ZXh0T2Zmc2V0OwotICAgIHVuc2lnbmVkIHRleHRMZW5ndGggOiAzMTsKKyAg ICB1bnNpZ25lZCBzdGFydDsKKyAgICB1bnNpZ25lZCBlbmQgOiAzMTsKICAgICB1bnNpZ25lZCBp c0VuZE9mTGluZSA6IDE7CiAgICAgZmxvYXQgbGVmdDsKICAgICBmbG9hdCByaWdodDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5j dGlvbnMuaAkocmV2aXNpb24gMTU4ODg4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtODQsNyArODQsNyBA QCBpbmxpbmUgdW5zaWduZWQgZmluZFRleHRDYXJldE1pbmltdW1PZmZzCiB7CiAgICAgaWYgKCFs YXlvdXQucnVuQ291bnQoKSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIGxheW91dC5y dW5BdCgwKS50ZXh0T2Zmc2V0OworICAgIHJldHVybiBsYXlvdXQucnVuQXQoMCkuc3RhcnQ7CiB9 CiAKIGlubGluZSB1bnNpZ25lZCBmaW5kVGV4dENhcmV0TWF4aW11bU9mZnNldChjb25zdCBSZW5k ZXJUZXh0JiByZW5kZXJlciwgY29uc3QgTGF5b3V0JiBsYXlvdXQpCkBAIC05MiwxNiArOTIsMTYg QEAgaW5saW5lIHVuc2lnbmVkIGZpbmRUZXh0Q2FyZXRNYXhpbXVtT2ZmcwogICAgIGlmICghbGF5 b3V0LnJ1bkNvdW50KCkpCiAgICAgICAgIHJldHVybiByZW5kZXJlci50ZXh0TGVuZ3RoKCk7CiAg ICAgYXV0byYgbGFzdCA9IGxheW91dC5ydW5BdChsYXlvdXQucnVuQ291bnQoKSAtIDEpOwotICAg IHJldHVybiBsYXN0LnRleHRPZmZzZXQgKyBsYXN0LnRleHRMZW5ndGg7CisgICAgcmV0dXJuIGxh c3QuZW5kOwogfQogCiBpbmxpbmUgYm9vbCBjb250YWluc1RleHRDYXJldE9mZnNldChjb25zdCBS ZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0JiBsYXlvdXQsIHVuc2lnbmVkIG9mZnNldCkKIHsKICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGF5b3V0LnJ1bkNvdW50KCk7ICsraSkgewogICAg ICAgICBhdXRvJiBydW4gPSBsYXlvdXQucnVuQXQoaSk7Ci0gICAgICAgIGlmIChvZmZzZXQgPCBy dW4udGV4dE9mZnNldCkKKyAgICAgICAgaWYgKG9mZnNldCA8IHJ1bi5zdGFydCkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKG9mZnNldCA8PSBydW4udGV4dE9mZnNldCAr IHJ1bi50ZXh0TGVuZ3RoKQorICAgICAgICBpZiAob2Zmc2V0IDw9IHJ1bi5lbmQpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTEwLDcgKzEx MCw4IEBAIGlubGluZSBib29sIGNvbnRhaW5zVGV4dENhcmV0T2Zmc2V0KGNvbnMKIGlubGluZSBi b29sIGlzVGV4dFJlbmRlcmVkKGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBMYXlvdXQmIGxheW91 dCkKIHsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGF5b3V0LnJ1bkNvdW50KCk7ICsr aSkgewotICAgICAgICBpZiAobGF5b3V0LnJ1bkF0KGkpLnRleHRMZW5ndGgpCisgICAgICAgIGF1 dG8mIHJ1biA9IGxheW91dC5ydW5BdChpKTsKKyAgICAgICAgaWYgKHJ1bi5lbmQgPiBydW4uc3Rh cnQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 UmVzb2x2ZXIuaAkocmV2aXNpb24gMTU4ODg4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgsNyArMTQ4 LDcgQEAgaW5saW5lIFN0cmluZyBSdW5SZXNvbHZlcjo6UnVuOjp0ZXh0KCkgYwogewogICAgIGF1 dG8mIHJlc29sdmVyID0gbV9pdGVyYXRvci5yZXNvbHZlcigpOwogICAgIGF1dG8mIHJ1biA9IG1f aXRlcmF0b3Iuc2ltcGxlUnVuKCk7Ci0gICAgcmV0dXJuIHJlc29sdmVyLm1fc3RyaW5nLnN1YnN0 cmluZ1NoYXJpbmdJbXBsKHJ1bi50ZXh0T2Zmc2V0LCBydW4udGV4dExlbmd0aCk7CisgICAgcmV0 dXJuIHJlc29sdmVyLm1fc3RyaW5nLnN1YnN0cmluZ1NoYXJpbmdJbXBsKHJ1bi5zdGFydCwgcnVu LmVuZCAtIHJ1bi5zdGFydCk7CiB9CiAKIGlubGluZSB1bnNpZ25lZCBSdW5SZXNvbHZlcjo6UnVu OjpsaW5lSW5kZXgoKSBjb25zdAo=