31961 2009-11-29 12:46:34 -0800 [Qt][Symbian] Report SymbianOS in user agent string for Symbian 2009-11-30 15:20:16 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC S60 3rd edition RESOLVED FIXED Qt P2 Normal --- 27065 1 laszlo.gombos webkit-unassigned abarth commit-queue hausmann oldest_to_newest 167092 0 laszlo.gombos 2009-11-29 12:46:34 -0800 In general the guideline is that we want a user agent string that is consistent with (but distinguishable from) previous S60 WebKit ports. In addition we want a user agent string that allows client side user agent detection (http://www.quirksmode.org/js/detect.html is probably one good test). I believe Abhinav Mithal has a patch for this - I contacted him to see if he can upload his proposed changes. 167098 1 43991 laszlo.gombos 2009-11-29 13:15:29 -0800 Created attachment 43991 1st try Abhinav is out for the rest of the year, I uploading his patch on his behalf. 167119 2 43991 hausmann 2009-11-29 15:53:41 -0800 Comment on attachment 43991 1st try In principle I think this patch looks good, but there are a few style issues: > + // Placeholder for SubPlatfrom Version from -> form > + "%4; "); > + > +// Platform Version This should be indented 4 spaces > + QString osVer; > +#ifdef Q_OS_SYMBIAN > + QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion(); > +switch (symbianVersion) { This line is also missing indentation. > + case QSysInfo::SV_9_2: > + osVer = "/9.2"; > + break; > + case QSysInfo::SV_9_3: > + osVer = "/9.3"; > + break; > + case QSysInfo::SV_9_4: > + osVer = "/9.4"; > + break; > + default: > + osVer = "Unknown"; > + } > +#else > + osVer = ""; > +#endif I suggest to omit the #else block that assigns an empty string to the string that is already a null string. > +// SubPlatform Version Indentation > + QString subPlatformVer; > +#ifdef Q_OS_SYMBIAN > + QSysInfo::S60Version s60Version = QSysInfo::s60Version(); > +switch (s60Version) { Indentation > + case QSysInfo::SV_S60_3_1: > + subPlatformVer = "/3.1"; > + break; > + case QSysInfo::SV_S60_3_2: > + subPlatformVer = "/3.2"; > + break; > + case QSysInfo::SV_S60_5_0: > + subPlatformVer = "/5.0"; > + break; > + default: > + subPlatformVer = " Unknown"; > + } > +#else > + subPlatformVer = ""; > +#endif Same as above, the assignment is unnecessary. 167185 3 44005 laszlo.gombos 2009-11-29 19:27:33 -0800 Created attachment 44005 2nd try Incorporate Simon's review comments. 167381 4 abarth 2009-11-30 12:48:55 -0800 style-queue ran check-webkit-style on attachment 44005 without any errors. 167438 5 44005 commit-queue 2009-11-30 15:20:11 -0800 Comment on attachment 44005 2nd try Clearing flags on attachment: 44005 Committed r51515: <http://trac.webkit.org/changeset/51515> 167439 6 commit-queue 2009-11-30 15:20:16 -0800 All reviewed patches have been landed. Closing bug. 43991 2009-11-29 13:15:29 -0800 2009-11-29 19:27:33 -0800 1st try 31961.patch text/plain 3154 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTE0NjcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEtMjkgIEFiaGluYXYgTWl0aGFsICA8YWJoaW5h di5taXRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF1bU3ltYmlhbl0gUmVwb3J0IFN5bWJpYW5PUyBpbiB1c2VyIGFnZW50 IHN0cmluZyBmb3IgU3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE5NjEKKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAg IChRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKwogMjAwOS0xMS0yOCAgU2ltb24gSGF1c21h bm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNTE0 NjUpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAy NSw3ICszMDI1LDcgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAog ICAgIFFfVU5VU0VEKHVybCkKICAgICBRU3RyaW5nIHVhID0gUUxhdGluMVN0cmluZygiTW96aWxs YS81LjAgKCIKIAotICAgIC8vIFBsYXN0Zm9ybQorICAgIC8vIFBsYXRmb3JtCiAjaWZkZWYgUV9X U19NQUMKICAgICAiTWFjaW50b3NoIgogI2VsaWYgZGVmaW5lZCBRX1dTX1FXUwpAQCAtMzAzNCwx OSArMzAzNCwyMiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAg ICAgIldpbmRvd3MiCiAjZWxpZiBkZWZpbmVkIFFfV1NfWDExCiAgICAgIlgxMSIKKyNlbGlmIGRl ZmluZWQgUV9PU19TWU1CSUFOCisgICAgIlN5bWJpYW5PUyIKICNlbHNlCiAgICAgIlVua25vd24i CiAjZW5kaWYKLSAgICAiOyAiCisgICAgLy8gUGxhY2Vob2xkZXIgZm9yIFBsYXRmb3JtIFZlcnNp b24KKyAgICAiJTE7ICIKIAogICAgIC8vIFBsYWNlaG9sZGVyIGZvciBzZWN1cml0eSBzdHJlbmd0 aCAoTiBvciBVKQotICAgICIlMTsgIgorICAgICIlMjsgIgogCiAgICAgLy8gU3VicGxhdGZvcm0i CiAjaWZkZWYgUV9PU19BSVgKICAgICAiQUlYIgogI2VsaWYgZGVmaW5lZCBRX09TX1dJTjMyCi0g ICAgIiUyIgorICAgICIlMyIKICNlbGlmIGRlZmluZWQgUV9PU19EQVJXSU4KICNpZmRlZiBfX2kz ODZfXyB8fCBfX3g4Nl82NF9fCiAgICAgIkludGVsIE1hYyBPUyBYIgpAQCAtMzA5OCw2ICszMTAx LDggQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAogICAgICJTdW4g U29sYXJpcyIKICNlbGlmIGRlZmluZWQgUV9PU19VTFRSSVgKICAgICAiREVDIFVsdHJpeCIKKyNl bGlmIGRlZmluZWQgUV9XU19TNjAKKyAgICAiU2VyaWVzNjAiCiAjZWxpZiBkZWZpbmVkIFFfT1Nf VU5JWAogICAgICJVTklYIEJTRC9TWVNWIHN5c3RlbSIKICNlbGlmIGRlZmluZWQgUV9PU19VTklY V0FSRQpAQCAtMzEwNSw3ICszMTEwLDMwIEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZv clVybChjb25zdCAKICNlbHNlCiAgICAgIlVua25vd24iCiAjZW5kaWYKLSAgICAiOyAiKTsKKyAg ICAvLyBQbGFjZWhvbGRlciBmb3IgU3ViUGxhdGZyb20gVmVyc2lvbgorICAgICIlNDsgIik7CisK Ky8vIFBsYXRmb3JtIFZlcnNpb24KKyAgICBRU3RyaW5nIG9zVmVyOworI2lmZGVmIFFfT1NfU1lN QklBTgorICAgIFFTeXNJbmZvOjpTeW1iaWFuVmVyc2lvbiBzeW1iaWFuVmVyc2lvbiA9IFFTeXNJ bmZvOjpzeW1iaWFuVmVyc2lvbigpOworc3dpdGNoIChzeW1iaWFuVmVyc2lvbikgeworICBjYXNl IFFTeXNJbmZvOjpTVl85XzI6CisgICAgICBvc1ZlciA9ICIvOS4yIjsKKyAgICAgIGJyZWFrOwor ICBjYXNlIFFTeXNJbmZvOjpTVl85XzM6CisgICAgICBvc1ZlciA9ICIvOS4zIjsKKyAgICAgIGJy ZWFrOworICBjYXNlIFFTeXNJbmZvOjpTVl85XzQ6CisgICAgICBvc1ZlciA9ICIvOS40IjsKKyAg ICAgIGJyZWFrOworICBkZWZhdWx0OiAKKyAgICAgIG9zVmVyID0gIlVua25vd24iOworICAgIH0K KyNlbHNlCisgICAgb3NWZXIgPSAiIjsKKyNlbmRpZgorICAgIHVhID0gdWEuYXJnKG9zVmVyKTsK IAogICAgIFFDaGFyIHNlY3VyaXR5U3RyZW5ndGgoUUxhdGluMUNoYXIoJ04nKSk7CiAjaWYgIWRl ZmluZWQoUVRfTk9fT1BFTlNTTCkKQEAgLTMxNjksNiArMzE5NywyOCBAQCBRU3RyaW5nIFFXZWJQ YWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAgICAgdWEgPSBRU3RyaW5nKHVhKS5hcmcodmVy KTsKICNlbmRpZgogCisvLyBTdWJQbGF0Zm9ybSBWZXJzaW9uCisgICAgUVN0cmluZyBzdWJQbGF0 Zm9ybVZlcjsKKyNpZmRlZiBRX09TX1NZTUJJQU4KKyAgICBRU3lzSW5mbzo6UzYwVmVyc2lvbiBz NjBWZXJzaW9uID0gUVN5c0luZm86OnM2MFZlcnNpb24oKTsKK3N3aXRjaCAoczYwVmVyc2lvbikg eworICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfM18xOgorICAgICAgc3ViUGxhdGZvcm1WZXIgPSAi LzMuMSI7CisgICAgICBicmVhazsKKyAgY2FzZSBRU3lzSW5mbzo6U1ZfUzYwXzNfMjoKKyAgICAg IHN1YlBsYXRmb3JtVmVyID0gIi8zLjIiOworICAgICAgYnJlYWs7CisgIGNhc2UgUVN5c0luZm86 OlNWX1M2MF81XzA6CisgICAgICBzdWJQbGF0Zm9ybVZlciA9ICIvNS4wIjsKKyAgICAgIGJyZWFr OworICBkZWZhdWx0OiAKKyAgICAgIHN1YlBsYXRmb3JtVmVyID0gIiBVbmtub3duIjsKKyAgICB9 CisjZWxzZQorICAgIHN1YlBsYXRmb3JtVmVyID0gIiI7CisjZW5kaWYKKyAgICB1YSA9IHVhLmFy ZyhzdWJQbGF0Zm9ybVZlcik7CisKICAgICAvLyBMYW5ndWFnZQogICAgIFFMb2NhbGUgbG9jYWxl OwogICAgIGlmICh2aWV3KCkpCg== 44005 2009-11-29 19:27:33 -0800 2009-11-30 15:20:11 -0800 2nd try 31961.patch text/plain 3157 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTE0NzIpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEtMjkgIEFiaGluYXYgTWl0aGFsICA8YWJoaW5h di5taXRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF1bU3ltYmlhbl0gUmVwb3J0IFN5bWJpYW5PUyBpbiB1c2VyIGFnZW50 IHN0cmluZyBmb3IgU3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE5NjEKKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAg IChRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKwogMjAwOS0xMS0yOCAgU2ltb24gSGF1c21h bm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNTE0 NzIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAy NSw3ICszMDI1LDcgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAog ICAgIFFfVU5VU0VEKHVybCkKICAgICBRU3RyaW5nIHVhID0gUUxhdGluMVN0cmluZygiTW96aWxs YS81LjAgKCIKIAotICAgIC8vIFBsYXN0Zm9ybQorICAgIC8vIFBsYXRmb3JtCiAjaWZkZWYgUV9X U19NQUMKICAgICAiTWFjaW50b3NoIgogI2VsaWYgZGVmaW5lZCBRX1dTX1FXUwpAQCAtMzAzNCwx OSArMzAzNCwyMiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAg ICAgIldpbmRvd3MiCiAjZWxpZiBkZWZpbmVkIFFfV1NfWDExCiAgICAgIlgxMSIKKyNlbGlmIGRl ZmluZWQgUV9PU19TWU1CSUFOCisgICAgIlN5bWJpYW5PUyIKICNlbHNlCiAgICAgIlVua25vd24i CiAjZW5kaWYKLSAgICAiOyAiCisgICAgLy8gUGxhY2Vob2xkZXIgZm9yIFBsYXRmb3JtIFZlcnNp b24KKyAgICAiJTE7ICIKIAogICAgIC8vIFBsYWNlaG9sZGVyIGZvciBzZWN1cml0eSBzdHJlbmd0 aCAoTiBvciBVKQotICAgICIlMTsgIgorICAgICIlMjsgIgogCiAgICAgLy8gU3VicGxhdGZvcm0i CiAjaWZkZWYgUV9PU19BSVgKICAgICAiQUlYIgogI2VsaWYgZGVmaW5lZCBRX09TX1dJTjMyCi0g ICAgIiUyIgorICAgICIlMyIKICNlbGlmIGRlZmluZWQgUV9PU19EQVJXSU4KICNpZmRlZiBfX2kz ODZfXyB8fCBfX3g4Nl82NF9fCiAgICAgIkludGVsIE1hYyBPUyBYIgpAQCAtMzA5OCw2ICszMTAx LDggQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAogICAgICJTdW4g U29sYXJpcyIKICNlbGlmIGRlZmluZWQgUV9PU19VTFRSSVgKICAgICAiREVDIFVsdHJpeCIKKyNl bGlmIGRlZmluZWQgUV9XU19TNjAKKyAgICAiU2VyaWVzNjAiCiAjZWxpZiBkZWZpbmVkIFFfT1Nf VU5JWAogICAgICJVTklYIEJTRC9TWVNWIHN5c3RlbSIKICNlbGlmIGRlZmluZWQgUV9PU19VTklY V0FSRQpAQCAtMzEwNSw3ICszMTEwLDI4IEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZv clVybChjb25zdCAKICNlbHNlCiAgICAgIlVua25vd24iCiAjZW5kaWYKLSAgICAiOyAiKTsKKyAg ICAvLyBQbGFjZWhvbGRlciBmb3IgU3ViUGxhdGZvcm0gVmVyc2lvbgorICAgICIlNDsgIik7CisK KyAgICAvLyBQbGF0Zm9ybSBWZXJzaW9uCisgICAgUVN0cmluZyBvc1ZlcjsKKyNpZmRlZiBRX09T X1NZTUJJQU4KKyAgICBRU3lzSW5mbzo6U3ltYmlhblZlcnNpb24gc3ltYmlhblZlcnNpb24gPSBR U3lzSW5mbzo6c3ltYmlhblZlcnNpb24oKTsKKyAgICBzd2l0Y2ggKHN5bWJpYW5WZXJzaW9uKSB7 CisgICAgY2FzZSBRU3lzSW5mbzo6U1ZfOV8yOgorICAgICAgICBvc1ZlciA9ICIvOS4yIjsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBRU3lzSW5mbzo6U1ZfOV8zOgorICAgICAgICBvc1ZlciA9 ICIvOS4zIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBRU3lzSW5mbzo6U1ZfOV80OgorICAg ICAgICBvc1ZlciA9ICIvOS40IjsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDogCisgICAg ICAgIG9zVmVyID0gIlVua25vd24iOworICAgIH0KKyNlbmRpZgorICAgIHVhID0gdWEuYXJnKG9z VmVyKTsKIAogICAgIFFDaGFyIHNlY3VyaXR5U3RyZW5ndGgoUUxhdGluMUNoYXIoJ04nKSk7CiAj aWYgIWRlZmluZWQoUVRfTk9fT1BFTlNTTCkKQEAgLTMxNjksNiArMzE5NSwyNiBAQCBRU3RyaW5n IFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAgICAgdWEgPSBRU3RyaW5nKHVhKS5h cmcodmVyKTsKICNlbmRpZgogCisgICAgLy8gU3ViUGxhdGZvcm0gVmVyc2lvbgorICAgIFFTdHJp bmcgc3ViUGxhdGZvcm1WZXI7CisjaWZkZWYgUV9PU19TWU1CSUFOCisgICAgUVN5c0luZm86OlM2 MFZlcnNpb24gczYwVmVyc2lvbiA9IFFTeXNJbmZvOjpzNjBWZXJzaW9uKCk7CisgICAgc3dpdGNo IChzNjBWZXJzaW9uKSB7CisgICAgY2FzZSBRU3lzSW5mbzo6U1ZfUzYwXzNfMToKKyAgICAgICAg c3ViUGxhdGZvcm1WZXIgPSAiLzMuMSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUVN5c0lu Zm86OlNWX1M2MF8zXzI6CisgICAgICAgIHN1YlBsYXRmb3JtVmVyID0gIi8zLjIiOworICAgICAg ICBicmVhazsKKyAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfNV8wOgorICAgICAgICBzdWJQbGF0 Zm9ybVZlciA9ICIvNS4wIjsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDogCisgICAgICAg IHN1YlBsYXRmb3JtVmVyID0gIiBVbmtub3duIjsKKyAgICB9CisjZW5kaWYKKyAgICB1YSA9IHVh LmFyZyhzdWJQbGF0Zm9ybVZlcik7CisKICAgICAvLyBMYW5ndWFnZQogICAgIFFMb2NhbGUgbG9j YWxlOwogICAgIGlmICh2aWV3KCkpCg==