Bug 58576

Summary:

Evaluate PLATFORM(GTK) before OS(WINDOWS)

Product:

WebKit

Reporter:

Fridrich Strba <fridrich.strba>

Component:

WebKitGTK

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

abarth, commit-queue, eric, webkit.review.bot

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

OS X 10.5

Attachments:

Description	Flags
Patch	none

Fridrich Strba

Reported 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

Attachments
Patch (2.13 KB, patch) 2011-04-14 14:46 PDT, Fridrich Strba	no flags	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Fridrich Strba

Comment 1 2011-04-14 14:46:00 PDT

Created attachment 89656 [details] Patch

Martin Robinson

Comment 2 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)

Fridrich Strba

Comment 3 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 :)

WebKit Commit Bot

Comment 4 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.

WebKit Commit Bot

Comment 5 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>

WebKit Commit Bot

Comment 6 2011-04-15 17:17:54 PDT

All reviewed patches have been landed. Closing bug.

WebKit Review Bot

Comment 7 2011-04-15 18:22:35 PDT

http://trac.webkit.org/changeset/84059 might have broken WinCairo Debug (Build)

Note You need to log in before you can comment on or make changes to this bug.