Changeset 36074 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Sep 3, 2008, 6:32:51 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam.

Clean up Platform.h and add PLATFORM(CHROMIUM), PLATFORM(SKIA) and USE(V8_BINDINGS)

• Configurations/WebCore.xcconfig: add missing ENABLE_*
• config.h: add rules for V8_BINDINGS

Location:

trunk/JavaScriptCore/wtf

Files:

• ASCIICType.h (modified) (1 diff)
• Platform.h (modified) (7 diffs)

trunk/JavaScriptCore/wtf/ASCIICType.h

@@ -30 +30 @@
 #define WTF_ASCIICType_h
 
+#include <wtf/Assertions.h>
 #include <wtf/Platform.h>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN 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. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -84 +84 @@
 #endif
 
+/* PLATFORM(CHROMIUM) */
+#if defined(BUILDING_CHROMIUM__)
+#define WTF_PLATFORM_CHROMIUM 1
+#endif
+
 /* Operating environments */
 
@@ -110 +115 @@
 /* Graphics engines */
 
-/* PLATFORM(CG) */
-/* PLATFORM(CAIRO) */
+/* PLATFORM(CG) and PLATFORM(CI) */
 #if PLATFORM(MAC)
 #define WTF_PLATFORM_CG 1
 #define WTF_PLATFORM_CI 1
-#elif !PLATFORM(QT) && !PLATFORM(WX)
+#endif
+
+/* PLATFORM(SKIA) */
+#if PLATFORM(CHROMIUM)
+#define WTF_PLATFORM_SKIA 1
+#endif
+
+/* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */
+#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX)
 #define WTF_PLATFORM_CAIRO 1
 #endif
@@ -242 +254 @@
 #endif
 
-#if (PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(SYMBIAN) || PLATFORM(WIN) || PLATFORM(WX)) && !defined(ENABLE_NETSCAPE_PLUGIN_API)
-#define ENABLE_NETSCAPE_PLUGIN_API 1
-#endif
-
 #if PLATFORM(WIN)
 #define WTF_USE_WININET 1
@@ -253 +261 @@
 #define WTF_USE_CURL 1
 #define WTF_USE_PTHREADS 1
-#endif
-
-#if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_DASHBOARD_SUPPORT)
-#define ENABLE_DASHBOARD_SUPPORT 1
 #endif
 
@@ -311 +315 @@
 #endif
 
+#if !defined(ENABLE_DASHBOARD_SUPPORT)
+#define ENABLE_DASHBOARD_SUPPORT 0
+#endif
+
 #if !defined(ENABLE_MAC_JAVA_BRIDGE)
 #define ENABLE_MAC_JAVA_BRIDGE 0
@@ -316 +324 @@
 
 #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
-#define ENABLE_NETSCAPE_PLUGIN_API 0
+#define ENABLE_NETSCAPE_PLUGIN_API 1
 #endif