[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit e26c53a2e54b50adef3260999b46b883ca64cf04
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 17:34:07 2010 +0000

    2010-08-10  James Robinson  <jamesr at 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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1486694..93d461e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-10  James Robinson  <jamesr at 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 at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index 9b758f9..75a1577 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -38,9 +38,10 @@
       # WARNING: build/features_override.gypi which is included in a full
       # 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',
         'ENABLE_DATABASE=1',
@@ -49,16 +50,15 @@
         'ENABLE_DIRECTORY_UPLOAD=1',
         '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',
         'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
@@ -75,16 +75,24 @@
         'ENABLE_SVG_FOREIGN_OBJECT=1',
         '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,
     },

-- 
WebKit Debian packaging