120040 2013-08-19 17:27:12 -0700 Save three bytes per CStringBuffer object 2013-08-24 21:38:24 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa benjamin barraclough benjamin cmarcelo commit-queue gtk-ews kling koivisto rego+ews xan.lopez oldest_to_newest 918883 0 rniwa 2013-08-19 17:27:12 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/894ae8eafdb64912aefd8f9c809f4ccda84f3b89 sizeof(CStringBuffer) was rounded up to 8 on account of struct size and alignment rules. This is clearly not what was intended. Also tidy up includes. 920424 1 209506 benjamin 2013-08-23 13:45:48 -0700 Created attachment 209506 Patch 920427 2 209506 darin 2013-08-23 13:47:40 -0700 Comment on attachment 209506 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209506&action=review > Source/WTF/wtf/text/CString.h:49 > + char* mutableData() { return reinterpret_cast<char*>(this + 1); } Might need to use reinterpret_cast_ptr for the benefit of some ARM-based platforms. 920463 3 209506 gtk-ews 2013-08-23 15:13:40 -0700 Comment on attachment 209506 Patch Attachment 209506 did not pass gtk-wk2-ews (gtk-wk2): Output: http://webkit-queues.appspot.com/results/1543435 920704 4 benjamin 2013-08-24 21:38:24 -0700 Committed r154565: <http://trac.webkit.org/changeset/154565> 209506 2013-08-23 13:45:48 -0700 2013-08-23 15:13:40 -0700 Patch bug-120040-20130823134547.patch text/plain 3094 benjamin SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNTQ1MTkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA4LTIzICBCZW5qYW1pbiBQb3VsYWluICA8 YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTYXZlIHRocmVlIGJ5dGVzIHBlciBDU3Ry aW5nQnVmZmVyIG9iamVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIwMDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTWVyZ2UgaHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVt L2JsaW5rLysvODk0YWU4ZWFmZGI2NDkxMmFlZmQ4ZjljODA5ZjRjY2RhODRmM2I4OQorCisgICAg ICAgIHNpemVvZihDU3RyaW5nQnVmZmVyKSB3YXMgcm91bmRlZCB1cCB0byA4IG9uIGFjY291bnQg b2Ygc3RydWN0IHNpemUgYW5kCisgICAgICAgIGFsaWdubWVudCBydWxlcy4gVGhpcyBpcyBjbGVh cmx5IG5vdCB3aGF0IHdhcyBpbnRlbmRlZC4KKworICAgICAgICAqIHd0Zi90ZXh0L0NTdHJpbmcu Y3BwOgorICAgICAgICAoV1RGOjpDU3RyaW5nQnVmZmVyOjpjcmVhdGVVbmluaXRpYWxpemVkKToK KyAgICAgICAgKiB3dGYvdGV4dC9DU3RyaW5nLmg6CisgICAgICAgIChXVEY6OkNTdHJpbmdCdWZm ZXI6OmRhdGEpOgorICAgICAgICAoV1RGOjpDU3RyaW5nQnVmZmVyOjptdXRhYmxlRGF0YSk6CisK IDIwMTMtMDgtMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEN1 dCBkb3duIHJlcGVhdGVkIGNvZGUgaW4gUmVmUHRyIGFuZCBSZXRhaW5QdHIgYnkgdXNpbmcgY29w eS9tb3ZlLWFuZC1zd2FwIGZvciBhc3NpZ25tZW50IG9wZXJhdG9ycwpJbmRleDogU291cmNlL1dU Ri93dGYvdGV4dC9DU3RyaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi90ZXh0 L0NTdHJpbmcuY3BwCShyZXZpc2lvbiAxNTQ0NzEpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L0NT dHJpbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMiArMzUsMTAgQEAgbmFtZXNwYWNlIFdU RiB7CiAKIFBhc3NSZWZQdHI8Q1N0cmluZ0J1ZmZlcj4gQ1N0cmluZ0J1ZmZlcjo6Y3JlYXRlVW5p bml0aWFsaXplZChzaXplX3QgbGVuZ3RoKQogewotICAgIGlmIChsZW5ndGggPiAobnVtZXJpY19s aW1pdHM8c2l6ZV90Pjo6bWF4KCkgLSBzaXplb2YoQ1N0cmluZ0J1ZmZlcikpKQotICAgICAgICBD UkFTSCgpOworICAgIFJFTEVBU0VfQVNTRVJUKGxlbmd0aCA8IChudW1lcmljX2xpbWl0czx1bnNp Z25lZD46Om1heCgpIC0gc2l6ZW9mKENTdHJpbmdCdWZmZXIpKSk7CiAKLSAgICAvLyBDU3RyaW5n QnVmZmVyIGFscmVhZHkgaGFzIHNwYWNlIGZvciBvbmUgY2hhcmFjdGVyLCB3ZSBkbyBub3QgbmVl ZCB0byBhZGQgKzEgdG8gdGhlIGxlbmd0aAotICAgIC8vIHRvIHN0b3JlIHRoZSB0ZXJtaW5hdGlu ZyB6ZXJvLgotICAgIHNpemVfdCBzaXplID0gc2l6ZW9mKENTdHJpbmdCdWZmZXIpICsgbGVuZ3Ro OworICAgIC8vIFRoZSArMSBpcyBmb3IgdGhlIHRlcm1pbmF0aW5nIG51bGwgY2hhcmFjdGVyLgor ICAgIHNpemVfdCBzaXplID0gc2l6ZW9mKENTdHJpbmdCdWZmZXIpICsgbGVuZ3RoICsgMTsKICAg ICBDU3RyaW5nQnVmZmVyKiBzdHJpbmdCdWZmZXIgPSBzdGF0aWNfY2FzdDxDU3RyaW5nQnVmZmVy Kj4oZmFzdE1hbGxvYyhzaXplKSk7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyAoTm90TnVsbCwg c3RyaW5nQnVmZmVyKSBDU3RyaW5nQnVmZmVyKGxlbmd0aCkpOwogfQpJbmRleDogU291cmNlL1dU Ri93dGYvdGV4dC9DU3RyaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdGV4dC9D U3RyaW5nLmgJKHJldmlzaW9uIDE1NDQ3MSkKKysrIFNvdXJjZS9XVEYvd3RmL3RleHQvQ1N0cmlu Zy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hU cmFpdHMuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZD b3VudGVkLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV1RGIHsKIApA QCAtMzgsNyArMzcsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIC8vIFRoZSBkYXRhIGlzIGltcGxpY2l0 bHkgYWxsb2NhdGVkIDEgY2hhcmFjdGVyIGxvbmdlciB0aGFuIGxlbmd0aCgpLCBhcyBpdCBpcyB6 ZXJvLXRlcm1pbmF0ZWQuCiBjbGFzcyBDU3RyaW5nQnVmZmVyIDogcHVibGljIFJlZkNvdW50ZWQ8 Q1N0cmluZ0J1ZmZlcj4gewogcHVibGljOgotICAgIGNvbnN0IGNoYXIqIGRhdGEoKSB7IHJldHVy biBtX2RhdGE7IH0KKyAgICBjb25zdCBjaGFyKiBkYXRhKCkgeyByZXR1cm4gbXV0YWJsZURhdGEo KTsgfQogICAgIHNpemVfdCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2xlbmd0aDsgfQogCiBw cml2YXRlOgpAQCAtNDcsMTAgKzQ2LDkgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxDU3RyaW5nQnVmZmVyPiBjcmVhdGVVbmluaXRpYWxpemVkKHNpemVfdCBsZW5ndGgpOwogCiAg ICAgQ1N0cmluZ0J1ZmZlcihzaXplX3QgbGVuZ3RoKSA6IG1fbGVuZ3RoKGxlbmd0aCkgeyB9Ci0g ICAgY2hhciogbXV0YWJsZURhdGEoKSB7IHJldHVybiBtX2RhdGE7IH0KKyAgICBjaGFyKiBtdXRh YmxlRGF0YSgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHRoaXMgKyAxKTsgfQog CiAgICAgY29uc3Qgc2l6ZV90IG1fbGVuZ3RoOwotICAgIGNoYXIgbV9kYXRhWzFdOwogfTsKIAog Ly8gQSBjb250YWluZXIgZm9yIGEgbnVsbC10ZXJtaW5hdGVkIGNoYXIgYXJyYXkgc3VwcG9ydGlu ZyBjb3B5LW9uLXdyaXRlCg==