123508 2013-10-30 05:04:27 -0700 Make SimpleLineLayout::Layout a class 2013-10-30 07:11:21 -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 944874 0 koivisto 2013-10-30 05:04:27 -0700 Encapsulate a bit 944875 1 215497 koivisto 2013-10-30 05:08:33 -0700 Created attachment 215497 patch 944890 2 215497 mario 2013-10-30 07:08:05 -0700 Comment on attachment 215497 patch Looks sane 944892 3 koivisto 2013-10-30 07:11:21 -0700 https://trac.webkit.org/r158268 215497 2013-10-30 05:08:33 -0700 2013-10-30 07:08:04 -0700 patch simple-line-class.patch text/plain 6840 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODI2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEzLTEwLTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFNpbXBsZUxpbmVMYXlv dXQ6OkxheW91dCBhIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjM1MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbXByb3ZlIGVuY2Fwc3VsYXRpb24uCisKIDIwMTMtMTAtMzAgIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE1ODIxNCk6 IEl0IG1hZGUgemlsbGlvbiB0ZXN0cyBjcmFzaCBvbiBHVEsgYW5kIEVGTApJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAJKHJldmlzaW9uIDE1ODI2 NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMTQ4LDcgKzMxNDgsNyBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6aGFz TGluZXMoKSBjb25zdAogICAgIEFTU0VSVChjaGlsZHJlbklubGluZSgpKTsKIAogICAgIGlmICht X3NpbXBsZUxpbmVMYXlvdXQpCi0gICAgICAgIHJldHVybiBtX3NpbXBsZUxpbmVMYXlvdXQtPmxp bmVDb3VudDsKKyAgICAgICAgcmV0dXJuIG1fc2ltcGxlTGluZUxheW91dC0+bGluZUNvdW50KCk7 CiAKICAgICByZXR1cm4gbGluZUJveGVzKCkuZmlyc3RMaW5lQm94KCk7CiB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCShyZXZpc2lvbiAx NTgyNjUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMzNCwxMCArMzM0LDEwIEBAIHN0ZDo6dW5pcXVlX3B0cjxMYXlv dXQ+IExheW91dDo6Y3JlYXRlKGMKIH0KIAogTGF5b3V0OjpMYXlvdXQoY29uc3QgUnVuVmVjdG9y JiBydW5WZWN0b3IsIHVuc2lnbmVkIGxpbmVDb3VudCkKLSAgICA6IHJ1bkNvdW50KHJ1blZlY3Rv ci5zaXplKCkpCi0gICAgLCBsaW5lQ291bnQobGluZUNvdW50KQorICAgIDogbV9saW5lQ291bnQo bGluZUNvdW50KQorICAgICwgbV9ydW5Db3VudChydW5WZWN0b3Iuc2l6ZSgpKQogewotICAgIG1l bWNweShydW5zLCBydW5WZWN0b3IuZGF0YSgpLCBydW5Db3VudCAqIHNpemVvZihSdW4pKTsKKyAg ICBtZW1jcHkobV9ydW5zLCBydW5WZWN0b3IuZGF0YSgpLCBtX3J1bkNvdW50ICogc2l6ZW9mKFJ1 bikpOwogfQogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0LmgJKHJldmlzaW9uIDE1ODI2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDE4ICs1OSwyMyBAQCBzdHJ1 Y3QgUnVuIHsKICAgICBmbG9hdCByaWdodDsKIH07CiAKLXN0cnVjdCBMYXlvdXQgeworY2xhc3Mg TGF5b3V0IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICB0eXBl ZGVmIFZlY3RvcjxSdW4sIDEwPiBSdW5WZWN0b3I7CiAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0 cjxMYXlvdXQ+IGNyZWF0ZShjb25zdCBSdW5WZWN0b3ImLCB1bnNpZ25lZCBsaW5lQ291bnQpOwog Ci0gICAgdW5zaWduZWQgcnVuQ291bnQ7Ci0gICAgdW5zaWduZWQgbGluZUNvdW50OwotICAgIFJ1 biBydW5zWzBdOworICAgIHVuc2lnbmVkIGxpbmVDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlu ZUNvdW50OyB9CisKKyAgICB1bnNpZ25lZCBydW5Db3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcnVu Q291bnQ7IH0KKyAgICBjb25zdCBSdW4mIHJ1bkF0KHVuc2lnbmVkIGkpIGNvbnN0IHsgcmV0dXJu IG1fcnVuc1tpXTsgfQogCiBwcml2YXRlOgogICAgIExheW91dChjb25zdCBSdW5WZWN0b3ImLCB1 bnNpZ25lZCBsaW5lQ291bnQpOworCisgICAgdW5zaWduZWQgbV9saW5lQ291bnQ7CisgICAgdW5z aWduZWQgbV9ydW5Db3VudDsKKyAgICBSdW4gbV9ydW5zWzBdOwogfTsKIAogc3RkOjp1bmlxdWVf cHRyPExheW91dD4gY3JlYXRlKFJlbmRlckJsb2NrRmxvdyYpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcAko cmV2aXNpb24gMTU4MjY1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRGdW5jdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw3ICs3NCw3IEBAIGJvb2wg aGl0VGVzdEZsb3coY29uc3QgUmVuZGVyQmxvY2tGbG93JiAKICAgICBpZiAoaGl0VGVzdEFjdGlv biAhPSBIaXRUZXN0Rm9yZWdyb3VuZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYg KCFsYXlvdXQucnVuQ291bnQpCisgICAgaWYgKCFsYXlvdXQucnVuQ291bnQoKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgUmVuZGVyU3R5bGUmIHN0eWxlID0gZmxvdy5zdHlsZSgpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91 dEZ1bmN0aW9ucy5oCShyZXZpc2lvbiAxNTgyNjUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSw0MyAr NjUsNDMgQEAgbmFtZXNwYWNlIFNpbXBsZUxpbmVMYXlvdXQgewogCiBpbmxpbmUgTGF5b3V0VW5p dCBjb21wdXRlRmxvd0hlaWdodChjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIGNvbnN0IExh eW91dCYgbGF5b3V0KQogewotICAgIHJldHVybiBsaW5lSGVpZ2h0RnJvbUZsb3coZmxvdykgKiBs YXlvdXQubGluZUNvdW50OworICAgIHJldHVybiBsaW5lSGVpZ2h0RnJvbUZsb3coZmxvdykgKiBs YXlvdXQubGluZUNvdW50KCk7CiB9CiAKIGlubGluZSBMYXlvdXRVbml0IGNvbXB1dGVGbG93Rmly c3RMaW5lQmFzZWxpbmUoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBMYXlvdXQm IGxheW91dCkKIHsKLSAgICBBU1NFUlRfVU5VU0VEKGxheW91dCwgbGF5b3V0LnJ1bkNvdW50KTsK KyAgICBBU1NFUlRfVU5VU0VEKGxheW91dCwgbGF5b3V0LnJ1bkNvdW50KCkpOwogICAgIHJldHVy biBmbG93LmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSArIGJhc2VsaW5lRnJvbUZsb3coZmxvdyk7 CiB9CiAKIGlubGluZSBMYXlvdXRVbml0IGNvbXB1dGVGbG93TGFzdExpbmVCYXNlbGluZShjb25z dCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIGNvbnN0IExheW91dCYgbGF5b3V0KQogewotICAgIEFT U0VSVChsYXlvdXQucnVuQ291bnQpOwotICAgIHJldHVybiBmbG93LmJvcmRlckFuZFBhZGRpbmdC ZWZvcmUoKSArIGxpbmVIZWlnaHRGcm9tRmxvdyhmbG93KSAqIChsYXlvdXQucnVuQ291bnQgLSAx KSArIGJhc2VsaW5lRnJvbUZsb3coZmxvdyk7CisgICAgQVNTRVJUKGxheW91dC5ydW5Db3VudCgp KTsKKyAgICByZXR1cm4gZmxvdy5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkgKyBsaW5lSGVpZ2h0 RnJvbUZsb3coZmxvdykgKiAobGF5b3V0LnJ1bkNvdW50KCkgLSAxKSArIGJhc2VsaW5lRnJvbUZs b3coZmxvdyk7CiB9CiAKIGlubGluZSB1bnNpZ25lZCBmaW5kVGV4dENhcmV0TWluaW11bU9mZnNl dChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0JiBsYXlvdXQpCiB7Ci0gICAgaWYgKCFs YXlvdXQucnVuQ291bnQpCisgICAgaWYgKCFsYXlvdXQucnVuQ291bnQoKSkKICAgICAgICAgcmV0 dXJuIDA7Ci0gICAgcmV0dXJuIGxheW91dC5ydW5zWzBdLnRleHRPZmZzZXQ7CisgICAgcmV0dXJu IGxheW91dC5ydW5BdCgwKS50ZXh0T2Zmc2V0OwogfQogCiBpbmxpbmUgdW5zaWduZWQgZmluZFRl eHRDYXJldE1heGltdW1PZmZzZXQoY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IExh eW91dCYgbGF5b3V0KQogewotICAgIGlmICghbGF5b3V0LnJ1bkNvdW50KQorICAgIGlmICghbGF5 b3V0LnJ1bkNvdW50KCkpCiAgICAgICAgIHJldHVybiByZW5kZXJlci50ZXh0TGVuZ3RoKCk7Ci0g ICAgYXV0byYgbGFzdCA9IGxheW91dC5ydW5zW2xheW91dC5ydW5Db3VudCAtIDFdOworICAgIGF1 dG8mIGxhc3QgPSBsYXlvdXQucnVuQXQobGF5b3V0LnJ1bkNvdW50KCkgLSAxKTsKICAgICByZXR1 cm4gbGFzdC50ZXh0T2Zmc2V0ICsgbGFzdC50ZXh0TGVuZ3RoOwogfQogCiBpbmxpbmUgYm9vbCBj b250YWluc1RleHRDYXJldE9mZnNldChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0JiBs YXlvdXQsIHVuc2lnbmVkIG9mZnNldCkKIHsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bGF5b3V0LnJ1bkNvdW50OyArK2kpIHsKLSAgICAgICAgYXV0byYgbGluZSA9IGxheW91dC5ydW5z W2ldOwotICAgICAgICBpZiAob2Zmc2V0IDwgbGluZS50ZXh0T2Zmc2V0KQorICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBsYXlvdXQucnVuQ291bnQoKTsgKytpKSB7CisgICAgICAgIGF1dG8m IHJ1biA9IGxheW91dC5ydW5BdChpKTsKKyAgICAgICAgaWYgKG9mZnNldCA8IHJ1bi50ZXh0T2Zm c2V0KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAob2Zmc2V0IDw9IGxp bmUudGV4dE9mZnNldCArIGxpbmUudGV4dExlbmd0aCkKKyAgICAgICAgaWYgKG9mZnNldCA8PSBy dW4udGV4dE9mZnNldCArIHJ1bi50ZXh0TGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTEwOSw4ICsxMDksOCBAQCBpbmxpbmUgYm9v bCBjb250YWluc1RleHRDYXJldE9mZnNldChjb25zCiAKIGlubGluZSBib29sIGlzVGV4dFJlbmRl cmVkKGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBMYXlvdXQmIGxheW91dCkKIHsKLSAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbGF5b3V0LnJ1bkNvdW50OyArK2kpIHsKLSAgICAgICAgaWYg KGxheW91dC5ydW5zW2ldLnRleHRMZW5ndGgpCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGxheW91dC5ydW5Db3VudCgpOyArK2kpIHsKKyAgICAgICAgaWYgKGxheW91dC5ydW5BdChpKS50 ZXh0TGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBm YWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFJlc29sdmVyLmgJKHJldmlzaW9uIDE1ODI2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTg5 LDcgKzE4OSw3IEBAIGlubGluZSBSdW5SZXNvbHZlcjo6UnVuIFJ1blJlc29sdmVyOjpJdGUKIAog aW5saW5lIGNvbnN0IFNpbXBsZUxpbmVMYXlvdXQ6OlJ1biYgUnVuUmVzb2x2ZXI6Okl0ZXJhdG9y OjpzaW1wbGVSdW4oKSBjb25zdAogewotICAgIHJldHVybiBtX3Jlc29sdmVyLm1fbGF5b3V0LnJ1 bnNbbV9ydW5JbmRleF07CisgICAgcmV0dXJuIG1fcmVzb2x2ZXIubV9sYXlvdXQucnVuQXQobV9y dW5JbmRleCk7CiB9CiAKIGlubGluZSBSdW5SZXNvbHZlcjo6UnVuUmVzb2x2ZXIoY29uc3QgUmVu ZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBMYXlvdXQmIGxheW91dCkKQEAgLTIxMCw3ICsyMTAs NyBAQCBpbmxpbmUgUnVuUmVzb2x2ZXI6Okl0ZXJhdG9yIFJ1blJlc29sdmVyCiAKIGlubGluZSBS dW5SZXNvbHZlcjo6SXRlcmF0b3IgUnVuUmVzb2x2ZXI6OmVuZCgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIEl0ZXJhdG9yKCp0aGlzLCBtX2xheW91dC5ydW5Db3VudCk7CisgICAgcmV0dXJuIEl0ZXJh dG9yKCp0aGlzLCBtX2xheW91dC5ydW5Db3VudCgpKTsKIH0KIAogaW5saW5lIExpbmVSZXNvbHZl cjo6SXRlcmF0b3I6Okl0ZXJhdG9yKFJ1blJlc29sdmVyOjpJdGVyYXRvciBydW5JdGVyYXRvcikK