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

[ukai at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit c8b3f8b086bc3b60baf053fef822b40dab205bfc
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 02:52:24 2009 +0000

    2009-10-04  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Eric Seidel
    
            Enable Web Sockets in chromium build.
            https://bugs.webkit.org/show_bug.cgi?id=29917
    
            * WebCore.gyp/WebCore.gyp:
    
    2009-10-04  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Eric Seidel
    
            Enable Web Sockets in chromium build.
            https://bugs.webkit.org/show_bug.cgi?id=29917
    
            * chromium/features.gypi:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fcb3c09..00ed2f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-04  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Eric Seidel
+
+        Enable Web Sockets in chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=29917
+
+        * WebCore.gyp/WebCore.gyp:
+
 2009-10-04  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustova Noronha.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index db7a2dc..4a0c540 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -103,6 +103,7 @@
       '../svg',
       '../svg/animation',
       '../svg/graphics',
+      '../websockets',
       '../workers',
       '../xml',
     ],
@@ -339,6 +340,7 @@
               '--include', '../page',
               '--include', '../plugins',
               '--include', '../svg',
+              '--include', '../websockets',
               '--include', '../workers',
               '--include', '../xml',
             ],
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cfc2e8a..785e178 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-04  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Eric Seidel
+
+        Enable Web Sockets in chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=29917
+
+        * chromium/features.gypi:
+
 2009-10-02  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index a559680..f91598c 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -61,6 +61,7 @@
         'ENABLE_SVG_FOREIGN_OBJECT=1',
         'ENABLE_SVG_FONTS=1',
         'ENABLE_VIDEO=1',
+	'ENABLE_WEB_SOCKETS=1',
         'ENABLE_WORKERS=1',
       ],
     },

-- 
WebKit Debian packaging