37068 2010-04-03 21:33:15 -0700 Change UString to use a 0 rep for null strings instead a null object. 2010-04-03 23:54:14 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough webkit.review.bot oldest_to_newest 208319 0 barraclough 2010-04-03 21:33:15 -0700 (as per WebCore::String) 208320 1 52502 barraclough 2010-04-03 21:34:57 -0700 Created attachment 52502 The patch No performance impact 208322 2 webkit.review.bot 2010-04-03 21:36:50 -0700 Attachment 52502 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 JavaScriptCore/runtime/UString.h:142: More than one command on the same line [whitespace/newline] [4] JavaScriptCore/runtime/UString.h:142: More than one command on the same line in if [whitespace/parens] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 208328 3 52502 oliver 2010-04-03 22:19:47 -0700 Comment on attachment 52502 The patch r=me, but you need to fix the style error in UString::cost 208337 4 barraclough 2010-04-03 23:54:14 -0700 Transmitting file data ...... Committed revision 57055. 52502 2010-04-03 21:34:57 -0700 2010-04-03 22:19:46 -0700 The patch patch.nullUString.2.txt text/plain 6892 barraclough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3MDU0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDQtMDMgIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNzA2OAorICAgICAgICBDaGFuZ2UgVVN0cmluZyB0byB1c2UgYSAwIHJlcCBm b3IgbnVsbCBzdHJpbmdzIGluc3RlYWQgb2YgYSBudWxsIG9iamVjdC4KKworICAgICAgICBObyBw ZXJmb3JtYW5jZSBpbXBhY3QuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6CisgICAg ICAgICogcnVudGltZS9JbnRlcm5hbEZ1bmN0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJu YWxGdW5jdGlvbjo6SW50ZXJuYWxGdW5jdGlvbik6CisgICAgICAgICogcnVudGltZS9KU1N0cmlu Zy5oOgorICAgICAgICAoSlNDOjpSb3BlQnVpbGRlcjo6SlNTdHJpbmcpOgorICAgICAgICAqIHJ1 bnRpbWUvVVN0cmluZy5jcHA6CisgICAgICAgIChKU0M6OmluaXRpYWxpemVVU3RyaW5nKToKKyAg ICAgICAgKiBydW50aW1lL1VTdHJpbmcuaDoKKyAgICAgICAgKEpTQzo6VVN0cmluZzo6VVN0cmlu Zyk6CisgICAgICAgIChKU0M6OlVTdHJpbmc6OmRhdGEpOgorICAgICAgICAoSlNDOjpVU3RyaW5n OjpzaXplKToKKyAgICAgICAgKEpTQzo6VVN0cmluZzo6aXNOdWxsKToKKyAgICAgICAgKEpTQzo6 VVN0cmluZzo6aXNFbXB0eSk6CisgICAgICAgIChKU0M6OlVTdHJpbmc6OmNvc3QpOgorCiAyMDEw LTA0LTAzICBCYWxhenMgS2VsZW1lbiAgPGtiQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJ KHJldmlzaW9uIDU2OTM5KQorKysgSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNDgsNyArMjQ4LDYgQEAgX19aTjNKU0M3VVN0cmluZzRmcm9tRWQK IF9fWk4zSlNDN1VTdHJpbmc0ZnJvbUVpCiBfX1pOM0pTQzdVU3RyaW5nNGZyb21FagogX19aTjNK U0M3VVN0cmluZzRmcm9tRWwKLV9fWk4zSlNDN1VTdHJpbmc5c19udWxsUmVwRQogX19aTjNKU0M3 VVN0cmluZ0MxRVBLYwogX19aTjNKU0M3VVN0cmluZ0MxRVBLdGoKIF9fWk4zSlNDOERlYnVnZ2Vy MjNyZWNvbXBpbGVBbGxKU0Z1bmN0aW9uc0VQTlNfMTJKU0dsb2JhbERhdGFFCkluZGV4OiBKYXZh U2NyaXB0Q29yZS9ydW50aW1lL0ludGVybmFsRnVuY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50ZXJuYWxGdW5jdGlvbi5jcHAJKHJldmlzaW9uIDU2OTM5 KQorKysgSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRlcm5hbEZ1bmN0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBjb25zdCBDbGFzc0luZm8qIEludGVybmFsRnVuY3Rp b246OmNsYXNzCiBJbnRlcm5hbEZ1bmN0aW9uOjpJbnRlcm5hbEZ1bmN0aW9uKEpTR2xvYmFsRGF0 YSogZ2xvYmFsRGF0YSwgTm9uTnVsbFBhc3NSZWZQdHI8U3RydWN0dXJlPiBzdHJ1Y3R1cmUsIGNv bnN0IElkZW50aWZpZXImIG5hbWUpCiAgICAgOiBKU09iamVjdChzdHJ1Y3R1cmUpCiB7Ci0gICAg cHV0RGlyZWN0KGdsb2JhbERhdGEtPnByb3BlcnR5TmFtZXMtPm5hbWUsIGpzU3RyaW5nKGdsb2Jh bERhdGEsIG5hbWUudXN0cmluZygpKSwgRG9udERlbGV0ZSB8IFJlYWRPbmx5IHwgRG9udEVudW0p OworICAgIHB1dERpcmVjdChnbG9iYWxEYXRhLT5wcm9wZXJ0eU5hbWVzLT5uYW1lLCBqc1N0cmlu ZyhnbG9iYWxEYXRhLCBuYW1lLmlzTnVsbCgpID8gIiIgOiBuYW1lLnVzdHJpbmcoKSksIERvbnRE ZWxldGUgfCBSZWFkT25seSB8IERvbnRFbnVtKTsKIH0KIAogY29uc3QgVVN0cmluZyYgSW50ZXJu YWxGdW5jdGlvbjo6bmFtZShFeGVjU3RhdGUqIGV4ZWMpCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTU3RyaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U1N0cmluZy5oCShyZXZpc2lvbiA1NjkzOSkKKysrIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNT dHJpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDYgKzExNiw3IEBAIG5hbWVzcGFjZSBKU0Mg ewogICAgICAgICAgICAgLCBtX3ZhbHVlKHZhbHVlKQogICAgICAgICAgICAgLCBtX2ZpYmVyQ291 bnQoMCkKICAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKCFtX3ZhbHVlLmlzTnVsbCgpKTsK ICAgICAgICAgICAgIEhlYXA6OmhlYXAodGhpcyktPnJlcG9ydEV4dHJhTWVtb3J5Q29zdCh2YWx1 ZS5jb3N0KCkpOwogICAgICAgICB9CiAKQEAgLTEyNiw2ICsxMjcsNyBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgICAgICwgbV92YWx1ZSh2YWx1ZSkKICAgICAgICAgICAgICwgbV9maWJlckNv dW50KDApCiAgICAgICAgIHsKKyAgICAgICAgICAgIEFTU0VSVCghbV92YWx1ZS5pc051bGwoKSk7 CiAgICAgICAgIH0KICAgICAgICAgSlNTdHJpbmcoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBQ YXNzUmVmUHRyPFVTdHJpbmc6OlJlcD4gdmFsdWUsIEhhc090aGVyT3duZXJUeXBlKQogICAgICAg ICAgICAgOiBKU0NlbGwoZ2xvYmFsRGF0YS0+c3RyaW5nU3RydWN0dXJlLmdldCgpKQpAQCAtMTMz LDYgKzEzNSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgLCBtX3ZhbHVlKHZhbHVl KQogICAgICAgICAgICAgLCBtX2ZpYmVyQ291bnQoMCkKICAgICAgICAgeworICAgICAgICAgICAg QVNTRVJUKCFtX3ZhbHVlLmlzTnVsbCgpKTsKICAgICAgICAgfQogICAgICAgICBKU1N0cmluZyhK U0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIFBhc3NSZWZQdHI8Um9wZT4gcm9wZSkKICAgICAgICAg ICAgIDogSlNDZWxsKGdsb2JhbERhdGEtPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkKQEAgLTIwMiw2 ICsyMDUsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgICwgbV92YWx1ZSh2YWx1ZSkK ICAgICAgICAgICAgICwgbV9maWJlckNvdW50KDApCiAgICAgICAgIHsKKyAgICAgICAgICAgIEFT U0VSVCghbV92YWx1ZS5pc051bGwoKSk7CiAgICAgICAgICAgICAvLyBuYXN0eSBoYWNrIGJlY2F1 c2Ugd2UgY2FuJ3QgdW5pb24gbm9uLVBPRCB0eXBlcwogICAgICAgICAgICAgbV9vdGhlci5tX2Zp bmFsaXplckNhbGxiYWNrID0gZmluYWxpemVyOwogICAgICAgICAgICAgbV9vdGhlci5tX2ZpbmFs aXplckNvbnRleHQgPSBjb250ZXh0OwpJbmRleDogSmF2YVNjcmlwdENvcmUvcnVudGltZS9VU3Ry aW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9ydW50aW1lL1VTdHJpbmcuY3Bw CShyZXZpc2lvbiA1NjkzOSkKKysrIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvVVN0cmluZy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDYgQEAgZXh0ZXJuIGNvbnN0IGRvdWJsZSBOYU47 CiBleHRlcm4gY29uc3QgZG91YmxlIEluZjsKIAogLy8gVGhlIG51bGwgc3RyaW5nIGlzIGltbXV0 YWJsZSwgZXhjZXB0IGZvciByZWZDb3VudC4KLVVTdHJpbmc6OlJlcCogVVN0cmluZzo6c19udWxs UmVwOwogVVN0cmluZyogVVN0cmluZzo6c19udWxsVVN0cmluZzsKIAogdm9pZCBpbml0aWFsaXpl VVN0cmluZygpCkBAIC02Nyw3ICs2Niw2IEBAIHZvaWQgaW5pdGlhbGl6ZVVTdHJpbmcoKQogICAg IC8vIHNvIGVuc3VyZSBpdCBoYXMgYmVlbiBpbml0aWFsaXplZCBmcm9tIGhlcmUuCiAgICAgVVN0 cmluZ0ltcGw6OmVtcHR5KCk7CiAKLSAgICBVU3RyaW5nOjpzX251bGxSZXAgPSBuZXcgVVN0cmlu Z0ltcGwoMCwgMCwgVVN0cmluZ0ltcGw6OkNvbnN0cnVjdFN0YXRpY1N0cmluZyk7CiAgICAgVVN0 cmluZzo6c19udWxsVVN0cmluZyA9IG5ldyBVU3RyaW5nOwogfQogCkluZGV4OiBKYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1VTdHJpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1VTdHJpbmcuaAkocmV2aXNpb24gNTY5MzkpCisrKyBKYXZhU2NyaXB0Q29yZS9ydW50aW1l L1VTdHJpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNyArNDgsNyBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgdHlwZWRlZiBVU3RyaW5nSW1wbCBSZXA7CiAgICAgCiAgICAgcHVibGljOgot ICAgICAgICBVU3RyaW5nKCk7CisgICAgICAgIFVTdHJpbmcoKSB7fQogICAgICAgICBVU3RyaW5n KGNvbnN0IGNoYXIqKTsgLy8gQ29uc3RydWN0b3IgZm9yIG51bGwtdGVybWluYXRlZCBzdHJpbmcu CiAgICAgICAgIFVTdHJpbmcoY29uc3QgY2hhciosIHVuc2lnbmVkIGxlbmd0aCk7CiAgICAgICAg IFVTdHJpbmcoY29uc3QgVUNoYXIqLCB1bnNpZ25lZCBsZW5ndGgpOwpAQCAtNjUsMTAgKzY1LDYg QEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHsKICAgICAgICAgfQogCi0gICAgICAgIH5VU3Ry aW5nKCkKLSAgICAgICAgewotICAgICAgICB9Ci0KICAgICAgICAgdGVtcGxhdGU8c2l6ZV90IGlu bGluZUNhcGFjaXR5PgogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxVU3RyaW5nSW1wbD4gYWRv cHQoVmVjdG9yPFVDaGFyLCBpbmxpbmVDYXBhY2l0eT4mIHZlY3RvcikKICAgICAgICAgewpAQCAt OTUsMTUgKzkxLDI1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgKi8KICAgICAgICAgQ1N0 cmluZyBVVEY4U3RyaW5nKGJvb2wgc3RyaWN0ID0gZmFsc2UpIGNvbnN0OwogCi0gICAgICAgIGNv bnN0IFVDaGFyKiBkYXRhKCkgY29uc3QgeyByZXR1cm4gbV9yZXAtPmNoYXJhY3RlcnMoKTsgfQor ICAgICAgICBjb25zdCBVQ2hhciogZGF0YSgpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAg IGlmICghbV9yZXApCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1 cm4gbV9yZXAtPmNoYXJhY3RlcnMoKTsKKyAgICAgICAgfQorCisgICAgICAgIHVuc2lnbmVkIHNp emUoKSBjb25zdAorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW1fcmVwKQorICAgICAgICAg ICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIG1fcmVwLT5sZW5ndGgoKTsKKyAg ICAgICAgfQogCi0gICAgICAgIGJvb2wgaXNOdWxsKCkgY29uc3QgeyByZXR1cm4gbV9yZXAgPT0g c19udWxsUmVwOyB9Ci0gICAgICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuICFtX3Jl cC0+bGVuZ3RoKCk7IH0KKyAgICAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7IHJldHVybiAhbV9y ZXA7IH0KKyAgICAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gIW1fcmVwIHx8ICFt X3JlcC0+bGVuZ3RoKCk7IH0KIAogICAgICAgICBib29sIGlzOEJpdCgpIGNvbnN0OwogCi0gICAg ICAgIHVuc2lnbmVkIHNpemUoKSBjb25zdCB7IHJldHVybiBtX3JlcC0+bGVuZ3RoKCk7IH0KLQog ICAgICAgICBVQ2hhciBvcGVyYXRvcltdKHVuc2lnbmVkIHBvcykgY29uc3Q7CiAKICAgICAgICAg ZG91YmxlIHRvRG91YmxlKGJvb2wgdG9sZXJhdGVUcmFpbGluZ0p1bmssIGJvb2wgdG9sZXJhdGVF bXB0eVN0cmluZykgY29uc3Q7CkBAIC0xMzEsMTUgKzEzNywxMyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICAgICAgVVN0cmluZyhQYXNzUmVmUHRyPFJlcD4gcikKICAgICAgICAgICAgIDogbV9yZXAo cikKICAgICAgICAgewotICAgICAgICAgICAgQVNTRVJUKG1fcmVwKTsKICAgICAgICAgfQogCi0g ICAgICAgIHNpemVfdCBjb3N0KCkgY29uc3QgeyByZXR1cm4gbV9yZXAtPmNvc3QoKTsgfQorICAg ICAgICBzaXplX3QgY29zdCgpIGNvbnN0IHsgaWYgKCFtX3JlcCkgcmV0dXJuIDA7IHJldHVybiBt X3JlcC0+Y29zdCgpOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBSZWZQdHI8UmVwPiBtX3Jl cDsKIAotICAgICAgICBKU19FWFBPUlREQVRBIHN0YXRpYyBSZXAqIHNfbnVsbFJlcDsKICAgICAg ICAgc3RhdGljIFVTdHJpbmcqIHNfbnVsbFVTdHJpbmc7CiAKICAgICAgICAgZnJpZW5kIHZvaWQg aW5pdGlhbGl6ZVVTdHJpbmcoKTsKQEAgLTE5NCwxMSArMTk4LDYgQEAgbmFtZXNwYWNlIEpTQyB7 CiAKICAgICBpbnQgY29tcGFyZShjb25zdCBVU3RyaW5nJiwgY29uc3QgVVN0cmluZyYpOwogCi0g ICAgaW5saW5lIFVTdHJpbmc6OlVTdHJpbmcoKQotICAgICAgICA6IG1fcmVwKHNfbnVsbFJlcCkK LSAgICB7Ci0gICAgfQotCiAgICAgLy8gUnVsZSBmcm9tIEVDTUEgMTUuMiBhYm91dCB3aGF0IGFu IGFycmF5IGluZGV4IGlzLgogICAgIC8vIE11c3QgZXhhY3RseSBtYXRjaCBzdHJpbmcgZm9ybSBv ZiBhbiB1bnNpZ25lZCBpbnRlZ2VyLCBhbmQgYmUgbGVzcyB0aGFuIDJeMzIgLSAxLgogICAgIGlu bGluZSB1bnNpZ25lZCBVU3RyaW5nOjp0b0FycmF5SW5kZXgoYm9vbCogb2spIGNvbnN0Cg==