The FontDatabase class is only needed for processing CG-based fonts. Since these are not used in the Cairo version of the Windows build, remove the database from the Cairo Windows target.
Created attachment 25657 [details] Remove FontDatabase from Windows Cairo build.
Created attachment 25658 [details] Remove FontDatabase from Windows Cairo build.
Comment on attachment 25658 [details] Remove FontDatabase from Windows Cairo build. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 38852) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2008-11-30 Brent Fulgham <bfulgham@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=22586 > + Remove FontDatabase files from Cairo Windows build. Maybe you should make the name of the bug more general since you're making other fixes in this change. > + static Color focusRingColor; > + > + if (!focusRingColor.isValid()) > + focusRingColor = aquaFocusRingColor; You can do this all in one statement: static Color focusRingColor = aquaFocusRingColor; > + void populateFontDatabase() { /* Do nothing */ } Why not just add this one stub to platform/win/TemporaryLinkStubs.cpp? r- because I don't think it's good to add another link stub file with a different name that's only for Cairo (at least not if the name doesn't indicate it's only for Cairo).
Created attachment 25672 [details] Patch to remove some CG-specific code from the Cairo build. Revised patch based on aroben's comments: 1. Using the canonical stub file. 2. Switched to simplified focusRingColor implementation. 3. Revised bug title and description.
Comment on attachment 25672 [details] Patch to remove some CG-specific code from the Cairo build. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 38897) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2008-12-01 Brent Fulgham <bfulgham@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + WARNING: NO TEST CASES ADDED OR CHANGED You should still reference the bug in the ChangeLog. You should also remove this line about no tests being added, and replace it with an explanation. r=me
Created attachment 25673 [details] Patch to remove some CG-specific code from the Cairo build. Revised patch to address aroben's ChangeLog suggestions.
Comment on attachment 25673 [details] Patch to remove some CG-specific code from the Cairo build. r=me
Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.vcproj/WebCore.vcproj M WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp M WebCore/platform/win/TemporaryLinkStubs.cpp Committed r38906