Bug 69600 – [WinCairo] Correct improper identification of QuartzCore Extensions on Windows

• Component: WebKit2
• Status: RESOLVED FIXED

[Brent Fulgham]

A change to support hardware accelerated rendering under the Apple Windows build had the unintended effect of fooling Cairo builds into trying to build with Apple-specific extensions.

http://trac.webkit.org/changeset/82960/trunk/Source/WebKit2/DerivedSources.make

This patch attempts to recognize the Cairo build case and avoid switching to the new extensions.

This was not noticed previously because it is only triggered when the build environment is updated to include the most recent Apple build headers (as you might do if you build both ways to confirm compatibility).

[Brent Fulgham]

Created attachment 110088 [details]
Patch

[Brent Fulgham]

Committed r96904: <http://trac.webkit.org/changeset/96904>

[Brent Fulgham]

The EWS showed the standard Apple Windows build succeeding, so I'm landing it to try to get my build bot green.

Please roll-out if it causes any problem.

[Adam Roben (:aroben)]

Sorry for the trouble here!

I think there's probably a slightly better way to fix this. HAVE(WKQCA) being true shouldn't be enough to cause the WinCairo build to start trying to use WebKitQuartzCoreAdditions; USE(ACCELERATED_COMPOSITING) also has to be true. Is that symbol defined for your port? If it is, that seems like a bug. If it is not, then I think we just need to change some "HAVE(WKQCA)" checks into "HAVE(WKQCA) && USE(ACCELERATED_COMPOSITING)".

[Adam Barth]

Comment on attachment 110088 [details]
Patch

Cleared review? from attachment 110088 [details] so that this bug does not appear in http://webkit.org/pending-review.  If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again).