75663 2012-01-05 15:37:10 -0800 Move Cookie.h into namespace Platform 2012-01-05 16:10:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED LATER P2 Normal --- 75664 1 abarth abarth eric jamesr oldest_to_newest 530709 0 abarth 2012-01-05 15:37:10 -0800 Move Cookie.h into namespace Platform 530710 1 121351 abarth 2012-01-05 15:37:43 -0800 Created attachment 121351 Patch 530721 2 121351 jamesr 2012-01-05 15:45:56 -0800 Comment on attachment 121351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121351&action=review > Source/WebCore/platform/Cookie.h:86 > +using Platform::Cookie; > +using Platform::CookieHash; can we just update people using this to the new namespace as we migrate types? i'm really concerned about collisions if we end up putting every type in WebCore/platform into the global namespace 530723 3 121351 eric 2012-01-05 15:46:12 -0800 Comment on attachment 121351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121351&action=review > Source/WebCore/platform/chromium/PlatformSupport.h:38 > +#include "Cookie.h" Why include instead of just forward declare in the right namespace? 121351 2012-01-05 15:37:43 -0800 2012-01-05 16:09:58 -0800 Patch bug-75663-20120105153742.patch text/plain 5088 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDIzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTA1ICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBDb29raWUuaCBpbnRvIG5h bWVzcGFjZSBQbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzU2NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL0Nvb2tpZS5oOgorICAgICAgICAoUGxhdGZvcm06OkNvb2tpZTo6 Q29va2llKToKKyAgICAgICAgKFBsYXRmb3JtOjpDb29raWVIYXNoOjpoYXNoKToKKyAgICAgICAg KFBsYXRmb3JtOjpDb29raWVIYXNoOjplcXVhbCk6CisgICAgICAgICogcGxhdGZvcm0vQ29va2ll SmFyLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0Lmg6CisK IDIwMTItMDEtMDUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBJ bnRyb2R1Y2UgUGxhdGZvcm0gbmFtZXNwYWNlIGZvciBXZWJDb3JlL3BsYXRmb3JtCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db29raWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Db29raWUuaAkocmV2aXNpb24gMTA0MTg0KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vQ29va2llLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDU3ICsyNiw2MyBAQAog I2lmbmRlZiBDb29raWVfaAogI2RlZmluZSBDb29raWVfaAogCi0jaW5jbHVkZSAiUGxhdGZvcm1T dHJpbmcuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CisjaW5jbHVkZSA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKLW5hbWVzcGFjZSBXZWJDb3JlIHsKK25hbWVzcGFjZSBQbGF0 Zm9ybSB7CiAKLSAgICAvLyBUaGlzIHN0cnVjdCBpcyBjdXJyZW50bHkgb25seSB1c2VkIHRvIHBy b3ZpZGUgbW9yZSBjb29raWVzIGluZm9ybWF0aW9uCi0gICAgLy8gdG8gdGhlIFdlYiBJbnNwZWN0 b3IuCisvLyBUaGlzIHN0cnVjdCBpcyBjdXJyZW50bHkgb25seSB1c2VkIHRvIHByb3ZpZGUgbW9y ZSBjb29raWVzIGluZm9ybWF0aW9uCisvLyB0byB0aGUgV2ViIEluc3BlY3Rvci4KIAotICAgIHN0 cnVjdCBDb29raWUgewotICAgICAgICBDb29raWUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBT dHJpbmcmIHZhbHVlLCBjb25zdCBTdHJpbmcmIGRvbWFpbiwKLSAgICAgICAgICAgICAgICBjb25z dCBTdHJpbmcmIHBhdGgsIGRvdWJsZSBleHBpcmVzLCBib29sIGh0dHBPbmx5LCBib29sIHNlY3Vy ZSwKLSAgICAgICAgICAgICAgICBib29sIHNlc3Npb24pCi0gICAgICAgICAgICA6IG5hbWUobmFt ZSkKLSAgICAgICAgICAgICwgdmFsdWUodmFsdWUpCi0gICAgICAgICAgICAsIGRvbWFpbihkb21h aW4pCi0gICAgICAgICAgICAsIHBhdGgocGF0aCkKLSAgICAgICAgICAgICwgZXhwaXJlcyhleHBp cmVzKQotICAgICAgICAgICAgLCBodHRwT25seShodHRwT25seSkKLSAgICAgICAgICAgICwgc2Vj dXJlKHNlY3VyZSkKLSAgICAgICAgICAgICwgc2Vzc2lvbihzZXNzaW9uKQotICAgICAgICB7Ci0g ICAgICAgIH0KLQotICAgICAgICBTdHJpbmcgbmFtZTsKLSAgICAgICAgU3RyaW5nIHZhbHVlOwot ICAgICAgICBTdHJpbmcgZG9tYWluOwotICAgICAgICBTdHJpbmcgcGF0aDsKLSAgICAgICAgZG91 YmxlIGV4cGlyZXM7Ci0gICAgICAgIGJvb2wgaHR0cE9ubHk7Ci0gICAgICAgIGJvb2wgc2VjdXJl OwotICAgICAgICBib29sIHNlc3Npb247Ci0gICAgfTsKLQotICAgIHN0cnVjdCBDb29raWVIYXNo IHsKLSAgICAgICAgc3RhdGljIHVuc2lnbmVkIGhhc2goQ29va2llIGtleSkKLSAgICAgICAgeyAK LSAgICAgICAgICAgIHJldHVybiBTdHJpbmdIYXNoOjpoYXNoKGtleS5uYW1lKSArIFN0cmluZ0hh c2g6Omhhc2goa2V5LmRvbWFpbikgKyBTdHJpbmdIYXNoOjpoYXNoKGtleS5wYXRoKSArIGtleS5z ZWN1cmU7Ci0gICAgICAgIH0KLQotICAgICAgICBzdGF0aWMgYm9vbCBlcXVhbChDb29raWUgYSwg Q29va2llIGIpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBhLm5hbWUgPT0gYi5uYW1l ICYmIGEuZG9tYWluID09IGIuZG9tYWluICYmIGEucGF0aCA9PSBiLnBhdGggJiYgYS5zZWN1cmUg PT0gYi5zZWN1cmU7Ci0gICAgICAgIH0KLSAgICB9OwotfQorc3RydWN0IENvb2tpZSB7CisgICAg Q29va2llKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3QgU3Ry aW5nJiBkb21haW4sCisgICAgICAgICAgICBjb25zdCBTdHJpbmcmIHBhdGgsIGRvdWJsZSBleHBp cmVzLCBib29sIGh0dHBPbmx5LCBib29sIHNlY3VyZSwKKyAgICAgICAgICAgIGJvb2wgc2Vzc2lv bikKKyAgICAgICAgOiBuYW1lKG5hbWUpCisgICAgICAgICwgdmFsdWUodmFsdWUpCisgICAgICAg ICwgZG9tYWluKGRvbWFpbikKKyAgICAgICAgLCBwYXRoKHBhdGgpCisgICAgICAgICwgZXhwaXJl cyhleHBpcmVzKQorICAgICAgICAsIGh0dHBPbmx5KGh0dHBPbmx5KQorICAgICAgICAsIHNlY3Vy ZShzZWN1cmUpCisgICAgICAgICwgc2Vzc2lvbihzZXNzaW9uKQorICAgIHsKKyAgICB9CisKKyAg ICBTdHJpbmcgbmFtZTsKKyAgICBTdHJpbmcgdmFsdWU7CisgICAgU3RyaW5nIGRvbWFpbjsKKyAg ICBTdHJpbmcgcGF0aDsKKyAgICBkb3VibGUgZXhwaXJlczsKKyAgICBib29sIGh0dHBPbmx5Owor ICAgIGJvb2wgc2VjdXJlOworICAgIGJvb2wgc2Vzc2lvbjsKK307CisKK3N0cnVjdCBDb29raWVI YXNoIHsKKyAgICBzdGF0aWMgdW5zaWduZWQgaGFzaChDb29raWUga2V5KQorICAgIHsgCisgICAg ICAgIHJldHVybiBTdHJpbmdIYXNoOjpoYXNoKGtleS5uYW1lKSArIFN0cmluZ0hhc2g6Omhhc2go a2V5LmRvbWFpbikgKyBTdHJpbmdIYXNoOjpoYXNoKGtleS5wYXRoKSArIGtleS5zZWN1cmU7Cisg ICAgfQorCisgICAgc3RhdGljIGJvb2wgZXF1YWwoQ29va2llIGEsIENvb2tpZSBiKQorICAgIHsK KyAgICAgICAgcmV0dXJuIGEubmFtZSA9PSBiLm5hbWUgJiYgYS5kb21haW4gPT0gYi5kb21haW4g JiYgYS5wYXRoID09IGIucGF0aCAmJiBhLnNlY3VyZSA9PSBiLnNlY3VyZTsKKyAgICB9Cit9Owor Cit9IC8vIG5hbWVzcGFjZSBQbGF0Zm9ybQogCiBuYW1lc3BhY2UgV1RGIHsKLSAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgRGVmYXVsdEhhc2g7Ci0gICAgdGVtcGxhdGU8PiBzdHJ1Y3Qg RGVmYXVsdEhhc2g8V2ViQ29yZTo6Q29va2llPiB7Ci0gICAgICAgIHR5cGVkZWYgV2ViQ29yZTo6 Q29va2llSGFzaCBIYXNoOwotICAgIH07Ci19CiAKLSNlbmRpZgordGVtcGxhdGU8dHlwZW5hbWUg VD4gc3RydWN0IERlZmF1bHRIYXNoOwordGVtcGxhdGU8PiBzdHJ1Y3QgRGVmYXVsdEhhc2g8UGxh dGZvcm06OkNvb2tpZT4geworICAgIHR5cGVkZWYgUGxhdGZvcm06OkNvb2tpZUhhc2ggSGFzaDsK K307CisKK30gLy8gbmFtZXNwYWNlIFdURgorCit1c2luZyBQbGF0Zm9ybTo6Q29va2llOwordXNp bmcgUGxhdGZvcm06OkNvb2tpZUhhc2g7CisKKyNlbmRpZiAvLyBDb29raWVfaApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmgJKHJldmlzaW9uIDEwNDE4NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0Nvb2tpZUphci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3 IEBACiAjaWZuZGVmIENvb2tpZUphcl9oCiAjZGVmaW5lIENvb2tpZUphcl9oCiAKKyNpbmNsdWRl ICJDb29raWUuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNo U2V0Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBAIC0zNiw4ICszNyw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBEb2N1bWVudDsKICAgICBjbGFzcyBLVVJM OwogCi0gICAgc3RydWN0IENvb2tpZTsKLQogICAgIC8vIGNvb2tpZXMgb21pdHMgSHR0cE9ubHkg Y29va2llcy4KICAgICBTdHJpbmcgY29va2llcyhjb25zdCBEb2N1bWVudCosIGNvbnN0IEtVUkwm KTsKICAgICBTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29uc3QgRG9jdW1l bnQqLCBjb25zdCBLVVJMJik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9QbGF0Zm9ybVN1cHBvcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAkocmV2aXNpb24gMTA0MTg0KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJBdWRpb0J1cy5oIgogI2VuZGlmCiAKKyNp bmNsdWRlICJDb29raWUuaCIKICNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiSW1h Z2VTb3VyY2UuaCIKICNpbmNsdWRlICJMaW5rSGFzaC5oIgpAQCAtODQsNyArODUsNiBAQCBjbGFz cyBTZXJpYWxpemVkU2NyaXB0VmFsdWU7CiBjbGFzcyBXaWRnZXQ7CiBjbGFzcyBXb3JrZXJSdW5M b29wOwogCi1zdHJ1Y3QgQ29va2llOwogc3RydWN0IEZvbnRSZW5kZXJTdHlsZTsKIAogLy8gUGxh dGZvcm1TdXBwb3J0IGFuIGludGVyZmFjZSB0byB0aGUgZW1iZWRkaW5nIGxheWVyIHRoYXQgbGV0 cyB0aGUgZW1iZWRkZXIK