After setting up a new build environment, I decided to try building using only non-Apple dependencies. This revealed a few placed in the tree where CFNetwork and CG headers are being referenced, but not used, in the Windows Cairo build. This patch cleans up these places so that the full WebKit project can be built without using the WebKitSupportLibrary dependencies.
Created attachment 33247 [details] Small set of conditionals around Apple-specific headers.
Comment on attachment 33247 [details] Small set of conditionals around Apple-specific headers. LGTM.
Rolled out in r46325 as this broke the Windows build.
Comment on attachment 33247 [details] Small set of conditionals around Apple-specific headers. > Index: WebCore/platform/graphics/win/SimpleFontDataWin.cpp > =================================================================== > --- WebCore/platform/graphics/win/SimpleFontDataWin.cpp (revision 46148) > +++ WebCore/platform/graphics/win/SimpleFontDataWin.cpp (working copy) > @@ -37,10 +37,14 @@ > #include <wtf/MathExtras.h> > #include <unicode/uchar.h> > #include <unicode/unorm.h> > +#if PLATFORM(CG) > #include <ApplicationServices/ApplicationServices.h> > +#endif > #include <mlang.h> > #include <tchar.h> > +#if PLATFORM(CG) > #include <WebKitSystemInterface/WebKitSystemInterface.h> > +#endif Please don't add #if's in the middle of a block of #include's like this. The #include's should be sorted, and any #if'd #include's should be in separate paragraphs at the end. > Index: WebKit/win/DefaultDownloadDelegate.h > =================================================================== > --- WebKit/win/DefaultDownloadDelegate.h (revision 46148) > +++ WebKit/win/DefaultDownloadDelegate.h (working copy) > @@ -28,7 +28,9 @@ > #include "COMPtr.h" > #include "WebKit.h" > > +#if PLATFORM(CFNETWORK) > #include <CFNetwork/CFURLDownloadPriv.h> > +#endif > #include <wtf/HashSet.h> Same comment applies here. > Index: WebKit/win/WebDownload.h > =================================================================== > --- WebKit/win/WebDownload.h (revision 46148) > +++ WebKit/win/WebDownload.h (working copy) > @@ -29,7 +29,9 @@ > #include "COMPtr.h" > #include "WebKit.h" > > +#if PLATFORM(CFNETWORK) > #include <CFNetwork/CFURLDownloadPriv.h> > +#endif > #include <WebCore/PlatformString.h> > #include <wtf/RetainPtr.h> And here. > > Index: WebKit/win/WebMutableURLRequest.cpp > =================================================================== > --- WebKit/win/WebMutableURLRequest.cpp (revision 46148) > +++ WebKit/win/WebMutableURLRequest.cpp (working copy) > @@ -30,7 +30,9 @@ > #include "WebKit.h" > #include "MarshallingHelpers.h" > #include "WebKit.h" > +#if PLATFORM(CFNETWORK) > #include <CFNetwork/CFURLRequestPriv.h> > +#endif > #pragma warning(push, 0) > #include <WebCore/BString.h> > #include <WebCore/COMPtr.h> And here. Marking as r- as this broke the build.
Created attachment 33455 [details] Revised per bdash's comments Corrected improper use of PLATFORM(CFNETWORK) to USE(CFNETWORK). Corrected #include ordering.
Comment on attachment 33455 [details] Revised per bdash's comments r=me
Landed in http://trac.webkit.org/changeset/46359.
Conditional #if should be in separate paragraph.