8251 2006-04-07 13:02:12 -0700 navigator.platform incorrect in WebKit.app on Intel Macs 2006-07-09 04:14:47 -0700 1 1 1 Unclassified WebKit New Bugs 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 jhaygood webkit-unassigned ian oldest_to_newest 38758 0 jhaygood 2006-04-07 13:02:12 -0700 reports "MacPPC", should say "MacIntel". The WebKit that ships with OS X Tiger 10.4.6 reports it correctly as "MacIntel". 48189 1 9194 rwlbuis 2006-07-04 12:57:12 -0700 Created attachment 9194 First attempt 48196 2 9194 darin 2006-07-04 14:41:47 -0700 Comment on attachment 9194 First attempt Seems fine to do this, but: 1) We should be taking advantage of the <wtf/Platform.h> header instead of adding still more one-off ifdefs. 2) A name of format _PLATFORM is reserved for the standard C library. Don't use leading underscores for this sort of thing. How about WEBCORE_NAVIGATOR_PLATFORM or something like that? 48356 3 9213 rwlbuis 2006-07-05 12:49:30 -0700 Created attachment 9213 Improved patch Renamed to WEBCORE_NAVIGATOR_PLATFORM, reused CPU macro's and moved to wtf. I am not sure whether WEBCORE_NAVIGATOR_PLATFORM is useful anywhere outside kjs_navigator though... Cheers, Rob. 48806 4 9213 darin 2006-07-08 06:28:25 -0700 Comment on attachment 9213 Improved patch Sorry to be difficult, but there is at least one problem here. If the macro is going to be in Platform.h, then the prefix should not be WEBCORE_ but rather WTF_. But also, if it's going to be in Platform.h it has to be the whole macro, not just the PPC part, with the WIN32 bit etc. I think we should go back to something more like the original patch that's in kjs_navigator.cpp, but not with something that starts with an underscore. I think that you should use PLATFORM(PPC) instead of a custom ifdef. And I think that all the platforms should use the macro instead of having ifdefs in the Platform case in the casae statement. 48834 5 jhaygood 2006-07-08 09:35:11 -0700 I would use something like: #if PLATFORM(MAC_OS) && PLATFORM(PPC) return jsString("MacPPC"); #elif PLATFORM(MAC_OS) && PLATFORM(X86) return jsString("MacIntel"); #elif PLATFORM(WIN_OS) return jsString("Win32"); #endif 48848 6 9275 rwlbuis 2006-07-08 11:01:48 -0700 Created attachment 9275 Improved patch Hi Darin, Justin, I interpreted the suggestions a bit wrong, I thought the macro should go into Platform.h, you probably meant just using Platform.h macros. This time I tried to merge both your suggestions. Let me know if a testcase is required (I tested using http://www.robinlionheart.com/stds/html4/objects) and if so, how to go about the multi-platform aspect. Cheers, Rob. 48864 7 9275 darin 2006-07-08 19:56:10 -0700 Comment on attachment 9275 Improved patch Great, lets land this. r=me 48893 8 ddkilzer 2006-07-09 04:04:24 -0700 Committed revision 15249. 9194 2006-07-04 12:57:12 -0700 2006-07-04 14:41:47 -0700 First attempt 8251.diff text/plain 1367 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTE1MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDYtMDctMDQgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWd6 aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MQorICAgICAgICBuZXRzY2Fw ZS5wcm9kdWN0IGluY29ycmVjdCBpbiBXZWJLaXQuYXBwIG9uIEludGVsIE1hY3MKKworICAgICAg ICBGb3IgbmV0c2NhcGUucGxhdGZvcm0gcmV0dXJuICJNYWNJbnRlbCIgZm9yIEludGVsIHByb2Nl c3NvcnMsICJNYWNQUEMiCisgICAgICAgIG90aGVyd2lzZS4KKworICAgICAgICAqIGJpbmRpbmdz L2pzL2tqc19uYXZpZ2F0b3IuY3BwOgorICAgICAgICAoS0pTOjpOYXZpZ2F0b3I6OmdldFZhbHVl UHJvcGVydHkpOgorCiAyMDA2LTA3LTAyICBNaWtlIEVtbWVsICA8bWlrZS5lbW1lbEBnbWFpbC5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBnZ2FyZW4uCkluZGV4OiBXZWJD b3JlL2JpbmRpbmdzL2pzL2tqc19uYXZpZ2F0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YmluZGluZ3MvanMva2pzX25hdmlnYXRvci5jcHAJKHJldmlzaW9uIDE1MTUwKQorKysgV2ViQ29y ZS9iaW5kaW5ncy9qcy9ranNfbmF2aWdhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiAr MzAsMTIgQEAKICNpbmNsdWRlICJMYW5ndWFnZS5oIgogI2luY2x1ZGUgIlBsdWdJbkluZm9TdG9y ZS5oIgogCisjaWYgX19pMzg2X18gfHwgX194ODZfNjRfXworI2RlZmluZSBfUExBVEZPUk0gIk1h Y0ludGVsIgorI2Vsc2UKKyNkZWZpbmUgX1BMQVRGT1JNICJNYWNQUEMiCisjZW5kaWYKKwogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBLSlMgewpAQCAtMTc2LDcgKzE4Miw3 IEBAIEpTVmFsdWUgKk5hdmlnYXRvcjo6Z2V0VmFsdWVQcm9wZXJ0eShFeGUKICAgICByZXR1cm4g anNTdHJpbmcodXNlckFnZW50KTsKICAgY2FzZSBQbGF0Zm9ybToKICNpZiBfX0FQUExFX18KLSAg ICByZXR1cm4ganNTdHJpbmcoIk1hY1BQQyIpOworICAgIHJldHVybiBqc1N0cmluZyhfUExBVEZP Uk0pOwogI2VsaWYgV0lOMzIKICAgICByZXR1cm4ganNTdHJpbmcoIldpbjMyIik7CiAjZWxzZQo= 9213 2006-07-05 12:49:30 -0700 2006-07-08 06:28:25 -0700 Improved patch 8251.diff text/plain 2298 rwlbuis SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTY4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDYtMDctMDUgIFJvYiBCdWlz ICA8YnVpc0BrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODI1MQorICAgICAgICBuZXRzY2FwZS5wcm9kdWN0IGluY29ycmVjdCBpbiBXZWJLaXQuYXBwIG9u IEludGVsIE1hY3MKKworICAgICAgICBBZGQgbWFjcm8gV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZP Uk0gdG8gZ2V0IGEgZGVzY3JpcHRpb24KKyAgICAgICAgb2YgIk1hY1BQQyIgZm9yIFBQQ3MsICJN YWNJbnRlbCIgb3RoZXJ3aXNlLiBJbnRlbmRlZCB1c2FnZSBpcworICAgICAgICBmb3IgbmV0c2Nh cGUucHJvZHVjdC4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDA2LTA3LTA1ICBH ZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUlMgYnkgQmV0aC4K SW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFT Y3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAxNTE2OCkKKysrIEphdmFTY3JpcHRD b3JlL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNCArMTU4LDEwIEBACiAj ZGVmaW5lIEtYTUxDT1JFX1VTRV9JQ1VfVU5JQ09ERSAxCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JN KFBQQykKKyNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIk1hY1BQQyIKKyNlbHNl CisjZGVmaW5lIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJNYWNJbnRlbCIKKyNlbmRpZgor CiAjZW5kaWYgLy8gS1hNTENPUkVfUExBVEZPUk1fSApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTY4KQorKysgV2Vi Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAwNi0wNy0w NSAgUm9iIEJ1aXMgIDxidWlzQGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3df YnVnLmNnaT9pZD04MjUxCisgICAgICAgIG5ldHNjYXBlLnByb2R1Y3QgaW5jb3JyZWN0IGluIFdl YktpdC5hcHAgb24gSW50ZWwgTWFjcworCisgICAgICAgIEZvciBuZXRzY2FwZS5wbGF0Zm9ybSBy ZXR1cm4gIk1hY0ludGVsIiBmb3IgSW50ZWwgcHJvY2Vzc29ycywgIk1hY1BQQyIKKyAgICAgICAg b3RoZXJ3aXNlLgorCisgICAgICAgICogYmluZGluZ3MvanMva2pzX25hdmlnYXRvci5jcHA6Cisg ICAgICAgIChLSlM6Ok5hdmlnYXRvcjo6Z2V0VmFsdWVQcm9wZXJ0eSk6CisKIDIwMDYtMDctMDQg IEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgTWFjaWVqLCByZXdvcmtlZCBhIGJpdCBieSBEYXJpbi4KSW5kZXg6IFdlYkNvcmUv YmluZGluZ3MvanMva2pzX25hdmlnYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5k aW5ncy9qcy9ranNfbmF2aWdhdG9yLmNwcAkocmV2aXNpb24gMTUxNjgpCisrKyBXZWJDb3JlL2Jp bmRpbmdzL2pzL2tqc19uYXZpZ2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsNyArMTc2 LDcgQEAgSlNWYWx1ZSAqTmF2aWdhdG9yOjpnZXRWYWx1ZVByb3BlcnR5KEV4ZQogICAgIHJldHVy biBqc1N0cmluZyh1c2VyQWdlbnQpOwogICBjYXNlIFBsYXRmb3JtOgogI2lmIF9fQVBQTEVfXwot ICAgIHJldHVybiBqc1N0cmluZygiTWFjUFBDIik7CisgICAgcmV0dXJuIGpzU3RyaW5nKFdFQkNP UkVfTkFWSUdBVE9SX1BMQVRGT1JNKTsKICNlbGlmIFdJTjMyCiAgICAgcmV0dXJuIGpzU3RyaW5n KCJXaW4zMiIpOwogI2Vsc2UK 9275 2006-07-08 11:01:48 -0700 2006-07-08 19:56:10 -0700 Improved patch 8251-2.diff text/plain 1686 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTIzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDYtMDctMDggIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWd6 aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MQorICAgICAgICBuZXRzY2Fw ZS5wcm9kdWN0IGluY29ycmVjdCBpbiBXZWJLaXQuYXBwIG9uIEludGVsIE1hY3MKKworICAgICAg ICBGb3IgbmV0c2NhcGUucGxhdGZvcm0gcmV0dXJuICJNYWNJbnRlbCIgZm9yIEludGVsIHByb2Nl c3NvcnMsICJNYWNQUEMiCisgICAgICAgIG90aGVyd2lzZS4KKworICAgICAgICAqIGJpbmRpbmdz L2pzL2tqc19uYXZpZ2F0b3IuY3BwOgorICAgICAgICAoS0pTOjpOYXZpZ2F0b3I6OmdldFZhbHVl UHJvcGVydHkpOgorCiAyMDA2LTA3LTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICAtIHRyeSB0byBmaXggV2luZG93cyBidWlsZApJbmRleDogV2ViQ29yZS9iaW5k aW5ncy9qcy9ranNfbmF2aWdhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L2pzL2tqc19uYXZpZ2F0b3IuY3BwCShyZXZpc2lvbiAxNTIzMykKKysrIFdlYkNvcmUvYmluZGlu Z3MvanMva2pzX25hdmlnYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDE2IEBA CiAjaW5jbHVkZSAiTGFuZ3VhZ2UuaCIKICNpbmNsdWRlICJQbHVnSW5JbmZvU3RvcmUuaCIKIAor I2lmIFBMQVRGT1JNKE1BQykgJiYgUExBVEZPUk0oUFBDKQorI2RlZmluZSBXRUJDT1JFX05BVklH QVRPUl9QTEFURk9STSAiTWFjUFBDIgorI2VsaWYgUExBVEZPUk0oTUFDKSAmJiBQTEFURk9STShY ODYpCisjZGVmaW5lIFdFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNICJNYWNJbnRlbCIKKyNlbGlm IFBMQVRGT1JNKFdJTl9PUykKKyNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIldp bjMyIgorI2Vsc2UKKyNkZWZpbmUgV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk0gIiIKKyNlbmRp ZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIEtKUyB7CkBAIC0xNzUs MTMgKzE4NSw3IEBAIEpTVmFsdWUgKk5hdmlnYXRvcjo6Z2V0VmFsdWVQcm9wZXJ0eShFeGUKICAg Y2FzZSBVc2VyQWdlbnQ6CiAgICAgcmV0dXJuIGpzU3RyaW5nKHVzZXJBZ2VudCk7CiAgIGNhc2Ug UGxhdGZvcm06Ci0jaWYgX19BUFBMRV9fCi0gICAgcmV0dXJuIGpzU3RyaW5nKCJNYWNQUEMiKTsK LSNlbGlmIFdJTjMyCi0gICAgcmV0dXJuIGpzU3RyaW5nKCJXaW4zMiIpOwotI2Vsc2UKLSAgICBy ZXR1cm4ganNTdHJpbmcoIiIpOwotI2VuZGlmCisgICAgcmV0dXJuIGpzU3RyaW5nKFdFQkNPUkVf TkFWSUdBVE9SX1BMQVRGT1JNKTsKICAgY2FzZSBfUGx1Z2luczoKICAgICByZXR1cm4gbmV3IFBs dWdpbnMoZXhlYyk7CiAgIGNhc2UgX01pbWVUeXBlczoK