[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 04025e5f9620a7a1a049aa23bebc922ace3fd7f3
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 13 04:22:11 2009 +0000

    2009-10-12  Fumitoshi Ukai  <ukai at chromium.org>
    
            Unreviewed.  Fix 4 layout test failures by webkit r49488
    
            WebKit r49488 enables window.WebSocket back.
    
            * 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@49489 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 49e5aeb..a21bd6a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2009-10-12  Fumitoshi Ukai  <ukai at chromium.org>
 
+        Unreviewed.  Fix 4 layout test failures by webkit r49488
+
+        WebKit r49488 enables window.WebSocket back. 
+
+        * 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-10-12  Fumitoshi Ukai  <ukai at chromium.org>
+
         Reviewed by Sam Weinig.
 
         Add a test to verify WebSocket's EventTarget methods.
diff --git a/LayoutTests/fast/dom/Window/window-properties-expected.txt b/LayoutTests/fast/dom/Window/window-properties-expected.txt
index 94f0bea..3a0b35a 100644
--- a/LayoutTests/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-expected.txt
@@ -1545,7 +1545,16 @@ window.WebKitPoint [object WebKitPointConstructor]
 window.WebKitPoint.prototype [object WebKitPointPrototype]
 window.WebKitTransitionEvent [object WebKitTransitionEventConstructor]
 window.WebKitTransitionEvent.prototype [printed above as window.Event.prototype]
-window.WebSocket [undefined]
+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.addEventListener [function]
+window.WebSocket.prototype.close [function]
+window.WebSocket.prototype.dispatchEvent [function]
+window.WebSocket.prototype.removeEventListener [function]
+window.WebSocket.prototype.send [function]
 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 6466f6b..78d8c4b 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
@@ -291,6 +291,7 @@ 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 5d067aa..0bcd49c 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
@@ -339,6 +339,8 @@ 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 d86d22e..eeb3ade 100644
--- a/LayoutTests/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/fast/js/global-constructors-expected.txt
@@ -164,6 +164,7 @@ 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