Turn on ENABLE_3D_RENDERING on all Windows builds
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Oct 2010 18:40:30 +0000 (18:40 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Oct 2010 18:40:30 +0000 (18:40 +0000)
Reviewed by Sam Weinig.

JavaScriptCore:

Remove the QuartzCorePresent.h mechanism

This header was used to detect whether QuartzCore headers were present
on the system. Everyone should have these headers now so we no longer
need to detect.

* JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Remove
code to generate QuartzCorePresent.h.

* wtf/Platform.h: Stop including QuartzCorePresent.h on Windows and
collapse all USE_ACCELERATED_COMPOSITING settings into one #ifdef.

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh
JavaScriptCore/wtf/Platform.h
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

index 670312e..57573da 100644 (file)
@@ -1,3 +1,19 @@
+2010-10-22  Adam Roben  <aroben@apple.com>
+
+        Remove the QuartzCorePresent.h mechanism
+
+        This header was used to detect whether QuartzCore headers were present
+        on the system. Everyone should have these headers now so we no longer
+        need to detect.
+
+        Reviewed by Sam Weinig.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Remove
+        code to generate QuartzCorePresent.h.
+
+        * wtf/Platform.h: Stop including QuartzCorePresent.h on Windows and
+        collapse all USE_ACCELERATED_COMPOSITING settings into one #ifdef.
+
 2010-10-22  Adam Barth  <abarth@webkit.org>
 
         Unreviewed, rolling out r70290.
index 85c3152..fafe5c8 100755 (executable)
@@ -1,15 +1,5 @@
 #!/usr/bin/bash
 
-# Determine if we have QuartzCore so we can turn on
-QUARTZCORE_H_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/include/QuartzCore/QuartzCore.h")
-QUARTZCOREPRESENT_H_PATH=$(cygpath -u "${WEBKITOUTPUTDIR}/include/private/QuartzCorePresent.h")
-if test \( ! -f "${QUARTZCOREPRESENT_H_PATH}" \) -o \( -f "${QUARTZCORE_H_PATH}" -a \( "${QUARTZCORE_H_PATH}" -nt "${QUARTZCOREPRESENT_H_PATH}" \) \)
-then
-    mkdir -p "$(dirname "${QUARTZCOREPRESENT_H_PATH}")"
-    test ! -f "${QUARTZCORE_H_PATH}"
-    echo "#define QUARTZCORE_PRESENT $?" > "${QUARTZCOREPRESENT_H_PATH}"
-fi
-
 # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
 UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/lib/libicuuc.lib")
 ICUVERSION_H_PATH=$(cygpath -u "${WEBKITOUTPUTDIR}/include/private/ICUVersion.h")
index 485e0ea..946192b 100644 (file)
 #define WTF_USE_ATSUI 1
 #define WTF_USE_CORE_TEXT 0
 #endif
-
-/* Accelerated compositing */
-#if !defined(BUILDING_ON_TIGER)
-#define WTF_USE_ACCELERATED_COMPOSITING 1
-#endif
-#endif
-
-#if PLATFORM(IOS)
-#define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 
-#if PLATFORM(QT)
-#define WTF_USE_ACCELERATED_COMPOSITING 1
-#endif
-
-/* FIXME: Defining ENABLE_3D_RENDERING here isn't really right, but it's always used with
-   with WTF_USE_ACCELERATED_COMPOSITING, and it allows the feature to be turned on and
-   off in one place. */
-#if PLATFORM(WIN) && !OS(WINCE)
-#include "QuartzCorePresent.h"
-#if QUARTZCORE_PRESENT
+/* Accelerated compositing */
+#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE))
 #define WTF_USE_ACCELERATED_COMPOSITING 1
-#define ENABLE_3D_RENDERING 1
-#endif
 #endif
 
 #if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
index e15958d..a3d1d8a 100644 (file)
@@ -1,3 +1,11 @@
+2010-10-22  Adam Roben  <aroben@apple.com>
+
+        Turn on ENABLE_3D_RENDERING on all Windows builds
+
+        Reviewed by Sam Weinig.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
 2010-10-20  Adam Roben  <aroben@apple.com>
 
         Windows build fix
index 17b5da4..f411dd3 100644 (file)
@@ -18,7 +18,7 @@
        />
   <UserMacro
                Name="ENABLE_3D_RENDERING"
-               Value=""
+               Value="ENABLE_3D_RENDERING"
                PerformEnvironmentSet="true"
        />
   <UserMacro