Title: [119806] trunk/Source/WebKit2
- Revision
- 119806
- Author
- [email protected]
- Date
- 2012-06-08 00:29:47 -0700 (Fri, 08 Jun 2012)
Log Message
[WebKit2] Move Mac-specific bits from config.h to WebKit2Prefix.h
https://bugs.webkit.org/show_bug.cgi?id=88625
Reviewed by Dan Bernstein.
Since the Mac supports prefix headers, there is no point in having
Mac-specific code in WebKit2's config.h. Move it to WebKit2Prefix.h.
* WebKit2Prefix.h:
* config.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119805 => 119806)
--- trunk/Source/WebKit2/ChangeLog 2012-06-08 07:27:20 UTC (rev 119805)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-08 07:29:47 UTC (rev 119806)
@@ -1,3 +1,16 @@
+2012-06-08 Andy Estes <[email protected]>
+
+ [WebKit2] Move Mac-specific bits from config.h to WebKit2Prefix.h
+ https://bugs.webkit.org/show_bug.cgi?id=88625
+
+ Reviewed by Dan Bernstein.
+
+ Since the Mac supports prefix headers, there is no point in having
+ Mac-specific code in WebKit2's config.h. Move it to WebKit2Prefix.h.
+
+ * WebKit2Prefix.h:
+ * config.h:
+
2012-06-07 Kentaro Hara <[email protected]>
Reduce Node object size from 72 byte to 64 byte
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (119805 => 119806)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2012-06-08 07:27:20 UTC (rev 119805)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2012-06-08 07:29:47 UTC (rev 119806)
@@ -30,6 +30,22 @@
#include <wtf/Platform.h>
+#if PLATFORM(MAC)
+
+#ifndef BUILDING_ON_SNOW_LEOPARD
+#define ENABLE_WEB_PROCESS_SANDBOX 1
+#endif
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+#define ENABLE_PLUGIN_PROCESS 1
+#endif
+
+#define ENABLE_MEMORY_SAMPLER 1
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CoreGraphics.h>
+#include <WebCore/EmptyProtocolDefinitions.h>
+
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#if USE(APPKIT)
@@ -37,6 +53,8 @@
#endif
#endif
+#endif // PLATFORM(MAC)
+
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
* interfere with Objective-C++ uses of Objective-C exception handlers, which
Modified: trunk/Source/WebKit2/config.h (119805 => 119806)
--- trunk/Source/WebKit2/config.h 2012-06-08 07:27:20 UTC (rev 119805)
+++ trunk/Source/WebKit2/config.h 2012-06-08 07:29:47 UTC (rev 119806)
@@ -59,27 +59,8 @@
return name##Value; \
}
-#if PLATFORM(MAC)
+#if defined(WIN32) || defined(_WIN32)
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#define ENABLE_WEB_PROCESS_SANDBOX 1
-#endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#define ENABLE_PLUGIN_PROCESS 1
-#endif
-
-#if PLATFORM(MAC)
-#define ENABLE_MEMORY_SAMPLER 1
-#endif
-
-#import <CoreFoundation/CoreFoundation.h>
-#import <CoreGraphics/CoreGraphics.h>
-
-#include <WebCore/EmptyProtocolDefinitions.h>
-
-#elif defined(WIN32) || defined(_WIN32)
-
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
