Title: [92332] trunk/Source
Revision
92332
Author
mr...@apple.com
Date
2011-08-03 16:50:50 -0700 (Wed, 03 Aug 2011)

Log Message

Clean up FeatureDefines.xcconfig to remove some unnecessary conditional settings

Reviewed by Dave Kilzer.

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (92331 => 92332)


--- trunk/Source/_javascript_Core/ChangeLog	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-08-03 23:50:50 UTC (rev 92332)
@@ -1,3 +1,11 @@
+2011-08-03  Mark Rowe  <mr...@apple.com>
+
+        Clean up FeatureDefines.xcconfig to remove some unnecessary conditional settings
+
+        Reviewed by Dave Kilzer.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-08-03  Filip Pizlo  <fpi...@apple.com>
 
         JSC GC heap size improvement breaks build on some platforms due to

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (92331 => 92332)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2011-08-03 23:50:50 UTC (rev 92332)
@@ -33,31 +33,18 @@
 
 ENABLE_LINK_PREFETCH = ;
 
-ENABLE_ACCELERATED_2D_CANVAS = $(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
+ENABLE_ACCELERATED_2D_CANVAS = ;
 
-ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
-ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
-ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
+ENABLE_WEBGL = ENABLE_WEBGL;
 
-ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
-ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_iphonesimulator = $(ENABLE_3D_RENDERING_iphoneos);
-ENABLE_3D_RENDERING_macosx = $(ENABLE_3D_RENDERING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
+ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
 
 ENABLE_ANIMATION_API = ;
 
 ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
 ENABLE_BLOB_macosx = ENABLE_BLOB;
 
-ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
-ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
 ENABLE_CLIENT_BASED_GEOLOCATION = $(ENABLE_CLIENT_BASED_GEOLOCATION_$(REAL_PLATFORM_NAME));
 ENABLE_CLIENT_BASED_GEOLOCATION_macosx = ENABLE_CLIENT_BASED_GEOLOCATION;
@@ -82,7 +69,7 @@
 
 ENABLE_FILE_SYSTEM = ;
 
-ENABLE_CSS3_FLEXBOX =;
+ENABLE_CSS3_FLEXBOX = ;
 
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -107,8 +94,7 @@
 
 ENABLE_REGISTER_PROTOCOL_HANDLER = ;
 
-ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
+ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
 
 ENABLE_SVG = ENABLE_SVG;
 ENABLE_SVG_ANIMATION = ENABLE_SVG_ANIMATION;
@@ -129,13 +115,11 @@
 
 ENABLE_WEB_AUDIO = ;
 
-ENABLE_WEB_SOCKETS = $(ENABLE_WEB_SOCKETS_$(REAL_PLATFORM_NAME));
-ENABLE_WEB_SOCKETS_macosx = ENABLE_WEB_SOCKETS;
+ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING = ;
 
-ENABLE_WORKERS = $(ENABLE_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_WORKERS_macosx = ENABLE_WORKERS;
+ENABLE_WORKERS = ENABLE_WORKERS;
 
 ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;

Modified: trunk/Source/WebCore/ChangeLog (92331 => 92332)


--- trunk/Source/WebCore/ChangeLog	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebCore/ChangeLog	2011-08-03 23:50:50 UTC (rev 92332)
@@ -1,3 +1,11 @@
+2011-08-03  Mark Rowe  <mr...@apple.com>
+
+        Clean up FeatureDefines.xcconfig to remove some unnecessary conditional settings
+
+        Reviewed by Dave Kilzer.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-08-02  Adrienne Walker  <e...@google.com>
 
         [chromium] Fix issue where switching composited tabs evicts root textures

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (92331 => 92332)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2011-08-03 23:50:50 UTC (rev 92332)
@@ -33,31 +33,18 @@
 
 ENABLE_LINK_PREFETCH = ;
 
-ENABLE_ACCELERATED_2D_CANVAS = $(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
+ENABLE_ACCELERATED_2D_CANVAS = ;
 
-ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
-ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
-ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
+ENABLE_WEBGL = ENABLE_WEBGL;
 
-ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
-ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_iphonesimulator = $(ENABLE_3D_RENDERING_iphoneos);
-ENABLE_3D_RENDERING_macosx = $(ENABLE_3D_RENDERING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
+ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
 
 ENABLE_ANIMATION_API = ;
 
 ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
 ENABLE_BLOB_macosx = ENABLE_BLOB;
 
-ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
-ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
 ENABLE_CLIENT_BASED_GEOLOCATION = $(ENABLE_CLIENT_BASED_GEOLOCATION_$(REAL_PLATFORM_NAME));
 ENABLE_CLIENT_BASED_GEOLOCATION_macosx = ENABLE_CLIENT_BASED_GEOLOCATION;
@@ -107,8 +94,7 @@
 
 ENABLE_REGISTER_PROTOCOL_HANDLER = ;
 
-ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
+ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
 
 ENABLE_SVG = ENABLE_SVG;
 ENABLE_SVG_ANIMATION = ENABLE_SVG_ANIMATION;
@@ -129,16 +115,14 @@
 
 ENABLE_WEB_AUDIO = ;
 
-ENABLE_WEB_SOCKETS = $(ENABLE_WEB_SOCKETS_$(REAL_PLATFORM_NAME));
-ENABLE_WEB_SOCKETS_macosx = ENABLE_WEB_SOCKETS;
+ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING = ;
 
-ENABLE_WORKERS = $(ENABLE_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_WORKERS_macosx = ENABLE_WORKERS;
+ENABLE_WORKERS = ENABLE_WORKERS;
 
 ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_MHTML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

Modified: trunk/Source/WebKit/mac/ChangeLog (92331 => 92332)


--- trunk/Source/WebKit/mac/ChangeLog	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebKit/mac/ChangeLog	2011-08-03 23:50:50 UTC (rev 92332)
@@ -1,3 +1,11 @@
+2011-08-03  Mark Rowe  <mr...@apple.com>
+
+        Clean up FeatureDefines.xcconfig to remove some unnecessary conditional settings
+
+        Reviewed by Dave Kilzer.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-08-03  Joseph Pecoraro  <joep...@webkit.org>
 
         Web Inspector: Remove InspectorFrontendHost load/saveSessionSetting

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (92331 => 92332)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2011-08-03 23:50:50 UTC (rev 92332)
@@ -33,31 +33,18 @@
 
 ENABLE_LINK_PREFETCH = ;
 
-ENABLE_ACCELERATED_2D_CANVAS = $(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
+ENABLE_ACCELERATED_2D_CANVAS = ;
 
-ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
-ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
-ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
+ENABLE_WEBGL = ENABLE_WEBGL;
 
-ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
-ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_iphonesimulator = $(ENABLE_3D_RENDERING_iphoneos);
-ENABLE_3D_RENDERING_macosx = $(ENABLE_3D_RENDERING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
+ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
 
 ENABLE_ANIMATION_API = ;
 
 ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
 ENABLE_BLOB_macosx = ENABLE_BLOB;
 
-ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
-ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
 ENABLE_CLIENT_BASED_GEOLOCATION = $(ENABLE_CLIENT_BASED_GEOLOCATION_$(REAL_PLATFORM_NAME));
 ENABLE_CLIENT_BASED_GEOLOCATION_macosx = ENABLE_CLIENT_BASED_GEOLOCATION;
@@ -72,8 +59,6 @@
 
 ENABLE_DATA_TRANSFER_ITEMS = ;
 
-ENABLE_DETAILS = ENABLE_DETAILS;
-
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
 ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
@@ -97,6 +82,7 @@
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
 ENABLE_MATHML = ENABLE_MATHML;
+ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_NOTIFICATIONS = ;
@@ -108,8 +94,7 @@
 
 ENABLE_REGISTER_PROTOCOL_HANDLER = ;
 
-ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
+ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
 
 ENABLE_SVG = ENABLE_SVG;
 ENABLE_SVG_ANIMATION = ENABLE_SVG_ANIMATION;
@@ -130,13 +115,11 @@
 
 ENABLE_WEB_AUDIO = ;
 
-ENABLE_WEB_SOCKETS = $(ENABLE_WEB_SOCKETS_$(REAL_PLATFORM_NAME));
-ENABLE_WEB_SOCKETS_macosx = ENABLE_WEB_SOCKETS;
+ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING = ;
 
-ENABLE_WORKERS = $(ENABLE_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_WORKERS_macosx = ENABLE_WORKERS;
+ENABLE_WORKERS = ENABLE_WORKERS;
 
 ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;

Modified: trunk/Source/WebKit2/ChangeLog (92331 => 92332)


--- trunk/Source/WebKit2/ChangeLog	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebKit2/ChangeLog	2011-08-03 23:50:50 UTC (rev 92332)
@@ -1,3 +1,11 @@
+2011-08-03  Mark Rowe  <mr...@apple.com>
+
+        Clean up FeatureDefines.xcconfig to remove some unnecessary conditional settings
+
+        Reviewed by Dave Kilzer.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-08-03  Caio Marcelo de Oliveira Filho  <caio.olive...@openbossa.org>
 
         [Qt] [WK2] Improve position of context menu for QDesktopWebView

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (92331 => 92332)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2011-08-03 23:43:15 UTC (rev 92331)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2011-08-03 23:50:50 UTC (rev 92332)
@@ -33,31 +33,18 @@
 
 ENABLE_LINK_PREFETCH = ;
 
-ENABLE_ACCELERATED_2D_CANVAS = $(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
+ENABLE_ACCELERATED_2D_CANVAS = ;
 
-ENABLE_WEBGL = $(ENABLE_WEBGL_$(REAL_PLATFORM_NAME));
-ENABLE_WEBGL_macosx = $(ENABLE_WEBGL_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_WEBGL_macosx_1060 = ENABLE_WEBGL;
-ENABLE_WEBGL_macosx_1070 = ENABLE_WEBGL;
+ENABLE_WEBGL = ENABLE_WEBGL;
 
-ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
-ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_iphonesimulator = $(ENABLE_3D_RENDERING_iphoneos);
-ENABLE_3D_RENDERING_macosx = $(ENABLE_3D_RENDERING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
+ENABLE_3D_RENDERING = ENABLE_3D_RENDERING;
 
 ENABLE_ANIMATION_API = ;
 
 ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
 ENABLE_BLOB_macosx = ENABLE_BLOB;
 
-ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
-ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
+ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 
 ENABLE_CLIENT_BASED_GEOLOCATION = $(ENABLE_CLIENT_BASED_GEOLOCATION_$(REAL_PLATFORM_NAME));
 ENABLE_CLIENT_BASED_GEOLOCATION_macosx = ENABLE_CLIENT_BASED_GEOLOCATION;
@@ -72,8 +59,6 @@
 
 ENABLE_DATA_TRANSFER_ITEMS = ;
 
-ENABLE_DETAILS = ENABLE_DETAILS;
-
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
 ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
@@ -97,6 +82,7 @@
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
 ENABLE_MATHML = ENABLE_MATHML;
+ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_METER_TAG = ENABLE_METER_TAG;
 ENABLE_MHTML = ;
 ENABLE_NOTIFICATIONS = ;
@@ -108,8 +94,7 @@
 
 ENABLE_REGISTER_PROTOCOL_HANDLER = ;
 
-ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
+ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
 
 ENABLE_SVG = ENABLE_SVG;
 ENABLE_SVG_ANIMATION = ENABLE_SVG_ANIMATION;
@@ -130,13 +115,11 @@
 
 ENABLE_WEB_AUDIO = ;
 
-ENABLE_WEB_SOCKETS = $(ENABLE_WEB_SOCKETS_$(REAL_PLATFORM_NAME));
-ENABLE_WEB_SOCKETS_macosx = ENABLE_WEB_SOCKETS;
+ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 
 ENABLE_WEB_TIMING = ;
 
-ENABLE_WORKERS = $(ENABLE_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_WORKERS_macosx = ENABLE_WORKERS;
+ENABLE_WORKERS = ENABLE_WORKERS;
 
 ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to