137325 2014-10-01 17:07:43 -0700 Use variadic templates for jsMakeNontrivialString 2014-10-02 09:14:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1038728 0 andersca 2014-10-01 17:07:43 -0700 Use variadic templates for jsMakeNontrivialString 1038729 1 239070 andersca 2014-10-01 17:09:35 -0700 Created attachment 239070 Patch 1038873 2 andersca 2014-10-02 09:14:28 -0700 Committed r174219: <http://trac.webkit.org/changeset/174219> 239070 2014-10-01 17:09:35 -0700 2014-10-01 21:41:30 -0700 Patch bug-137325-20141001170938.patch text/plain 6118 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj YmEyMDQ0OWM5NmM2MDM3ZjQzMjMwNjdkNTM4MjRmNzliM2VmMzBmLi44MTBjNzIzOWFkY2M1MTkx N2NmZmY0YjcwN2MyNmY1YmI5NWQ4ZWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNC0xMC0wMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIFVzZSB2YXJpYWRpYyB0ZW1wbGF0ZXMgZm9yIGpzTWFrZU5vbnRyaXZp YWxTdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNzMyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcnVudGltZS9KU1N0cmluZy5oOgorICAgICAgICAoSlNDOjpqc05vbnRyaXZpYWxTdHJpbmcp OgorICAgICAgICBBZGQgYW4gb3ZlcmxvYWQgdGhhdCB0YWtlcyBhbiBydmFsdWUgcmVmZXJlbmNl IHRvIGEgU3RyaW5nIHNvIHdlIGNhbiB0cmFuc2ZlciBvd25lcnNoaXAgZWFzaWx5LgorCisgICAg ICAgICogcnVudGltZS9KU1N0cmluZ0J1aWxkZXIuaDoKKyAgICAgICAgKEpTQzo6anNNYWtlTm9u dHJpdmlhbFN0cmluZyk6CisgICAgICAgIE1ha2UgdGhpcyBhIHZhcmlhZGljIGZ1bmN0aW9uIHRl bXBsYXRlLCB3aXRoIGEgc2luZ2xlLXBhcmFtZXRlciB2ZXJzaW9uIHRoYXQgY2FuIHN0ZWFsIHRo ZSBzdHJpbmcgaWYgaXQncyBPSyB0byBkbyBzby4KKwogMjAxNC0wOS0zMCAgQnJpYW4gSi4gQnVy ZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIFJlcGxheTogdXNlIHN0 YXRpYyBTdHJpbmdzIGluc3RlYWQgb2YgQXRvbWljU3RyaW5ncyBmb3IgcmVwbGF5IGlucHV0IHR5 cGUgdGFncwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJp bmcuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmgKaW5kZXggMDhj NmQxN2MwMWZlZTkzOGYwMjc4YTZlNTQzN2NlMmU0OGZmZGU4Yy4uY2FhNzIzNjU1YzZhYTU2NDg0 YWYxOWQ0OGM4NWEyZjM1YzhlZDUwZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNTdHJpbmcuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U1N0cmluZy5oCkBAIC01Miw2ICs1Miw3IEBAIEpTU3RyaW5nKiBqc1N1YnN0cmluZyhFeGVjU3Rh dGUqLCBjb25zdCBTdHJpbmcmLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0CiAvLyBU aGVzZSBmdW5jdGlvbnMgYXJlIGZhc3RlciB0aGFuIGp1c3QgY2FsbGluZyBqc1N0cmluZy4KIEpT U3RyaW5nKiBqc05vbnRyaXZpYWxTdHJpbmcoVk0qLCBjb25zdCBTdHJpbmcmKTsKIEpTU3RyaW5n KiBqc05vbnRyaXZpYWxTdHJpbmcoRXhlY1N0YXRlKiwgY29uc3QgU3RyaW5nJik7CitKU1N0cmlu ZyoganNOb250cml2aWFsU3RyaW5nKEV4ZWNTdGF0ZSosIFN0cmluZyYmKTsKIAogLy8gU2hvdWxk IGJlIHVzZWQgZm9yIHN0cmluZ3MgdGhhdCBhcmUgb3duZWQgYnkgYW4gb2JqZWN0IHRoYXQgd2ls bAogLy8gbGlrZWx5IG91dGxpdmUgdGhlIEpTVmFsdWUgdGhpcyBtYWtlcywgc3VjaCBhcyB0aGUg cGFyc2UgdHJlZSBvciBhCkBAIC00NTcsNiArNDU4LDEyIEBAIGlubGluZSBKU1N0cmluZyoganNO b250cml2aWFsU3RyaW5nKFZNKiB2bSwgY29uc3QgU3RyaW5nJiBzKQogICAgIHJldHVybiBKU1N0 cmluZzo6Y3JlYXRlKCp2bSwgcy5pbXBsKCkpOwogfQogCitpbmxpbmUgSlNTdHJpbmcqIGpzTm9u dHJpdmlhbFN0cmluZyhWTSogdm0sIFN0cmluZyYmIHMpCit7CisgICAgQVNTRVJUKHMubGVuZ3Ro KCkgPiAxKTsKKyAgICByZXR1cm4gSlNTdHJpbmc6OmNyZWF0ZSgqdm0sIHMucmVsZWFzZUltcGwo KSk7Cit9CisKIEFMV0FZU19JTkxJTkUgSWRlbnRpZmllciBKU1N0cmluZzo6dG9JZGVudGlmaWVy KEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKIHsKICAgICByZXR1cm4gSWRlbnRpZmllcihleGVjLCB0 b0F0b21pY1N0cmluZyhleGVjKSk7CkBAIC01ODUsNiArNTkyLDcgQEAgaW5saW5lIEpTU3RyaW5n KiBqc1NpbmdsZUNoYXJhY3RlclN0cmluZyhFeGVjU3RhdGUqIGV4ZWMsIFVDaGFyIGMpIHsgcmV0 dXJuIGpzU2kKIGlubGluZSBKU1N0cmluZyoganNTdWJzdHJpbmc4KEV4ZWNTdGF0ZSogZXhlYywg Y29uc3QgU3RyaW5nJiBzLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCkgeyByZXR1 cm4ganNTdWJzdHJpbmc4KCZleGVjLT52bSgpLCBzLCBvZmZzZXQsIGxlbmd0aCk7IH0KIGlubGlu ZSBKU1N0cmluZyoganNTdWJzdHJpbmcoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBTdHJpbmcmIHMs IHVuc2lnbmVkIG9mZnNldCwgdW5zaWduZWQgbGVuZ3RoKSB7IHJldHVybiBqc1N1YnN0cmluZygm ZXhlYy0+dm0oKSwgcywgb2Zmc2V0LCBsZW5ndGgpOyB9CiBpbmxpbmUgSlNTdHJpbmcqIGpzTm9u dHJpdmlhbFN0cmluZyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFN0cmluZyYgcykgeyByZXR1cm4g anNOb250cml2aWFsU3RyaW5nKCZleGVjLT52bSgpLCBzKTsgfQoraW5saW5lIEpTU3RyaW5nKiBq c05vbnRyaXZpYWxTdHJpbmcoRXhlY1N0YXRlKiBleGVjLCBTdHJpbmcmJiBzKSB7IHJldHVybiBq c05vbnRyaXZpYWxTdHJpbmcoJmV4ZWMtPnZtKCksIFdURjo6bW92ZShzKSk7IH0KIGlubGluZSBK U1N0cmluZyoganNPd25lZFN0cmluZyhFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFN0cmluZyYgcykg eyByZXR1cm4ganNPd25lZFN0cmluZygmZXhlYy0+dm0oKSwgcyk7IH0KIAogSlNfRVhQT1JUX1BS SVZBVEUgSlNTdHJpbmcqIGpzU3RyaW5nV2l0aENhY2hlU2xvd0Nhc2UoVk0mLCBTdHJpbmdJbXBs Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmluZ0J1 aWxkZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nQnVpbGRlci5o CmluZGV4IDYzZTUxYTNjZTI5ZmViYzgwODYwZjlkYTM1NzIxN2MxNjFhNjhkMWYuLjM0ZjQzYzRk YjIxYWEyM2ZmZTRhNDAzNzMxZWEyOTczNDI4YWMwNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nQnVpbGRlci5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nQnVpbGRlci5oCkBAIC0xMTgsNDkgKzExOCwxOSBAQCBw cml2YXRlOgogICAgIGJvb2wgbV9pczhCaXQ7CiB9OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBTdHJp bmdUeXBlMSwgdHlwZW5hbWUgU3RyaW5nVHlwZTI+Ci1pbmxpbmUgSlNWYWx1ZSBqc01ha2VOb250 cml2aWFsU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nVHlwZTEgc3RyaW5nMSwgU3RyaW5n VHlwZTIgc3RyaW5nMikKK3RlbXBsYXRlPHR5cGVuYW1lIFN0cmluZ1R5cGU+CitpbmxpbmUgSlNW YWx1ZSBqc01ha2VOb250cml2aWFsU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nVHlwZSYm IHN0cmluZykKIHsKLSAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHJlc3VsdCA9IFdURjo6dHJ5 TWFrZVN0cmluZyhzdHJpbmcxLCBzdHJpbmcyKTsKLSAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAg cmV0dXJuIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjKTsKLSAgICByZXR1cm4ganNOb250cml2 aWFsU3RyaW5nKGV4ZWMsIHJlc3VsdCk7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFN0cmluZ1R5 cGUxLCB0eXBlbmFtZSBTdHJpbmdUeXBlMiwgdHlwZW5hbWUgU3RyaW5nVHlwZTM+Ci1pbmxpbmUg SlNWYWx1ZSBqc01ha2VOb250cml2aWFsU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nVHlw ZTEgc3RyaW5nMSwgU3RyaW5nVHlwZTIgc3RyaW5nMiwgU3RyaW5nVHlwZTMgc3RyaW5nMykKLXsK LSAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHJlc3VsdCA9IFdURjo6dHJ5TWFrZVN0cmluZyhz dHJpbmcxLCBzdHJpbmcyLCBzdHJpbmczKTsKLSAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0 dXJuIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjKTsKLSAgICByZXR1cm4ganNOb250cml2aWFs U3RyaW5nKGV4ZWMsIHJlc3VsdCk7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFN0cmluZ1R5cGUx LCB0eXBlbmFtZSBTdHJpbmdUeXBlMiwgdHlwZW5hbWUgU3RyaW5nVHlwZTMsIHR5cGVuYW1lIFN0 cmluZ1R5cGU0PgotaW5saW5lIEpTVmFsdWUganNNYWtlTm9udHJpdmlhbFN0cmluZyhFeGVjU3Rh dGUqIGV4ZWMsIFN0cmluZ1R5cGUxIHN0cmluZzEsIFN0cmluZ1R5cGUyIHN0cmluZzIsIFN0cmlu Z1R5cGUzIHN0cmluZzMsIFN0cmluZ1R5cGU0IHN0cmluZzQpCi17Ci0gICAgUGFzc1JlZlB0cjxT dHJpbmdJbXBsPiByZXN1bHQgPSBXVEY6OnRyeU1ha2VTdHJpbmcoc3RyaW5nMSwgc3RyaW5nMiwg c3RyaW5nMywgc3RyaW5nNCk7Ci0gICAgaWYgKCFyZXN1bHQpCi0gICAgICAgIHJldHVybiB0aHJv d091dE9mTWVtb3J5RXJyb3IoZXhlYyk7Ci0gICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhl eGVjLCByZXN1bHQpOwotfQotCi10ZW1wbGF0ZTx0eXBlbmFtZSBTdHJpbmdUeXBlMSwgdHlwZW5h bWUgU3RyaW5nVHlwZTIsIHR5cGVuYW1lIFN0cmluZ1R5cGUzLCB0eXBlbmFtZSBTdHJpbmdUeXBl NCwgdHlwZW5hbWUgU3RyaW5nVHlwZTU+Ci1pbmxpbmUgSlNWYWx1ZSBqc01ha2VOb250cml2aWFs U3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nVHlwZTEgc3RyaW5nMSwgU3RyaW5nVHlwZTIg c3RyaW5nMiwgU3RyaW5nVHlwZTMgc3RyaW5nMywgU3RyaW5nVHlwZTQgc3RyaW5nNCwgU3RyaW5n VHlwZTUgc3RyaW5nNSkKLXsKLSAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHJlc3VsdCA9IFdU Rjo6dHJ5TWFrZVN0cmluZyhzdHJpbmcxLCBzdHJpbmcyLCBzdHJpbmczLCBzdHJpbmc0LCBzdHJp bmc1KTsKLSAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0dXJuIHRocm93T3V0T2ZNZW1vcnlF cnJvcihleGVjKTsKLSAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIHJlc3VsdCk7 CisgICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBzdGQ6OmZvcndhcmQ8U3RyaW5n VHlwZT4oc3RyaW5nKSk7CiB9CiAKLXRlbXBsYXRlPHR5cGVuYW1lIFN0cmluZ1R5cGUxLCB0eXBl bmFtZSBTdHJpbmdUeXBlMiwgdHlwZW5hbWUgU3RyaW5nVHlwZTMsIHR5cGVuYW1lIFN0cmluZ1R5 cGU0LCB0eXBlbmFtZSBTdHJpbmdUeXBlNSwgdHlwZW5hbWUgU3RyaW5nVHlwZTY+Ci1pbmxpbmUg SlNWYWx1ZSBqc01ha2VOb250cml2aWFsU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nVHlw ZTEgc3RyaW5nMSwgU3RyaW5nVHlwZTIgc3RyaW5nMiwgU3RyaW5nVHlwZTMgc3RyaW5nMywgU3Ry aW5nVHlwZTQgc3RyaW5nNCwgU3RyaW5nVHlwZTUgc3RyaW5nNSwgU3RyaW5nVHlwZTYgc3RyaW5n NikKK3RlbXBsYXRlPHR5cGVuYW1lIFN0cmluZ1R5cGUsIHR5cGVuYW1lLi4uIFN0cmluZ1R5cGVz PgoraW5saW5lIEpTVmFsdWUganNNYWtlTm9udHJpdmlhbFN0cmluZyhFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IFN0cmluZ1R5cGUmIHN0cmluZywgY29uc3QgU3RyaW5nVHlwZXMmLi4uIHN0cmluZ3Mp CiB7Ci0gICAgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiByZXN1bHQgPSBXVEY6OnRyeU1ha2VTdHJp bmcoc3RyaW5nMSwgc3RyaW5nMiwgc3RyaW5nMywgc3RyaW5nNCwgc3RyaW5nNSwgc3RyaW5nNik7 CisgICAgUmVmUHRyPFN0cmluZ0ltcGw+IHJlc3VsdCA9IFdURjo6dHJ5TWFrZVN0cmluZyhzdHJp bmcsIHN0cmluZ3MuLi4pOwogICAgIGlmICghcmVzdWx0KQogICAgICAgICByZXR1cm4gdGhyb3dP dXRPZk1lbW9yeUVycm9yKGV4ZWMpOwotICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJpbmcoZXhl YywgcmVzdWx0KTsKKyAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIHJlc3VsdC5y ZWxlYXNlKCkpOwogfQogCiB9Cg==