[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 34cd2f3130f967614f1572f0e854004ba92f55eb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 1 22:21:34 2009 +0000

    2009-10-01  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Make it possible to override the list of feature defines when building
            downstream.
    
            https://bugs.webkit.org/show_bug.cgi?id=29979
    
            * chromium/features.gypi:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 012ca4a..1c991b2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Dimitri Glazkov.
 
+        Make it possible to override the list of feature defines when building
+        downstream.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29979
+
+        * chromium/features.gypi:
+
+2009-10-01  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
         Added windows-specific dependencies, updated some revisions and
         re-organized file to make revision tracking easier. Also removed
         extensions/v8 dependency that is no longer needed upstream.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index adcb527..a559680 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -29,32 +29,41 @@
 #
 
 {
-  # The following defines turn webkit features on or off. 
+  # The following defines turn webkit features on and off.
   'variables': {
-    'feature_defines': [
-      'ENABLE_3D_CANVAS=0',
-      'ENABLE_CHANNEL_MESSAGING=1',
-      'ENABLE_DATABASE=1',
-      'ENABLE_DATAGRID=0',
-      'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
-      'ENABLE_DASHBOARD_SUPPORT=0',
-      'ENABLE_DOM_STORAGE=1',
-      'ENABLE_JAVASCRIPT_DEBUGGER=0',
-      'ENABLE_JSC_MULTIPLE_THREADS=0',
-      'ENABLE_ICONDATABASE=0',
-      'ENABLE_NOTIFICATIONS=0',
-      'ENABLE_ORIENTATION_EVENTS=0',
-      'ENABLE_XSLT=1',
-      'ENABLE_XPATH=1',
-      'ENABLE_SHARED_WORKERS=0',
-      'ENABLE_SVG=1',
-      'ENABLE_SVG_ANIMATION=1',
-      'ENABLE_SVG_AS_IMAGE=1',
-      'ENABLE_SVG_USE=1',
-      'ENABLE_SVG_FOREIGN_OBJECT=1',
-      'ENABLE_SVG_FONTS=1',
-      'ENABLE_VIDEO=1',
-      'ENABLE_WORKERS=1',
-    ],
+    'variables': {
+      # We have to nest variables inside variables as a hack for variables
+      # override.
+
+      # 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%': [
+        'ENABLE_3D_CANVAS=0',
+        'ENABLE_CHANNEL_MESSAGING=1',
+        'ENABLE_DATABASE=1',
+        'ENABLE_DATAGRID=0',
+        'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
+        'ENABLE_DASHBOARD_SUPPORT=0',
+        'ENABLE_DOM_STORAGE=1',
+        'ENABLE_JAVASCRIPT_DEBUGGER=0',
+        'ENABLE_JSC_MULTIPLE_THREADS=0',
+        'ENABLE_ICONDATABASE=0',
+        'ENABLE_NOTIFICATIONS=0',
+        'ENABLE_ORIENTATION_EVENTS=0',
+        'ENABLE_XSLT=1',
+        'ENABLE_XPATH=1',
+        'ENABLE_SHARED_WORKERS=0',
+        'ENABLE_SVG=1',
+        'ENABLE_SVG_ANIMATION=1',
+        'ENABLE_SVG_AS_IMAGE=1',
+        'ENABLE_SVG_USE=1',
+        'ENABLE_SVG_FOREIGN_OBJECT=1',
+        'ENABLE_SVG_FONTS=1',
+        'ENABLE_VIDEO=1',
+        'ENABLE_WORKERS=1',
+      ],
+    },
+    'feature_defines%': '<(feature_defines)',
   },
 }

-- 
WebKit Debian packaging