27351 2009-07-16 12:24:49 -0700 [Qt] navigator.platform returns an empty string in Symbian and in Linux platforms 2009-07-17 19:09:51 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Emulator Other RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned zecke oldest_to_newest 132317 0 yael 2009-07-16 12:24:49 -0700 WEBCORE_NAVIGATOR_PLATFORM is not defined for Symbian and for Linux platforms. the following javascript would fail <html> <body > The name of the operating system of the current browser should be displayed below:<br> <script type="text/javascript"> document.write(navigator.platform+"<br/>"); </script> </body> </html> 132318 1 32887 yael 2009-07-16 12:27:27 -0700 Created attachment 32887 Patch 132322 2 32887 staikos 2009-07-16 12:43:11 -0700 Comment on attachment 32887 Patch No reason to believe that PLATFORM(LINUX) is "Linux i686" 132331 3 yael 2009-07-16 13:20:08 -0700 I think navigator.platform is very similar to what is in PluginViewQt.cpp line 275: static const char* MozillaUserAgent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0"; 132445 4 32911 yael 2009-07-16 19:43:23 -0700 Created attachment 32911 Patch Add #define for Symbian platform. Use uname to determine the OS name and CPU , but limit it to Linux platform only. (I am not able to test other platforms). 132563 5 32911 hausmann 2009-07-17 06:55:27 -0700 Comment on attachment 32911 Patch r=me. Seems consistent with firefox and chromium on linux, too. 132587 6 zecke 2009-07-17 09:10:14 -0700 From my reading uname is POSIX.1 so we should guard it with something like PLATFORM(UNIX). 132599 7 yael 2009-07-17 09:30:10 -0700 (In reply to comment #6) > From my reading uname is POSIX.1 so we should guard it with something like > PLATFORM(UNIX). I wanted to be on the safe side, so I limited this to Linux based platforms. Some types of Unix might not be 100% POSIX.1 compatible, and I did not want to take the risk. 132687 8 32911 jmalonzo 2009-07-17 14:00:46 -0700 Comment on attachment 32911 Patch > String NavigatorBase::platform() const > { > +#if PLATFORM(LINUX) > + struct utsname osname; > + int result = uname(&osname); > + String platformName; > + if (result >= 0) { > + platformName = osname.sysname; > + platformName += " "; > + platformName += osname.machine; > + } > + return platformName; Can we please make use of DEFINE_STATIC_LOCAL here for platformName? 132801 9 32911 zecke 2009-07-17 18:00:49 -0700 Comment on attachment 32911 Patch > > String NavigatorBase::platform() const > { > +#if PLATFORM(LINUX) > + struct utsname osname; > + int result = uname(&osname); > + String platformName; > + if (result >= 0) { > + platformName = osname.sysname; > + platformName += " "; > + platformName += osname.machine; > + } > + return platformName; > +#else > return WEBCORE_NAVIGATOR_PLATFORM; > +#endif Jan is right, we should call uname(&osname) exactly once. Yael could you post an updated version of the patch? 132809 10 32996 yael 2009-07-17 18:23:32 -0700 Created attachment 32996 Patch Use DEFINE_STATIC_LOCAL as requested in comment #8. 132824 11 yael 2009-07-17 19:09:51 -0700 landed in 46078 32887 2009-07-16 12:27:27 -0700 2009-07-17 18:23:32 -0700 Patch platform.patch text/plain 1078 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTk4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMTYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzM1MQorICAgICAgICBB ZGRlZCBwbGF0Zm9ybXMgIkxpbnV4IGk2ODYiIGFuZCAiU3ltYmlhbiIgdG8gV0VCQ09SRV9OQVZJ R0FUT1JfUExBVEZPUk0KKworICAgICAgICAqIHBhZ2UvTmF2aWdhdG9yQmFzZS5jcHA6CisKIDIw MDktMDctMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgpJbmRleDogV2ViQ29yZS9wYWdlL05hdmlnYXRvckJh c2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcAkocmV2 aXNpb24gNDU5NzIpCisrKyBXZWJDb3JlL3BhZ2UvTmF2aWdhdG9yQmFzZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDYgKzM3LDEwIEBACiAjZGVmaW5lIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRG T1JNICJNYWNJbnRlbCIKICNlbGlmIFBMQVRGT1JNKFdJTl9PUykKICNkZWZpbmUgV0VCQ09SRV9O QVZJR0FUT1JfUExBVEZPUk0gIldpbjMyIgorI2VsaWYgUExBVEZPUk0oTElOVVgpCisjZGVmaW5l IFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJMaW51eCBpNjg2IgorI2VsaWYgUExBVEZPUk0o U1lNQklBTikKKyNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIlN5bWJpYW4iCiAj ZWxzZQogI2RlZmluZSBXRUJDT1JFX05BVklHQVRPUl9QTEFURk9STSAiIgogI2VuZGlmCg== 32911 2009-07-16 19:43:23 -0700 2009-07-17 18:23:32 -0700 Patch platform.patch text/plain 1765 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjAwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDctMTYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzM1MQorICAgICAgICBB ZGRlZCBwbGF0Zm9ybSAiU3ltYmlhbiIgdG8gV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0KKyAg ICAgICAgVXNlIHVuYW1lIHRvIGZpbmQgdGhlIGNvcnJlY3QgcGxhdGZvcm0gZm9yIExpbnV4Lgor CisgICAgICAgICogcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5h dmlnYXRvckJhc2U6OnBsYXRmb3JtKToKKwogMjAwOS0wNy0xNiAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6 IFdlYkNvcmUvcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvTmF2aWdhdG9yQmFzZS5jcHAJKHJldmlzaW9uIDQ1OTcyKQorKysgV2ViQ29yZS9wYWdlL05h dmlnYXRvckJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw5IEBACiAKICNpbmNs dWRlICJOZXR3b3JrU3RhdGVOb3RpZmllci5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgi CisjaWYgUExBVEZPUk0oTElOVVgpCisjaW5jbHVkZSAic3lzL3V0c25hbWUuaCIKKyNlbmRpZgog CiAjaWZuZGVmIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNCiAjaWYgUExBVEZPUk0oTUFDKSAm JiAoUExBVEZPUk0oUFBDKSB8fCBQTEFURk9STShQUEM2NCkpCkBAIC0zNyw2ICs0MCw4IEBACiAj ZGVmaW5lIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJNYWNJbnRlbCIKICNlbGlmIFBMQVRG T1JNKFdJTl9PUykKICNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIldpbjMyIgor I2VsaWYgUExBVEZPUk0oU1lNQklBTikKKyNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZP Uk0gIlN5bWJpYW4iCiAjZWxzZQogI2RlZmluZSBXRUJDT1JFX05BVklHQVRPUl9QTEFURk9STSAi IgogI2VuZGlmCkBAIC03OSw3ICs4NCwxOSBAQAogCiBTdHJpbmcgTmF2aWdhdG9yQmFzZTo6cGxh dGZvcm0oKSBjb25zdAogeworI2lmIFBMQVRGT1JNKExJTlVYKQorICAgIHN0cnVjdCB1dHNuYW1l IG9zbmFtZTsKKyAgICBpbnQgcmVzdWx0ID0gdW5hbWUoJm9zbmFtZSk7CisgICAgU3RyaW5nIHBs YXRmb3JtTmFtZTsKKyAgICBpZiAocmVzdWx0ID49IDApIHsKKyAgICAgICAgcGxhdGZvcm1OYW1l ID0gb3NuYW1lLnN5c25hbWU7CisgICAgICAgIHBsYXRmb3JtTmFtZSArPSAiICI7CisgICAgICAg IHBsYXRmb3JtTmFtZSArPSBvc25hbWUubWFjaGluZTsKKyAgICB9CisgICAgcmV0dXJuIHBsYXRm b3JtTmFtZTsKKyNlbHNlCiAgICAgcmV0dXJuIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNOwor I2VuZGlmCiB9CiAKIFN0cmluZyBOYXZpZ2F0b3JCYXNlOjphcHBDb2RlTmFtZSgpIGNvbnN0Cg== 32996 2009-07-17 18:23:32 -0700 2009-07-17 18:43:34 -0700 Patch platform.patch text/plain 1832 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjA3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDctMTcgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzM1MQorICAgICAgICBB ZGRlZCBwbGF0Zm9ybSAiU3ltYmlhbiIgdG8gV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0KKyAg ICAgICAgVXNlIHVuYW1lIHRvIGZpbmQgdGhlIGNvcnJlY3QgcGxhdGZvcm0gZm9yIExpbnV4Lgor CisgICAgICAgICogcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5h dmlnYXRvckJhc2U6OnBsYXRmb3JtKToKKwogMjAwOS0wNy0xNyAgTWFkcyBBZ2VyICA8YWdlckBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRl eDogV2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9OYXZpZ2F0b3JCYXNlLmNwcAkocmV2aXNpb24gNDYwNzIpCisrKyBXZWJDb3JlL3BhZ2Uv TmF2aWdhdG9yQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDEwIEBACiAKICNp bmNsdWRlICJOZXR3b3JrU3RhdGVOb3RpZmllci5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5n LmgiCisjaWYgUExBVEZPUk0oTElOVVgpCisjaW5jbHVkZSAic3lzL3V0c25hbWUuaCIKKyNpbmNs dWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CisjZW5kaWYKIAogI2lmbmRlZiBXRUJDT1JFX05BVklH QVRPUl9QTEFURk9STQogI2lmIFBMQVRGT1JNKE1BQykgJiYgKFBMQVRGT1JNKFBQQykgfHwgUExB VEZPUk0oUFBDNjQpKQpAQCAtMzcsNiArNDEsOCBAQAogI2RlZmluZSBXRUJDT1JFX05BVklHQVRP Ul9QTEFURk9STSAiTWFjSW50ZWwiCiAjZWxpZiBQTEFURk9STShXSU5fT1MpCiAjZGVmaW5lIFdF QkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJXaW4zMiIKKyNlbGlmIFBMQVRGT1JNKFNZTUJJQU4p CisjZGVmaW5lIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJTeW1iaWFuIgogI2Vsc2UKICNk ZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIiIKICNlbmRpZgpAQCAtNzksNyArODUs MTUgQEAKIAogU3RyaW5nIE5hdmlnYXRvckJhc2U6OnBsYXRmb3JtKCkgY29uc3QKIHsKKyNpZiBQ TEFURk9STShMSU5VWCkKKyAgICBpZiAoU3RyaW5nKCIiKSAhPSBXRUJDT1JFX05BVklHQVRPUl9Q TEFURk9STSkKKyAgICAgICAgcmV0dXJuIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNOworICAg IHN0cnVjdCB1dHNuYW1lIG9zbmFtZTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywg cGxhdGZvcm1OYW1lLCAodW5hbWUoJm9zbmFtZSkgPj0gMCA/IFN0cmluZyhvc25hbWUuc3lzbmFt ZSkgKyBTdHJpbmcoIiAiKSArIFN0cmluZyhvc25hbWUubWFjaGluZSkgOiAiIikpOworICAgIHJl dHVybiBwbGF0Zm9ybU5hbWU7CisjZWxzZQogICAgIHJldHVybiBXRUJDT1JFX05BVklHQVRPUl9Q TEFURk9STTsKKyNlbmRpZgogfQogCiBTdHJpbmcgTmF2aWdhdG9yQmFzZTo6YXBwQ29kZU5hbWUo KSBjb25zdAo=