[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 24dba6b9560545d38592a1d1ee54be6b37972a21
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 28 23:34:40 2009 +0000

    2009-12-28  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Rubber-stamped by Xan Lopez.
    
            Follow Apple's decision to disable HTML DataGrid by default.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8ba3105..f3bcb9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-28  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Rubber-stamped by Xan Lopez.
+
+        Follow Apple's decision to disable HTML DataGrid by default.
+
+        * GNUmakefile.am:
+
 2009-12-28  Gustavo Noronha Silva  <gns at gnome.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index a290c40..c6c97b7 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2111,12 +2111,12 @@ webcoregtk_sources += \
 endif # END USE_PANGO
 
 # ----
-# HTML Data Grid - enable always.
+# HTML Data Grid - disable for now.
 # ----
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=0
 
 webcore_cppflags += \
-	-DENABLE_DATAGRID=1
+	-DENABLE_DATAGRID=0
 
 # ----
 # JavaScript Debugger/Profiler

-- 
WebKit Debian packaging