23281 2009-01-12 18:45:39 -0800 Fix the Chromium Win build 2009-01-13 11:24:25 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 dimich webkit-unassigned ap darin eric mjs oldest_to_newest 105431 0 dimich 2009-01-12 18:45:39 -0800 My recent change that introduced WTF::currentTime used PLATFORM(WIN) for all windows builds that are not GTK and not WX. This is incorrect. PLATFORM(WIN) is basically "Apple Win Port", while PLATFORM(WIN_OS) is "any port built on Windows", which I actually wanted. In particular, PLATFORM(CHROMIUM) does not define WIN but defines WIN_OS. Patch is coming as soon as I finish both Win builds (regular and scons). 105432 1 mrowe 2009-01-12 19:19:23 -0800 PLATFORM(WIN) indicates a port using high-level Windows functionality, such as GDI and so on, while WIN_OS indicates low-level functionality such as threading primitives. Neither indicates which port is being built. 105433 2 eric 2009-01-12 19:50:33 -0800 (In reply to comment #1) > PLATFORM(WIN) indicates a port using high-level Windows functionality, such as > GDI and so on, while WIN_OS indicates low-level functionality such as threading > primitives. Neither indicates which port is being built. > There has been historical disagreement on this point. It would be very useful to me (and likely others) if you, or someone else from the project could post to webkit-dev or write on the wiki what each of the PLATFORM(*) defines mean. 105436 3 26659 dimich 2009-01-12 20:04:56 -0800 Created attachment 26659 Proposed patch bdash: thanks! It seems that for time querying purposes, the WIN_OS is the right one... So here is the patch. The change affects only Chromium builds since they are PLATFORM(CHROMIUM) && PLATFORM(WIN_OS) which was not covered before. WIN, GTK, QT and WX stay the same. The only reason for GTK and WX to be here is to match occasional usage of their time getters. 105438 4 mrowe 2009-01-12 20:21:17 -0800 (In reply to comment #2) > (In reply to comment #1) > > PLATFORM(WIN) indicates a port using high-level Windows functionality, such as > > GDI and so on, while WIN_OS indicates low-level functionality such as threading > > primitives. Neither indicates which port is being built. > > > > There has been historical disagreement on this point. It would be very useful > to me (and likely others) if you, or someone else from the project could post > to webkit-dev or write on the wiki what each of the PLATFORM(*) defines mean. This has been discussed *at length* on webkit-dev in the past. 105489 5 26659 darin 2009-01-13 07:41:04 -0800 Comment on attachment 26659 Proposed patch r=me 105529 6 dimich 2009-01-13 11:24:25 -0800 Committed: http://trac.webkit.org/changeset/39866 26659 2009-01-12 20:04:56 -0800 2009-01-13 07:41:04 -0800 Proposed patch win.txt text/plain 3538 dimich SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM5ODUwKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDEtMTIgIERtaXRyeSBU aXRvdiAgPGRpbWljaEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMjgxCisKKyAgICAgICAgRml4IHRoZSBDaHJvbWl1bSBXaW4gYnVpbGQuCisgICAgICAg IE5lZWQgdG8gdXNlIFBMQVRGT1JNKFdJTl9PUykgaW5zdGVhZCBvZiBQTEFURk9STShXSU4pLgor ICAgICAgICBNb3ZlZCBHVEsgYW5kIFdYIHVwIGluICNpZiBzZXF1ZW5jZSBiZWNhdXNlIHRoZXkg Y291bGQgY29tZSB3aXRoIFdJTl9PUyB0b28sCisgICAgICAgIHdoaWxlIHRoZXkgaGF2ZSB0aGVp ciBvd24gaW1wbGVtZW50YXRpb24gZXZlbiBvbiBXaW5kb3dzLgorCisgICAgICAgICogd3RmL0N1 cnJlbnRUaW1lLmNwcDogCisgICAgICAgIChXVEY6OmN1cnJlbnRUaW1lKToKKwogMjAwOS0wMS0x MiAgS2V2aW4gT2xsaXZpZXIgIDxrZXZpbm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAgICAgICBT aW5jZSBkYXRlIHRpbWUgZnVuY3Rpb25zIGhhdmUgbW92ZWQgaGVyZSwgbm93IHRoZSB3eCBwb3J0 IEpTQwpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL0N1cnJlbnRUaW1lLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvQ3VycmVudFRpbWUuY3BwCShyZXZpc2lvbiAzOTgzMCkK KysrIEphdmFTY3JpcHRDb3JlL3d0Zi9DdXJyZW50VGltZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTM0LDE3ICszNCwxOSBAQAogCiAjaWYgUExBVEZPUk0oTUFDKQogI2luY2x1ZGUgPENvcmVGb3Vu ZGF0aW9uL0NGRGF0ZS5oPgotI2VsaWYgUExBVEZPUk0oV0lOKQorI2VsaWYgUExBVEZPUk0oR1RL KQorI2luY2x1ZGUgPGdsaWIuaD4KKyNlbGlmIFBMQVRGT1JNKFdYKQorI2luY2x1ZGUgPHd4L2Rh dGV0aW1lLmg+CisjZWxpZiBQTEFURk9STShXSU5fT1MpCisvLyBJZiBkZWZpbmVkLCBXSU4zMl9M RUFOX0FORF9NRUFOIGRpc2FibGVzIHRpbWVCZWdpblBlcmlvZC90aW1lRW5kUGVyaW9kLgorI3Vu ZGVmIFdJTjMyX0xFQU5fQU5EX01FQU4KICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAjaW5jbHVkZSA8 bWF0aC5oPgogI2luY2x1ZGUgPHN0ZGludC5oPgogI2luY2x1ZGUgPHN5cy90aW1lYi5oPgogI2lu Y2x1ZGUgPHN5cy90eXBlcy5oPgogI2luY2x1ZGUgPHRpbWUuaD4KLSNlbGlmIFBMQVRGT1JNKEdU SykKLSNpbmNsdWRlIDxnbGliLmg+Ci0jZWxpZiBQTEFURk9STShXWCkKLSNpbmNsdWRlIDx3eC9k YXRldGltZS5oPgogI2Vsc2UgLy8gUG9zaXggc3lzdGVtcyByZWx5aW5nIG9uIHRoZSBnZXR0aW1l b2ZkYXkoKQogI2luY2x1ZGUgPHN5cy90aW1lLmg+CiAjZW5kaWYKQEAgLTYwLDcgKzYyLDI4IEBA IGRvdWJsZSBjdXJyZW50VGltZSgpCiAgICAgcmV0dXJuIENGQWJzb2x1dGVUaW1lR2V0Q3VycmVu dCgpICsga0NGQWJzb2x1dGVUaW1lSW50ZXJ2YWxTaW5jZTE5NzA7CiB9CiAKLSNlbGlmIFBMQVRG T1JNKFdJTikKKyNlbGlmIFBMQVRGT1JNKEdUSykKKworLy8gTm90ZTogR1RLIG9uIFdpbmRvd3Mg d2lsbCBwaWNrIHVwIHRoZSBQTEFURk9STShXSU4pIGltcGxlbWVudGF0aW9uIGFib3ZlIHdoaWNo IHByb3ZpZGVzCisvLyBiZXR0ZXIgYWNjdXJhY3kgY29tcGFyZWQgd2l0aCBXaW5kb3dzIGltcGxl bWVudGF0aW9uIG9mIGdfZ2V0X2N1cnJlbnRfdGltZToKKy8vIChodHRwOi8vd3d3Lmdvb2dsZS5j b20vY29kZXNlYXJjaC9wP2hsPWVuI0hIbk5SamtzMXQwL2dsaWItMi41LjIvZ2xpYi9nbWFpbi5j JnE9Z19nZXRfY3VycmVudF90aW1lKS4KKy8vIE5vbi1XaW5kb3dzIEdUSyBidWlsZHMgY291bGQg dXNlIGdldHRpbWVvZmRheSgpIGRpcmVjdGx5IGJ1dCBmb3IgdGhlIHNha2Ugb2YgY29uc2lzdGVu Y3kgbGV0cyB1c2UgR1RLIGZ1bmN0aW9uLgorZG91YmxlIGN1cnJlbnRUaW1lKCkKK3sKKyAgICBH VGltZVZhbCBub3c7CisgICAgZ19nZXRfY3VycmVudF90aW1lKCZub3cpOworICAgIHJldHVybiBz dGF0aWNfY2FzdDxkb3VibGU+KG5vdy50dl9zZWMpICsgc3RhdGljX2Nhc3Q8ZG91YmxlPihub3cu dHZfdXNlYyAvIDEwMDAwMDAuMCk7Cit9CisKKyNlbGlmIFBMQVRGT1JNKFdYKQorCitkb3VibGUg Y3VycmVudFRpbWUoKQoreworICAgIHd4RGF0ZVRpbWUgbm93ID0gd3hEYXRlVGltZTo6VU5vdygp OworICAgIHJldHVybiAoZG91YmxlKW5vdy5HZXRUaWNrcygpICsgKGRvdWJsZSkobm93LkdldE1p bGxpc2Vjb25kKCkgLyAxMDAwLjApOworfQorCisjZWxpZiBQTEFURk9STShXSU5fT1MpCiAKIHN0 YXRpYyBMQVJHRV9JTlRFR0VSIHFwY0ZyZXF1ZW5jeTsKIHN0YXRpYyBib29sIHN5bmNlZFRpbWU7 CkBAIC0xODcsMjcgKzIxMCw2IEBAIGRvdWJsZSBjdXJyZW50VGltZSgpCiAgICAgcmV0dXJuIHV0 YyAvIDEwMDAuMDsKIH0KIAotI2VsaWYgUExBVEZPUk0oR1RLKQotCi0vLyBOb3RlOiBHVEsgb24g V2luZG93cyB3aWxsIHBpY2sgdXAgdGhlIFBMQVRGT1JNKFdJTikgaW1wbGVtZW50YXRpb24gYWJv dmUgd2hpY2ggcHJvdmlkZXMKLS8vIGJldHRlciBhY2N1cmFjeSBjb21wYXJlZCB3aXRoIFdpbmRv d3MgaW1wbGVtZW50YXRpb24gb2YgZ19nZXRfY3VycmVudF90aW1lOgotLy8gKGh0dHA6Ly93d3cu Z29vZ2xlLmNvbS9jb2Rlc2VhcmNoL3A/aGw9ZW4jSEhuTlJqa3MxdDAvZ2xpYi0yLjUuMi9nbGli L2dtYWluLmMmcT1nX2dldF9jdXJyZW50X3RpbWUpLgotLy8gTm9uLVdpbmRvd3MgR1RLIGJ1aWxk cyBjb3VsZCB1c2UgZ2V0dGltZW9mZGF5KCkgZGlyZWN0bHkgYnV0IGZvciB0aGUgc2FrZSBvZiBj b25zaXN0ZW5jeSBsZXRzIHVzZSBHVEsgZnVuY3Rpb24uCi1kb3VibGUgY3VycmVudFRpbWUoKQot ewotICAgIEdUaW1lVmFsIG5vdzsKLSAgICBnX2dldF9jdXJyZW50X3RpbWUoJm5vdyk7Ci0gICAg cmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4obm93LnR2X3NlYykgKyBzdGF0aWNfY2FzdDxkb3Vi bGU+KG5vdy50dl91c2VjIC8gMTAwMDAwMC4wKTsKLX0KLQotI2VsaWYgUExBVEZPUk0oV1gpCi0K LWRvdWJsZSBjdXJyZW50VGltZSgpCi17Ci0gICAgd3hEYXRlVGltZSBub3cgPSB3eERhdGVUaW1l OjpVTm93KCk7Ci0gICAgcmV0dXJuIChkb3VibGUpbm93LkdldFRpY2tzKCkgKyAoZG91YmxlKShu b3cuR2V0TWlsbGlzZWNvbmQoKSAvIDEwMDAuMCk7Ci19Ci0KICNlbHNlIC8vIE90aGVyIFBvc2l4 IHN5c3RlbXMgcmVseSBvbiB0aGUgZ2V0dGltZW9mZGF5KCkuCiAKIGRvdWJsZSBjdXJyZW50VGlt ZSgpCg==