Bug 64377 - [WinCairo] Standardize on PLATFORM(WIN_CAIRO) definitions
Summary: [WinCairo] Standardize on PLATFORM(WIN_CAIRO) definitions
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Windows 7
: P2 Normal
Assignee: Brent Fulgham
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-12 11:43 PDT by Brent Fulgham
Modified: 2011-07-13 12:32 PDT (History)
2 users (show)

See Also:

Attachments
Patch (6.68 KB, patch)
2011-07-12 13:26 PDT, Brent Fulgham 		no flags Details | Formatted Diff | Diff
Patch (10.00 KB, patch)
2011-07-12 14:00 PDT, Brent Fulgham 		mjs: review+
Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Brent Fulgham 2011-07-12 11:43:57 PDT 
The current source tree conditionalizes various WinCairo features using "#ifdef WIN_CAIRO".

This is inconsistent with all other ports, which properly define WTF_PLATFORM_xxx, and use the corresponding PLATFORM(xxx) to test for this state.

This bug:
1. Changes WIN_CAIRO to WTF_PLATFORM_WIN_CAIRO
2. Changes instanced of "#ifdef WIN_CAIRO" or "#ifndef WIN_CAIRO" to "#if PLATFORM(WIN_CAIRO)" or "#if !PLATFORM(WIN_CAIRO)".

It also removes a redundant definition of WIN_CAIRO in a project file, which should properly be controlled by the vsprops files.
Comment 1 Brent Fulgham 2011-07-12 13:26:06 PDT 
Created attachment 100551 [details]
Patch
Comment 2 Brent Fulgham 2011-07-12 14:00:10 PDT 
Created attachment 100556 [details]
Patch
Comment 3 Adam Roben (:aroben) 2011-07-12 14:02:35 PDT 
Maciej, you should take a look at this.
Comment 4 Maciej Stachowiak 2011-07-12 20:12:04 PDT 
Comment on attachment 100556 [details]
Patch

r=me
Comment 5 Brent Fulgham 2011-07-13 12:32:38 PDT 
Committed r90940: <http://trac.webkit.org/changeset/90940>