Summary: | [WebKit2] Only include Cocoa.h on platforms that use AppKit | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Andy Estes <aestes> | ||||||||
Component: | New Bugs | Assignee: | Andy Estes <aestes> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | gustavo, webkit.review.bot, xan.lopez | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Andy Estes
2012-06-07 03:14:14 PDT
Created attachment 146243 [details]
Patch
Comment on attachment 146243 [details] Patch Attachment 146243 [details] did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/12906969 Oh weird. Could this be due to me trying to include Platform.h in WebKit2Prefix.h without first including autotoolsconfig.h? Is that a requirement on GTK? I think I can probably just remove the include of Cocoa.h from WebKit2Prefix.h since it's already in config.h. (In reply to comment #4) > I think I can probably just remove the include of Cocoa.h from WebKit2Prefix.h since it's already in config.h. No, turns out that including Cocoa.h is required so that our #defines for new and delete in WebKit2Prefix.h don't end up expanding +[NSObject new] and -[NSText delete:]. I'll just try including autotoolsconfig.h. Created attachment 146444 [details]
Patch
Comment on attachment 146444 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146444&action=review > Source/WebKit2/config.h:84 > #ifdef __OBJC__ > +#import <Foundation/Foundation.h> > +#if USE(APPKIT) > #import <Cocoa/Cocoa.h> > #endif > +#endif Actually, there's no reason for this entire block since it's already in the prefix header. Created attachment 146449 [details]
Patch
Comment on attachment 146449 [details] Patch Clearing flags on attachment: 146449 Committed r119798: <http://trac.webkit.org/changeset/119798> All reviewed patches have been landed. Closing bug. |