Bug 23281 – Fix the Chromium Win build

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Dmitry Titov]

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).

[Mark Rowe (bdash)]

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.

[Eric Seidel (no email)]

(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.

[Dmitry Titov]

Created attachment 26659 [details]
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.

[Mark Rowe (bdash)]

(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.

[Darin Adler]

Comment on attachment 26659 [details]
Proposed patch

r=me

[Dmitry Titov]

Committed: http://trac.webkit.org/changeset/39866