Bug 88517

Summary: [WebKit2] Only include Cocoa.h on platforms that use AppKit
Product: WebKit Reporter: Andy Estes <aestes>
Component: New BugsAssignee: 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 Flags
Patch
none
Patch
none
Patch none

Andy Estes
Reported 2012-06-07 03:14:14 PDT
[WebKit2] Only include Cocoa.h on platforms that use AppKit
Attachments
Patch (2.17 KB, patch)
2012-06-07 03:19 PDT, Andy Estes 		no flags
DetailsFormatted DiffDiff
Patch (2.55 KB, patch)
2012-06-07 18:39 PDT, Andy Estes 		no flags
DetailsFormatted DiffDiff
Patch (2.39 KB, patch)
2012-06-07 18:50 PDT, Andy Estes 		no flags
DetailsFormatted DiffDiff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.
Andy Estes
Comment 1 2012-06-07 03:19:30 PDT
Created attachment 146243 [details] Patch
Gustavo Noronha (kov)
Comment 2 2012-06-07 07:39:52 PDT
Comment on attachment 146243 [details] Patch Attachment 146243 [details] did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/12906969
Andy Estes
Comment 3 2012-06-07 18:16:35 PDT
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?
Andy Estes
Comment 4 2012-06-07 18:25:57 PDT
I think I can probably just remove the include of Cocoa.h from WebKit2Prefix.h since it's already in config.h.
Andy Estes
Comment 5 2012-06-07 18:36:01 PDT
(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.
Andy Estes
Comment 6 2012-06-07 18:39:56 PDT
Created attachment 146444 [details] Patch
Andy Estes
Comment 7 2012-06-07 18:44:08 PDT
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.
Andy Estes
Comment 8 2012-06-07 18:50:52 PDT
Created attachment 146449 [details] Patch
WebKit Review Bot
Comment 9 2012-06-07 21:49:52 PDT
Comment on attachment 146449 [details] Patch Clearing flags on attachment: 146449 Committed r119798: <http://trac.webkit.org/changeset/119798>
WebKit Review Bot
Comment 10 2012-06-07 21:49:57 PDT
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.