Summary: | Conditionalize CFNetwork-Specific Code in WebView | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Brent Fulgham <bfulgham> | ||||
Component: | WebKit Misc. | Assignee: | Nobody <webkit-unassigned> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | ||||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | PC | ||||||
OS: | OS X 10.5 | ||||||
Attachments: |
|
Description
Brent Fulgham
2009-03-24 11:22:15 PDT
Created attachment 28893 [details]
Exclude CFNetwork-specific calls in non-Apple builds.
Comment on attachment 28893 [details] Exclude CFNetwork-specific calls in non-Apple builds. > +++ WebKit/win/WebView.cpp (working copy) > @@ -50,7 +50,9 @@ > #include "WebNotificationCenter.h" > #include "WebPreferences.h" > #pragma warning( push, 0 ) > +#if PLATFORM(CG) > #include <CoreGraphics/CGContext.h> > +#endif It would be better to move the conditionally-included headers down below the unconditionally-included headers. Each #if/#endif pair can form its own paragraph. > +#include <CoreFoundation/CoreFoundation.h> Should this be inside #if PLATFORM(CF)/#endif? r=me (In reply to comment #2) > (From update of attachment 28893 [details] [review]) > > +++ WebKit/win/WebView.cpp (working copy) > > @@ -50,7 +50,9 @@ > > #include "WebNotificationCenter.h" > > #include "WebPreferences.h" > > #pragma warning( push, 0 ) > > +#if PLATFORM(CG) > > #include <CoreGraphics/CGContext.h> > > +#endif > > It would be better to move the conditionally-included headers down below the > unconditionally-included headers. Each #if/#endif pair can form its own > paragraph. Will do. > > +#include <CoreFoundation/CoreFoundation.h> > > Should this be inside #if PLATFORM(CF)/#endif? Currently, all Windows builds use CoreFoundation, so if this was not included I'm not sure if anything would build. But it certainly won't hurt to add the check, and might help some future porter so I'll change it when I commit. > r=me > |