Changeset 65076 in webkit

Timestamp:

Aug 10, 2010 10:34:07 AM (14 years ago)

Author:

jamesr@google.com

Message:

2010-08-10 James Robinson <​jamesr@chromium.org>

Reviewed by Dimitri Glazkov.

[chromium] Feature defines are out of sync between features.gypi and downstream feature_overrides.gypi
​https://bugs.webkit.org/show_bug.cgi?id=43756

This synchronizes the feature defines to what's currently downstream (at r55468).
The difference between the build.webkit.org bots and the chromium bots has
caused strange compilation failures lately.

• features.gypi:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• features.gypi (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-10  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium] Feature defines are out of sync between features.gypi and downstream feature_overrides.gypi
+        https://bugs.webkit.org/show_bug.cgi?id=43756
+
+        This synchronizes the feature defines to what's currently downstream (at r55468).
+        The difference between the build.webkit.org bots and the chromium bots has
+        caused strange compilation failures lately.
+
+        * features.gypi:
+
 2010-08-10  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebKit/chromium/features.gypi

@@ -39 +39 @@
       # chromium build, overrides this list with its own values. See
       # features_override.gypi inline documentation for more details.
-      'feature_defines%': [
+      'feature_defines': [
         'ENABLE_3D_CANVAS=1',
         'ENABLE_BLOB=1',
+        'ENABLE_BLOB_SLICE=1',
         'ENABLE_CHANNEL_MESSAGING=1',
         'ENABLE_DASHBOARD_SUPPORT=0',
@@ -50 +51 @@
         'ENABLE_DOM_STORAGE=1',
         'ENABLE_EVENTSOURCE=1',
-        'ENABLE_FILE_WRITER=1',
-        'ENABLE_FILE_SYSTEM=1',
+        'ENABLE_FILE_READER=1',
         'ENABLE_FILTERS=1',
         'ENABLE_GEOLOCATION=1',
         'ENABLE_ICONDATABASE=0',
-        'ENABLE_IMAGE_RESIZER=0',
         'ENABLE_INDEXED_DATABASE=1',
         'ENABLE_INPUT_SPEECH=1',
         'ENABLE_JAVASCRIPT_DEBUGGER=1',
         'ENABLE_JSC_MULTIPLE_THREADS=0',
+        'ENABLE_LINK_PREFETCH=1',
         'ENABLE_METER_TAG=1',
         'ENABLE_NOTIFICATIONS=1',
@@ -76 +76 @@
         'ENABLE_SVG_USE=1',
         'ENABLE_TOUCH_EVENTS=1',
+        'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
         'ENABLE_VIDEO=1',
         'ENABLE_WEB_SOCKETS=1',
         'ENABLE_WEB_TIMING=1',
         'ENABLE_WORKERS=1',
-        'ENABLE_XHTMLMP=0',
         'ENABLE_XPATH=1',
         'ENABLE_XSLT=1',
-        'WTF_USE_ACCELERATED_COMPOSITING=0',
       ],
-      
+
+      'conditions': [
+        ['OS=="win" or OS=="linux"', {
+          'feature_defines': [
+           'WTF_USE_ACCELERATED_COMPOSITING=1',
+           'ENABLE_3D_RENDERING=1',
+          ],
+        }],
+      ],
+
       'use_accelerated_compositing%': 0,
       'enable_svg%': 1,