[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 11:46:08 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit d08c32f5ce7b12471d42af33d0f31fd8e893078c
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 08:15:13 2010 +0000

    2010-08-06  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: Chromium test expectations rebaseline.
    
            * platform/chromium-linux/fast/text/stripNullFromText-expected.checksum:
            * platform/chromium-linux/fast/text/stripNullFromText-expected.png: Added.
            * platform/chromium-linux/fast/text/stripNullFromText-expected.txt:
            * platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Added.
            * platform/chromium-mac/fast/text/stripNullFromText-expected.checksum:
            * platform/chromium-mac/fast/text/stripNullFromText-expected.png:
            * platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt:
            * platform/chromium-win/fast/text/stripNullFromText-expected.checksum:
            * platform/chromium-win/fast/text/stripNullFromText-expected.png:
            * platform/chromium-win/fast/text/stripNullFromText-expected.txt:
            * platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64821 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3e0a365..ea2c4af 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-06  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: Chromium test expectations rebaseline.
+
+        * platform/chromium-linux/fast/text/stripNullFromText-expected.checksum:
+        * platform/chromium-linux/fast/text/stripNullFromText-expected.png: Added.
+        * platform/chromium-linux/fast/text/stripNullFromText-expected.txt:
+        * platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Added.
+        * platform/chromium-mac/fast/text/stripNullFromText-expected.checksum:
+        * platform/chromium-mac/fast/text/stripNullFromText-expected.png:
+        * platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt:
+        * platform/chromium-win/fast/text/stripNullFromText-expected.checksum:
+        * platform/chromium-win/fast/text/stripNullFromText-expected.png:
+        * platform/chromium-win/fast/text/stripNullFromText-expected.txt:
+        * platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt:
+
 2010-08-05  Alexey Proskuryakov  <ap at apple.com>
 
         Fix http/tests/webarchive/test-css-url-encoding-shift-jis.html
diff --git a/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.checksum b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.checksum
index 6019abe..89d29aa 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.checksum
@@ -1 +1 @@
-64482f17130470ad1648dc4fabb5b8fc
\ No newline at end of file
+d47b4d376b82929a1e35dc48ff123e27
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.png b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.png
new file mode 100644
index 0000000..39465c3
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.txt b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.txt
index 8e871f8..51694f6 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.txt
+++ b/LayoutTests/platform/chromium-linux/fast/text/stripNullFromText-expected.txt
@@ -3,6 +3,4 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x22 [border: (1px solid #FF0000)]
-        RenderText {#text} at (1,1) size 16x19
-          text run at (1,1) width 16: "\x{FFFD}"
+      RenderBlock {DIV} at (0,0) size 784x2 [border: (1px solid #FF0000)]
diff --git a/LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt
new file mode 100644
index 0000000..8035f44
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -0,0 +1,17 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
+Test WebSocket bad sub-protocol names by control characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "\0") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "	") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.checksum b/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.checksum
index 7453bdd..89d29aa 100644
--- a/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.checksum
+++ b/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.checksum
@@ -1 +1 @@
-04a04b8f6a60e4b90026717bdeba0bd5
\ No newline at end of file
+d47b4d376b82929a1e35dc48ff123e27
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.png b/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.png
index 8001ddf..820eddf 100644
Binary files a/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.png and b/LayoutTests/platform/chromium-mac/fast/text/stripNullFromText-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt
index 2280bde..8035f44 100644
--- a/LayoutTests/platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt
+++ b/LayoutTests/platform/chromium-mac/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -5,7 +5,7 @@ Test WebSocket bad sub-protocol names by control characters.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "�") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "\0") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1:8880/simple", "	") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1:8880/simple", "
 ") threw exception SyntaxError: Unexpected token ILLEGAL.
diff --git a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.checksum b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.checksum
index 9ac3aad..89d29aa 100644
--- a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.checksum
@@ -1 +1 @@
-541771235931f9f5eb937466014d721c
\ No newline at end of file
+d47b4d376b82929a1e35dc48ff123e27
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.png b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.png
index 2d448d3..39465c3 100644
Binary files a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.png and b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.txt b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.txt
index dd34564..828bc4d 100644
--- a/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/text/stripNullFromText-expected.txt
@@ -3,6 +3,4 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x22 [border: (1px solid #FF0000)]
-        RenderText {#text} at (1,1) size 12x19
-          text run at (1,1) width 12: "\x{FFFD}"
+      RenderBlock {DIV} at (0,0) size 784x2 [border: (1px solid #FF0000)]
diff --git a/LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt
index 2280bde..cf5b986 100644
--- a/LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt
+++ b/LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -1,17 +1,17 @@
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
-Test WebSocket bad sub-protocol names by control characters.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "�") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "	") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "
-") threw exception SyntaxError: Unexpected token ILLEGAL.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "
-") threw exception SyntaxError: Unexpected token ILLEGAL.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS successfullyParsed is true
-
-TEST COMPLETE
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
+Test WebSocket bad sub-protocol names by control characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "\0") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "	") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list