121523 2013-09-17 14:41:39 -0700 Add make_unique and start using it 2013-09-18 18:43:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam benjamin cmarcelo commit-queue esprehn+autocc oldest_to_newest 930406 0 sam 2013-09-17 14:41:39 -0700 Add make_unique and start using it 930408 1 211946 sam 2013-09-17 14:43:45 -0700 Created attachment 211946 Patch 930410 2 sam 2013-09-17 14:44:59 -0700 Committed r156000: <http://trac.webkit.org/changeset/156000> 930808 3 211946 darin 2013-09-18 18:30:35 -0700 Comment on attachment 211946 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211946&action=review > Source/WTF/wtf/StdLibExtras.h:311 > +// For standard libraries that do not yet include it, this adds the std::make_unique > +// type. It is defined in the same namespaces as it would be in library that had the > +// support. But this is not conditional. How does it not cause a problem in libraries that do include it? Also, std::make_unique is a function template, not a type. 930813 4 sam 2013-09-18 18:43:49 -0700 (In reply to comment #3) > (From update of attachment 211946 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=211946&action=review > > > Source/WTF/wtf/StdLibExtras.h:311 > > +// For standard libraries that do not yet include it, this adds the std::make_unique > > +// type. It is defined in the same namespaces as it would be in library that had the > > +// support. > > But this is not conditional. How does it not cause a problem in libraries that do include it? When libraries that support it come into existence (e.g. we get a compile failure), I plan to add a conditional #if STANDARD_LIBRARY_SUPPORTS(...) or something like that. > Also, std::make_unique is a function template, not a type. Good point. 211946 2013-09-17 14:43:45 -0700 2013-09-18 18:30:35 -0700 Patch bug-121523-20130917144345.patch text/plain 7242 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNTU5OTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA5LTE3ICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CisKKyAgICAgICAgQWRkIG1ha2VfdW5pcXVlIGFuZCBzdGFydCB1c2luZyBpdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNTIzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvU3Rk TGliRXh0cmFzLmg6CisgICAgICAgIChzdGQ6Om1ha2VfdW5pcXVlKToKKyAgICAgICAgQWRkIHRl bXBvcmFyeSBpbXBsZW1lbnRhdGlvbiBvZiBzdGQ6Om1ha2VfdW5pcXVlIHRoYXQgd2UgY2FuIHVz ZSB1bnRpbCBvdXIgc3RhbmRhcmQKKyAgICAgICAgbGlicmFyaWVzIGhhdmUgc3VwcG9ydCBmb3Ig aXQuCisKIDIwMTMtMDktMTcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIE1ha2UgU1ZHVHJhbnNmb3JtOjp2YWx1ZUFzU3RyaW5nIHVzZSBTdHJpbmdCdWlsZGVyCklu ZGV4OiBTb3VyY2UvV1RGL3d0Zi9TdGRMaWJFeHRyYXMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V1RGL3d0Zi9TdGRMaWJFeHRyYXMuaAkocmV2aXNpb24gMTU1OTk0KQorKysgU291cmNlL1dURi93 dGYvU3RkTGliRXh0cmFzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpZm5k ZWYgV1RGX1N0ZExpYkV4dHJhc19oCiAjZGVmaW5lIFdURl9TdGRMaWJFeHRyYXNfaAogCisjaW5j bHVkZSA8bWVtb3J5PgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3Rm L0NoZWNrZWRBcml0aG1ldGljLmg+CiAKQEAgLTMwNCw2ICszMDUsNjUgQEAgaW5saW5lIHZvaWQq IG9wZXJhdG9yIG5ldyhzaXplX3QsIE5vdE51bAogICAgIHJldHVybiBsb2NhdGlvbjsKIH0KIAor CisvLyBGb3Igc3RhbmRhcmQgbGlicmFyaWVzIHRoYXQgZG8gbm90IHlldCBpbmNsdWRlIGl0LCB0 aGlzIGFkZHMgdGhlIHN0ZDo6bWFrZV91bmlxdWUKKy8vIHR5cGUuIEl0IGlzIGRlZmluZWQgaW4g dGhlIHNhbWUgbmFtZXNwYWNlcyBhcyBpdCB3b3VsZCBiZSBpbiBsaWJyYXJ5IHRoYXQgaGFkIHRo ZQorLy8gc3VwcG9ydC4KKworbmFtZXNwYWNlIHN0ZCB7CisKKyAgICB0ZW1wbGF0ZTxjbGFzcyBU PiBzdHJ1Y3QgX1VuaXF1ZV9pZiB7CisgICAgICAgIHR5cGVkZWYgdW5pcXVlX3B0cjxUPiBfU2lu Z2xlX29iamVjdDsKKyAgICB9OworCisgICAgdGVtcGxhdGU8Y2xhc3MgVD4gc3RydWN0IF9Vbmlx dWVfaWY8VFtdPiB7CisgICAgICAgIHR5cGVkZWYgdW5pcXVlX3B0cjxUW10+IF9Vbmtub3duX2Jv dW5kOworICAgIH07CisKKyAgICB0ZW1wbGF0ZTxjbGFzcyBULCBzaXplX3QgTj4gc3RydWN0IF9V bmlxdWVfaWY8VFtOXT4geworICAgICAgICB0eXBlZGVmIHZvaWQgX0tub3duX2JvdW5kOworICAg IH07CisKKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfVkFSSUFESUNfVEVNUExBVEVTKQorICAg IHRlbXBsYXRlPGNsYXNzIFQsIGNsYXNzLi4uIEFyZ3M+IHR5cGVuYW1lIF9VbmlxdWVfaWY8VD46 Ol9TaW5nbGVfb2JqZWN0CisgICAgbWFrZV91bmlxdWUoQXJncyYmLi4uIGFyZ3MpCisgICAgewor ICAgICAgICByZXR1cm4gdW5pcXVlX3B0cjxUPihuZXcgVChzdGQ6OmZvcndhcmQ8QXJncz4oYXJn cykuLi4pKTsKKyAgICB9CisjZWxzZQorICAgIHRlbXBsYXRlPGNsYXNzIFQ+IHR5cGVuYW1lIF9V bmlxdWVfaWY8VD46Ol9TaW5nbGVfb2JqZWN0CisgICAgbWFrZV91bmlxdWUoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHVuaXF1ZV9wdHI8VD4obmV3IFQpOworICAgIH0KKworICAgIHRlbXBsYXRl PGNsYXNzIFQsIGNsYXNzIEExPiB0eXBlbmFtZSBfVW5pcXVlX2lmPFQ+OjpfU2luZ2xlX29iamVj dAorICAgIG1ha2VfdW5pcXVlKEExJiYgYTEpCisgICAgeworICAgICAgICByZXR1cm4gdW5pcXVl X3B0cjxUPihuZXcgVChzdGQ6OmZvcndhcmQ8QTE+KGExKSkpOworICAgIH0KKworICAgIHRlbXBs YXRlPGNsYXNzIFQsIGNsYXNzIEExLCBjbGFzcyBBMj4gdHlwZW5hbWUgX1VuaXF1ZV9pZjxUPjo6 X1NpbmdsZV9vYmplY3QKKyAgICBtYWtlX3VuaXF1ZShBMSYmIGExLCBBMSYmIGEyKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHVuaXF1ZV9wdHI8VD4obmV3IFQoc3RkOjpmb3J3YXJkPEExPihhMSks IHN0ZDo6Zm9yd2FyZDxBMj4oYTIpKSk7CisgICAgfQorI2VuZGlmCisKKyAgICB0ZW1wbGF0ZTxj bGFzcyBUPiB0eXBlbmFtZSBfVW5pcXVlX2lmPFQ+OjpfVW5rbm93bl9ib3VuZAorICAgIG1ha2Vf dW5pcXVlKHNpemVfdCBuKQorICAgIHsKKyAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSByZW1vdmVf ZXh0ZW50PFQ+Ojp0eXBlIFU7CisgICAgICAgIHJldHVybiB1bmlxdWVfcHRyPFQ+KG5ldyBVW25d KCkpOworICAgIH0KKyAgICAKKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhDWFhfVkFSSUFESUNfVEVN UExBVEVTKQorICAgIHRlbXBsYXRlPGNsYXNzIFQsIGNsYXNzLi4uIEFyZ3M+IHR5cGVuYW1lIF9V bmlxdWVfaWY8VD46Ol9Lbm93bl9ib3VuZAorICAgIG1ha2VfdW5pcXVlKEFyZ3MmJi4uLikgPSBk ZWxldGU7CisjZW5kaWYKKworfQorCiB1c2luZyBXVEY6OktCOwogdXNpbmcgV1RGOjpNQjsKIHVz aW5nIFdURjo6aW5zZXJ0SW50b0JvdW5kZWRWZWN0b3I7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lv biAxNTU5OTgpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxOCBAQAorMjAxMy0wOS0xNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgor CisgICAgICAgIEFkZCBtYWtlX3VuaXF1ZSBhbmQgc3RhcnQgdXNpbmcgaXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTUyMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZVNldEVsZW1lbnQuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9MZW5ndGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6bmV3Q29vcmRzQXJyYXkpOgor ICAgICAgICAoV2ViQ29yZTo6bmV3TGVuZ3RoQXJyYXkpOgorICAgICAgICAqIHBsYXRmb3JtL0xl bmd0aC5oOgorICAgICAgICBTd2l0Y2ggb2ZmIE93bkFycmF5UHRyIHRvIHN0ZDo6dW5pcXVlX3B0 cjxUW10+IGFuZCBtYWtlIHVzZSBvZiBtYWtlX3VuaXF1ZS4KKwogMjAxMy0wOS0xNyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBIYXJkd2FyZSBhY2Nl bGVyYXRlZCBDU1MgdHJhbnNpdGlvbnMgYXBwZWFyIHBpeGVsYXRlZCB3aGVuIHNjYWxlZCB1cCB1 c2luZyB0cmFuc2Zvcm0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuaAko cmV2aXNpb24gMTU1OTk0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQu aAkod29ya2luZyBjb3B5KQpAQCAtNjQsNyArNjQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgaW52 YWxpZGF0ZUNhY2hlZFJlZ2lvbigpOwogCiAgICAgT3duUHRyPFBhdGg+IG1fcmVnaW9uOwotICAg IE93bkFycmF5UHRyPExlbmd0aD4gbV9jb29yZHM7CisgICAgc3RkOjp1bmlxdWVfcHRyPExlbmd0 aFtdPiBtX2Nvb3JkczsKICAgICBpbnQgbV9jb29yZHNMZW47CiAgICAgTGF5b3V0U2l6ZSBtX2xh c3RTaXplOwogICAgIFNoYXBlIG1fc2hhcGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxGcmFtZVNldEVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxGcmFtZVNldEVsZW1lbnQuaAkocmV2aXNpb24gMTU1OTk0KQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRnJhbWVTZXRFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTg0LDggKzg0LDgg QEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIEluc2VydGlvbk5vdGlmaWNhdGlvblJlcXVlc3QgaW5z ZXJ0ZWRJbnRvKENvbnRhaW5lck5vZGUqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgcmVt b3ZlZEZyb20oQ29udGFpbmVyTm9kZSopIE9WRVJSSURFOwogCi0gICAgT3duQXJyYXlQdHI8TGVu Z3RoPiBtX3Jvd0xlbmd0aHM7Ci0gICAgT3duQXJyYXlQdHI8TGVuZ3RoPiBtX2NvbExlbmd0aHM7 CisgICAgc3RkOjp1bmlxdWVfcHRyPExlbmd0aFtdPiBtX3Jvd0xlbmd0aHM7CisgICAgc3RkOjp1 bmlxdWVfcHRyPExlbmd0aFtdPiBtX2NvbExlbmd0aHM7CiAKICAgICBpbnQgbV90b3RhbFJvd3M7 CiAgICAgaW50IG1fdG90YWxDb2xzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVu Z3RoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguY3Bw CShyZXZpc2lvbiAxNTU5OTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw3IEBACiAjaW5jbHVkZSAiQ2FsY3VsYXRpb25W YWx1ZS5oIgogI2luY2x1ZGUgPHd0Zi9BU0NJSUNUeXBlLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2Vy dGlvbnMuaD4KLSNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KKyNpbmNsdWRlIDx3dGYvU3Rk TGliRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVmZmVyLmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTg1LDcgKzg1LDcgQEAgc3RhdGljIGludCBj b3VudENoYXJhY3Rlcihjb25zdCBVQ2hhciogZAogICAgIHJldHVybiBjb3VudDsKIH0KIAotT3du QXJyYXlQdHI8TGVuZ3RoPiBuZXdDb29yZHNBcnJheShjb25zdCBTdHJpbmcmIHN0cmluZywgaW50 JiBsZW4pCitzdGQ6OnVuaXF1ZV9wdHI8TGVuZ3RoW10+IG5ld0Nvb3Jkc0FycmF5KGNvbnN0IFN0 cmluZyYgc3RyaW5nLCBpbnQmIGxlbikKIHsKICAgICB1bnNpZ25lZCBsZW5ndGggPSBzdHJpbmcu bGVuZ3RoKCk7CiAgICAgY29uc3QgVUNoYXIqIGRhdGEgPSBzdHJpbmcuY2hhcmFjdGVycygpOwpA QCAtMTAyLDcgKzEwMiw3IEBAIE93bkFycmF5UHRyPExlbmd0aD4gbmV3Q29vcmRzQXJyYXkoY29u c3QKICAgICBzdHIgPSBzdHItPnNpbXBsaWZ5V2hpdGVTcGFjZSgpOwogCiAgICAgbGVuID0gY291 bnRDaGFyYWN0ZXIoc3RyLT5jaGFyYWN0ZXJzKCksIHN0ci0+bGVuZ3RoKCksICcgJykgKyAxOwot ICAgIE93bkFycmF5UHRyPExlbmd0aD4gciA9IGFkb3B0QXJyYXlQdHIobmV3IExlbmd0aFtsZW5d KTsKKyAgICBhdXRvIHIgPSBzdGQ6Om1ha2VfdW5pcXVlPExlbmd0aFtdPihsZW4pOwogCiAgICAg aW50IGkgPSAwOwogICAgIHVuc2lnbmVkIHBvcyA9IDA7CkBAIC0xMTksNyArMTE5LDcgQEAgT3du QXJyYXlQdHI8TGVuZ3RoPiBuZXdDb29yZHNBcnJheShjb25zdAogICAgIHJldHVybiByOwogfQog Ci1Pd25BcnJheVB0cjxMZW5ndGg+IG5ld0xlbmd0aEFycmF5KGNvbnN0IFN0cmluZyYgc3RyaW5n LCBpbnQmIGxlbikKK3N0ZDo6dW5pcXVlX3B0cjxMZW5ndGhbXT4gbmV3TGVuZ3RoQXJyYXkoY29u c3QgU3RyaW5nJiBzdHJpbmcsIGludCYgbGVuKQogewogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBz dHIgPSBzdHJpbmcuaW1wbCgpLT5zaW1wbGlmeVdoaXRlU3BhY2UoKTsKICAgICBpZiAoIXN0ci0+ bGVuZ3RoKCkpIHsKQEAgLTEyOCw3ICsxMjgsNyBAQCBPd25BcnJheVB0cjxMZW5ndGg+IG5ld0xl bmd0aEFycmF5KGNvbnN0CiAgICAgfQogCiAgICAgbGVuID0gY291bnRDaGFyYWN0ZXIoc3RyLT5j aGFyYWN0ZXJzKCksIHN0ci0+bGVuZ3RoKCksICcsJykgKyAxOwotICAgIE93bkFycmF5UHRyPExl bmd0aD4gciA9IGFkb3B0QXJyYXlQdHIobmV3IExlbmd0aFtsZW5dKTsKKyAgICBhdXRvIHIgPSBz dGQ6Om1ha2VfdW5pcXVlPExlbmd0aFtdPihsZW4pOwogCiAgICAgaW50IGkgPSAwOwogICAgIHVu c2lnbmVkIHBvcyA9IDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguaAkocmV2aXNpb24g MTU1OTk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI0LDYgKzI0LDcgQEAKICNkZWZpbmUgTGVuZ3RoX2gKIAogI2luY2x1ZGUgIkFuaW1h dGlvblV0aWxpdGllcy5oIgorI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDxzdHJpbmcuaD4K ICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+ CkBAIC0zMDUsOCArMzA2LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNGbG9hdDsKIH07CiAK LU93bkFycmF5UHRyPExlbmd0aD4gbmV3Q29vcmRzQXJyYXkoY29uc3QgU3RyaW5nJiwgaW50JiBs ZW4pOwotT3duQXJyYXlQdHI8TGVuZ3RoPiBuZXdMZW5ndGhBcnJheShjb25zdCBTdHJpbmcmLCBp bnQmIGxlbik7CitzdGQ6OnVuaXF1ZV9wdHI8TGVuZ3RoW10+IG5ld0Nvb3Jkc0FycmF5KGNvbnN0 IFN0cmluZyYsIGludCYgbGVuKTsKK3N0ZDo6dW5pcXVlX3B0cjxMZW5ndGhbXT4gbmV3TGVuZ3Ro QXJyYXkoY29uc3QgU3RyaW5nJiwgaW50JiBsZW4pOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAK