Title: [119798] trunk/Source/WebKit2
- Revision
- 119798
- Author
- [email protected]
- Date
- 2012-06-07 21:49:34 -0700 (Thu, 07 Jun 2012)
Log Message
[WebKit2] Only include Cocoa.h on platforms that use AppKit
https://bugs.webkit.org/show_bug.cgi?id=88517
Reviewed by Sam Weinig.
* WebKit2Prefix.h: Include Platform.h to get USE() macros. GTK needs to
include autotoolsconfig.h before including Platform.h, so do that first
if building on GTK. Then, if compiling an Objective-C file, it's safe
to include Foundation.h, but not necessarily Cocoa.h; only include the
latter if USE(APPKIT) is true.
* config.h: There's no need to import Cocoa.h since this is already
imported in the prefix header.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119797 => 119798)
--- trunk/Source/WebKit2/ChangeLog 2012-06-08 04:27:22 UTC (rev 119797)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-08 04:49:34 UTC (rev 119798)
@@ -1,3 +1,18 @@
+2012-06-07 Andy Estes <[email protected]>
+
+ [WebKit2] Only include Cocoa.h on platforms that use AppKit
+ https://bugs.webkit.org/show_bug.cgi?id=88517
+
+ Reviewed by Sam Weinig.
+
+ * WebKit2Prefix.h: Include Platform.h to get USE() macros. GTK needs to
+ include autotoolsconfig.h before including Platform.h, so do that first
+ if building on GTK. Then, if compiling an Objective-C file, it's safe
+ to include Foundation.h, but not necessarily Cocoa.h; only include the
+ latter if USE(APPKIT) is true.
+ * config.h: There's no need to import Cocoa.h since this is already
+ imported in the prefix header.
+
2012-06-07 Anders Carlsson <[email protected]>
Search highlight does not scroll with the content of the page, and find overlay doesn't work, on large-enough window
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (119797 => 119798)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2012-06-08 04:27:22 UTC (rev 119797)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2012-06-08 04:49:34 UTC (rev 119798)
@@ -22,11 +22,20 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
+#if defined (BUILDING_GTK__)
+#include "autotoolsconfig.h"
+#endif /* defined (BUILDING_GTK__) */
+
+#include <wtf/Platform.h>
+
#ifdef __OBJC__
+#import <Foundation/Foundation.h>
+#if USE(APPKIT)
#import <Cocoa/Cocoa.h>
#endif
+#endif
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
Modified: trunk/Source/WebKit2/config.h (119797 => 119798)
--- trunk/Source/WebKit2/config.h 2012-06-08 04:27:22 UTC (rev 119797)
+++ trunk/Source/WebKit2/config.h 2012-06-08 04:49:34 UTC (rev 119798)
@@ -75,11 +75,6 @@
#import <CoreGraphics/CoreGraphics.h>
-#ifdef __OBJC__
-#import <Cocoa/Cocoa.h>
-#endif
-
-
#include <WebCore/EmptyProtocolDefinitions.h>
#elif defined(WIN32) || defined(_WIN32)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
