Bug 58576 - Evaluate PLATFORM(GTK) before OS(WINDOWS)
Summary: Evaluate PLATFORM(GTK) before OS(WINDOWS)
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-14 14:43 PDT by Fridrich Strba
Modified: 2011-04-15 18:22 PDT (History)
4 users (show)

See Also:


Attachments
Patch (2.13 KB, patch)
2011-04-14 14:46 PDT, Fridrich Strba
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Fridrich Strba 2011-04-14 14:43:20 PDT
This allow the Windows GTK build to chose the right branch before it is sucked by all-encompassing OS(WINDOWS) test
Comment 1 Fridrich Strba 2011-04-14 14:46:00 PDT
Created attachment 89656 [details]
Patch
Comment 2 Martin Robinson 2011-04-14 15:37:53 PDT
Comment on attachment 89656 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=89656&action=review

> Source/WebCore/platform/FileSystem.h:-80
> -#if OS(WINDOWS)

It might be better here to simply change this to #if OS(WINDOWS) && !PLATFORM(GTK)
Comment 3 Fridrich Strba 2011-04-14 21:43:42 PDT
(In reply to comment #2)
> (From update of attachment 89656 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=89656&action=review
> 
> > Source/WebCore/platform/FileSystem.h:-80
> > -#if OS(WINDOWS)
> 
> It might be better here to simply change this to #if OS(WINDOWS) && !PLATFORM(GTK)

In my opinion, moving the 3 lines is producing more readable code and correspond to what for instance QT port does, the evaluation of its platform comes before the windows evaluation. There is already enough of forest of ifdefs so that the stuff be even more offuscated :)
Comment 4 WebKit Commit Bot 2011-04-15 17:14:59 PDT
The commit-queue encountered the following flaky tests while processing attachment 89656 [details]:

http/tests/xmlhttprequest/logout.html bug 52047 (author: ap@webkit.org)
The commit-queue is continuing to process your patch.
Comment 5 WebKit Commit Bot 2011-04-15 17:17:51 PDT
Comment on attachment 89656 [details]
Patch

Clearing flags on attachment: 89656

Committed r84059: <http://trac.webkit.org/changeset/84059>
Comment 6 WebKit Commit Bot 2011-04-15 17:17:54 PDT
All reviewed patches have been landed.  Closing bug.
Comment 7 WebKit Review Bot 2011-04-15 18:22:35 PDT
http://trac.webkit.org/changeset/84059 might have broken WinCairo Debug (Build)