[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 ae5dcbecd776ba973937f51cabc125d833f301f5
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 08:57:01 2009 +0000

    2009-09-29  Fumitoshi Ukai  <ukai at chromium.org>
    
            Unreviewed.  Fix 4 layout test failures by webkit r48861.
            http://bugs.webkit.org/show_bug.cgi?id=29840
    
            r48861 introduced experimentalWebSocketsEnabled, and false by default.
            When experimentalWebSocketsEnabled is false, window.WebSocket is
            undefined, instead of a constructor.
    
            * fast/dom/Window/window-properties-expected.txt:
            * fast/dom/prototype-inheritance-2-expected.txt:
            * fast/dom/prototype-inheritance-expected.txt:
            * fast/js/global-constructors-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9f65042..64dbf5d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-29  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Unreviewed.  Fix 4 layout test failures by webkit r48861.
+        http://bugs.webkit.org/show_bug.cgi?id=29840
+
+        r48861 introduced experimentalWebSocketsEnabled, and false by default.
+        When experimentalWebSocketsEnabled is false, window.WebSocket is
+        undefined, instead of a constructor.
+
+        * fast/dom/Window/window-properties-expected.txt:
+        * fast/dom/prototype-inheritance-2-expected.txt:
+        * fast/dom/prototype-inheritance-expected.txt:
+        * fast/js/global-constructors-expected.txt:
+
 2009-09-28  Zan Dobersek  <zandobersek at gmail.com>
 
         Reviewed by David Kilzer.
diff --git a/LayoutTests/fast/dom/Window/window-properties-expected.txt b/LayoutTests/fast/dom/Window/window-properties-expected.txt
index e48650e..c80d5a5 100644
--- a/LayoutTests/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-expected.txt
@@ -1520,13 +1520,7 @@ window.WebKitPoint [object WebKitPointConstructor]
 window.WebKitPoint.prototype [object WebKitPointPrototype]
 window.WebKitTransitionEvent [object WebKitTransitionEventConstructor]
 window.WebKitTransitionEvent.prototype [printed above as window.Event.prototype]
-window.WebSocket [object WebSocketConstructor]
-window.WebSocket.prototype [object WebSocketPrototype]
-window.WebSocket.prototype.CLOSED [number]
-window.WebSocket.prototype.CONNECTING [number]
-window.WebSocket.prototype.OPEN [number]
-window.WebSocket.prototype.close [function]
-window.WebSocket.prototype.send [function]
+window.WebSocket [undefined]
 window.WheelEvent [object WheelEventConstructor]
 window.WheelEvent.prototype [printed above as window.Event.prototype]
 window.Worker [object WorkerConstructor]
diff --git a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
index 78d8c4b..6466f6b 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
@@ -291,7 +291,6 @@ Never found TextMetrics
 Never found WebKitCSSMatrix
 Never found WebKitCSSTransformValue
 Never found WebKitPoint
-Never found WebSocket
 Never found Worker
 Never found XMLHttpRequest
 Never found XMLHttpRequestUpload
diff --git a/LayoutTests/fast/dom/prototype-inheritance-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
index fa5cc2d..bf4b70d 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
@@ -337,8 +337,6 @@ PASS inner.WebKitPoint.isInner is true
 PASS inner.WebKitPoint.constructor.isInner is true
 PASS inner.WebKitTransitionEvent.isInner is true
 PASS inner.WebKitTransitionEvent.constructor.isInner is true
-PASS inner.WebSocket.isInner is true
-PASS inner.WebSocket.constructor.isInner is true
 PASS inner.WheelEvent.isInner is true
 PASS inner.WheelEvent.constructor.isInner is true
 PASS inner.Worker.isInner is true
diff --git a/LayoutTests/fast/js/global-constructors-expected.txt b/LayoutTests/fast/js/global-constructors-expected.txt
index 0d316a2..742325a 100644
--- a/LayoutTests/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/fast/js/global-constructors-expected.txt
@@ -163,7 +163,6 @@ PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
 PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
 PASS WebKitPoint.toString() is '[object WebKitPointConstructor]'
 PASS WebKitTransitionEvent.toString() is '[object WebKitTransitionEventConstructor]'
-PASS WebSocket.toString() is '[object WebSocketConstructor]'
 PASS WheelEvent.toString() is '[object WheelEventConstructor]'
 PASS Worker.toString() is '[object WorkerConstructor]'
 PASS XMLDocument.toString() is '[object DocumentConstructor]'

-- 
WebKit Debian packaging