133056 2014-05-18 14:59:18 -0700 Reduce constructor copypasta in RenderText and RenderElement. 2014-05-18 23:45:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue darin esprehn+autocc glenn kling koivisto kondapallykalyan oldest_to_newest 1010114 0 kling 2014-05-18 14:59:18 -0700 We can use delegating constructors to avoid duplicating some initializer lists. 1010116 1 231667 kling 2014-05-18 15:12:32 -0700 Created attachment 231667 Patch 1010136 2 231667 darin 2014-05-18 20:50:52 -0700 Comment on attachment 231667 Patch All our compilers support delegating constructors!? Hooray! What about inlining? Is it OK to add another level of function call here? 1010158 3 kling 2014-05-18 23:25:25 -0700 (In reply to comment #2) > (From update of attachment 231667 [details]) > All our compilers support delegating constructors!? Hooray! > > What about inlining? Is it OK to add another level of function call here? Looks like they do! I wasn't sure so wanted to wait for EWS. I'll slap an "inline" on the delegate ctor's definition for good measure. 1010160 4 kling 2014-05-18 23:45:07 -0700 Committed r169038: <http://trac.webkit.org/changeset/169038> 231667 2014-05-18 15:12:32 -0700 2014-05-18 20:50:52 -0700 Patch bug-133056.diff text/plain 5442 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3M2RkMjM1Li43MmJkOGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDUtMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlZHVjZSBjb25zdHJ1Y3RvciBjb3B5cGFzdGEgaW4gUmVuZGVyVGV4dCBhbmQgUmVuZGVy RWxlbWVudC4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzMzA1Nj4KKworICAgICAg ICBVc2UgZGVsZWdhdGluZyBjb25zdHJ1Y3RvcnMgdG8gcmVtb3ZlIGR1cGxpY2F0ZWQgaW5pdGlh bGl6ZXIgbGlzdHMKKyAgICAgICAgZnJvbSB0aGUgY29uc3RydWN0b3JzIG9mIFJlbmRlclRleHQg YW5kIFJlbmRlckVsZW1lbnQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbGVtZW50OjpSZW5kZXJFbGVtZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyRWxlbWVudC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OlJlbmRlclRleHQpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJUZXh0Lmg6CisKIDIwMTQtMDUtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggaU9TIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IGQyZDg5NTAuLmEyMzQwMjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTc2LDkgKzc2LDkg QEAgc3RhdGljIEhhc2hNYXA8Y29uc3QgUmVuZGVyT2JqZWN0KiwgQ29udHJvbFN0YXRlcyo+JiBj b250cm9sU3RhdGVzUmVuZGVyZXJNYXAoKQogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNo TWFwPGNvbnN0IFJlbmRlck9iamVjdCosIENvbnRyb2xTdGF0ZXMqPj4gbWFwOwogICAgIHJldHVy biBtYXA7CiB9Ci0gICAgCi1SZW5kZXJFbGVtZW50OjpSZW5kZXJFbGVtZW50KEVsZW1lbnQmIGVs ZW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxlLCB1bnNpZ25lZCBiYXNlVHlwZUZsYWdz KQotICAgIDogUmVuZGVyT2JqZWN0KGVsZW1lbnQpCisKK1JlbmRlckVsZW1lbnQ6OlJlbmRlckVs ZW1lbnQoQ29udGFpbmVyTm9kZSYgZWxlbWVudE9yRG9jdW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5 bGU+IHN0eWxlLCB1bnNpZ25lZCBiYXNlVHlwZUZsYWdzKQorICAgIDogUmVuZGVyT2JqZWN0KGVs ZW1lbnRPckRvY3VtZW50KQogICAgICwgbV9iYXNlVHlwZUZsYWdzKGJhc2VUeXBlRmxhZ3MpCiAg ICAgLCBtX2FuY2VzdG9yTGluZUJveERpcnR5KGZhbHNlKQogICAgICwgbV9oYXNJbml0aWFsaXpl ZFN0eWxlKGZhbHNlKQpAQCAtOTEsMTcgKzkxLDEzIEBAIFJlbmRlckVsZW1lbnQ6OlJlbmRlckVs ZW1lbnQoRWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUsIHVuc2ln CiB7CiB9CiAKK1JlbmRlckVsZW1lbnQ6OlJlbmRlckVsZW1lbnQoRWxlbWVudCYgZWxlbWVudCwg UGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUsIHVuc2lnbmVkIGJhc2VUeXBlRmxhZ3MpCisgICAg OiBSZW5kZXJFbGVtZW50KHN0YXRpY19jYXN0PENvbnRhaW5lck5vZGUmPihlbGVtZW50KSwgc3Rk Ojptb3ZlKHN0eWxlKSwgYmFzZVR5cGVGbGFncykKK3sKK30KKwogUmVuZGVyRWxlbWVudDo6UmVu ZGVyRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxl LCB1bnNpZ25lZCBiYXNlVHlwZUZsYWdzKQotICAgIDogUmVuZGVyT2JqZWN0KGRvY3VtZW50KQot ICAgICwgbV9iYXNlVHlwZUZsYWdzKGJhc2VUeXBlRmxhZ3MpCi0gICAgLCBtX2FuY2VzdG9yTGlu ZUJveERpcnR5KGZhbHNlKQotICAgICwgbV9oYXNJbml0aWFsaXplZFN0eWxlKGZhbHNlKQotICAg ICwgbV9yZW5kZXJJbmxpbmVBbHdheXNDcmVhdGVzTGluZUJveGVzKGZhbHNlKQotICAgICwgbV9y ZW5kZXJCb3hOZWVkc0xhenlSZXBhaW50KGZhbHNlKQotICAgICwgbV9oYXNQYXVzZWRJbWFnZUFu aW1hdGlvbnMoZmFsc2UpCi0gICAgLCBtX2ZpcnN0Q2hpbGQobnVsbHB0cikKLSAgICAsIG1fbGFz dENoaWxkKG51bGxwdHIpCi0gICAgLCBtX3N0eWxlKHN0ZDo6bW92ZShzdHlsZSkpCisgICAgOiBS ZW5kZXJFbGVtZW50KHN0YXRpY19jYXN0PENvbnRhaW5lck5vZGUmPihkb2N1bWVudCksIHN0ZDo6 bW92ZShzdHlsZSksIGJhc2VUeXBlRmxhZ3MpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IDk3ZWI0YzcuLjJhODczZWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMTk5LDYgKzE5OSw3IEBAIHByb3RlY3Rl ZDoKICAgICBzdGF0aWMgdm9pZCBhZGRDb250cm9sU3RhdGVzRm9yUmVuZGVyZXIoY29uc3QgUmVu ZGVyT2JqZWN0KiwgQ29udHJvbFN0YXRlcyopOwogCiBwcml2YXRlOgorICAgIFJlbmRlckVsZW1l bnQoQ29udGFpbmVyTm9kZSYsIFBhc3NSZWY8UmVuZGVyU3R5bGU+LCB1bnNpZ25lZCBiYXNlVHlw ZUZsYWdzKTsKICAgICB2b2lkIG5vZGUoKSBjb25zdCA9IGRlbGV0ZTsKICAgICB2b2lkIG5vblBz ZXVkb05vZGUoKSBjb25zdCA9IGRlbGV0ZTsKICAgICB2b2lkIGdlbmVyYXRpbmdOb2RlKCkgY29u c3QgPSBkZWxldGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXgg OWQwZWIyNS4uZDk2ZWYyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNw cApAQCAtMTUzLDggKzE1Myw4IEBAIHZvaWQgbWFrZUNhcGl0YWxpemVkKFN0cmluZyogc3RyaW5n LCBVQ2hhciBwcmV2aW91cykKICAgICAqc3RyaW5nID0gcmVzdWx0LnRvU3RyaW5nKCk7CiB9CiAK LVJlbmRlclRleHQ6OlJlbmRlclRleHQoVGV4dCYgdGV4dE5vZGUsIGNvbnN0IFN0cmluZyYgdGV4 dCkKLSAgICA6IFJlbmRlck9iamVjdCh0ZXh0Tm9kZSkKK1JlbmRlclRleHQ6OlJlbmRlclRleHQo Tm9kZSYgbm9kZSwgY29uc3QgU3RyaW5nJiB0ZXh0KQorICAgIDogUmVuZGVyT2JqZWN0KG5vZGUp CiAgICAgLCBtX2hhc1RhYihmYWxzZSkKICAgICAsIG1fbGluZXNEaXJ0eShmYWxzZSkKICAgICAs IG1fY29udGFpbnNSZXZlcnNlZFRleHQoZmFsc2UpCkBAIC0xNzUsMzAgKzE3NSwxNyBAQCBSZW5k ZXJUZXh0OjpSZW5kZXJUZXh0KFRleHQmIHRleHROb2RlLCBjb25zdCBTdHJpbmcmIHRleHQpCiAg ICAgc2V0SXNUZXh0KCk7CiAgICAgbV9jYW5Vc2VTaW1wbGVGb250Q29kZVBhdGggPSBjb21wdXRl Q2FuVXNlU2ltcGxlRm9udENvZGVQYXRoKCk7CiAgICAgdmlldygpLmZyYW1lVmlldygpLmluY3Jl bWVudFZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCh0ZXh0TGVuZ3RoKCkpOworCit9CisK K1JlbmRlclRleHQ6OlJlbmRlclRleHQoVGV4dCYgdGV4dE5vZGUsIGNvbnN0IFN0cmluZyYgdGV4 dCkKKyAgICA6IFJlbmRlclRleHQoc3RhdGljX2Nhc3Q8Tm9kZSY+KHRleHROb2RlKSwgdGV4dCkK K3sKIH0KIAogUmVuZGVyVGV4dDo6UmVuZGVyVGV4dChEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0 IFN0cmluZyYgdGV4dCkKLSAgICA6IFJlbmRlck9iamVjdChkb2N1bWVudCkKLSAgICAsIG1faGFz VGFiKGZhbHNlKQotICAgICwgbV9saW5lc0RpcnR5KGZhbHNlKQotICAgICwgbV9jb250YWluc1Jl dmVyc2VkVGV4dChmYWxzZSkKLSAgICAsIG1faXNBbGxBU0NJSSh0ZXh0LmNvbnRhaW5zT25seUFT Q0lJKCkpCi0gICAgLCBtX2tub3duVG9IYXZlTm9PdmVyZmxvd0FuZE5vRmFsbGJhY2tGb250cyhm YWxzZSkKLSAgICAsIG1fdXNlQmFja3NsYXNoQXNZZW5TeW1ib2woZmFsc2UpCi0gICAgLCBtX29y aWdpbmFsVGV4dERpZmZlcnNGcm9tUmVuZGVyZWQoZmFsc2UpCi0jaWYgRU5BQkxFKElPU19URVhU X0FVVE9TSVpJTkcpCi0gICAgLCBtX2NhbmRpZGF0ZUNvbXB1dGVkVGV4dFNpemUoMCkKLSNlbmRp ZgotICAgICwgbV9taW5XaWR0aCgtMSkKLSAgICAsIG1fbWF4V2lkdGgoLTEpCi0gICAgLCBtX2Jl Z2luTWluV2lkdGgoMCkKLSAgICAsIG1fZW5kTWluV2lkdGgoMCkKLSAgICAsIG1fdGV4dCh0ZXh0 KQorICAgIDogUmVuZGVyVGV4dChzdGF0aWNfY2FzdDxOb2RlJj4oZG9jdW1lbnQpLCB0ZXh0KQog ewotICAgIEFTU0VSVCghbV90ZXh0LmlzTnVsbCgpKTsKLSAgICBzZXRJc1RleHQoKTsKLSAgICBt X2NhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCA9IGNvbXB1dGVDYW5Vc2VTaW1wbGVGb250Q29kZVBh dGgoKTsKLSAgICB2aWV3KCkuZnJhbWVWaWV3KCkuaW5jcmVtZW50VmlzdWFsbHlOb25FbXB0eUNo YXJhY3RlckNvdW50KHRleHRMZW5ndGgoKSk7CiB9CiAKIFJlbmRlclRleHQ6On5SZW5kZXJUZXh0 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCmluZGV4IGQ0ZmRmNDQuLmIxMDc5 ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaApAQCAtMTYyLDYgKzE2Miw4 IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFVDaGFyIHByZXZpb3VzQ2hhcmFjdGVyKCkgY29u c3Q7CiAKIHByaXZhdGU6CisgICAgUmVuZGVyVGV4dChOb2RlJiwgY29uc3QgU3RyaW5nJik7CisK ICAgICB2aXJ0dWFsIGJvb2wgY2FuSGF2ZUNoaWxkcmVuKCkgY29uc3Qgb3ZlcnJpZGUgZmluYWwg eyByZXR1cm4gZmFsc2U7IH0KIAogICAgIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0 aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IFNpbXBsZUZvbnREYXRhKj4mIGZhbGxi YWNrRm9udHMsIEdseXBoT3ZlcmZsb3cmKTsK