[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hclam at chromium.org
hclam at chromium.org
Wed Dec 22 14:03:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 444dcfe264e911c0ad70526fa9d50a5a7440572e
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 23:17:29 2010 +0000
Build fix. Not reviewed.
Add test expectations for Chromium.
* platform/chromium-linux/fast/blockflow/block-level-images-expected.checksum: Added.
* platform/chromium-linux/fast/blockflow/block-level-images-expected.png: Added.
* platform/chromium-linux/fast/css/rtl-to-viewport-expected.checksum: Added.
* platform/chromium-linux/fast/css/rtl-to-viewport-expected.png: Added.
* platform/chromium-linux/fast/css/rtl-to-viewport-expected.txt: Added.
* platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
* platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt: Added.
* platform/chromium-mac/fast/blockflow/block-level-images-expected.checksum: Added.
* platform/chromium-mac/fast/blockflow/block-level-images-expected.png: Added.
* platform/chromium-mac/fast/css/rtl-to-viewport-expected.checksum: Added.
* platform/chromium-mac/fast/css/rtl-to-viewport-expected.png: Added.
* platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
* platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt: Added.
* platform/chromium-win-xp/fast/blockflow/block-level-images-expected.png: Added.
* platform/chromium-win-xp/fast/css/rtl-to-viewport-expected.png: Added.
* platform/chromium-win/fast/blockflow/block-level-images-expected.checksum: Added.
* platform/chromium-win/fast/blockflow/block-level-images-expected.png: Added.
* platform/chromium-win/fast/css/rtl-to-viewport-expected.checksum: Added.
* platform/chromium-win/fast/css/rtl-to-viewport-expected.png: Added.
* platform/chromium-win/fast/css/rtl-to-viewport-expected.txt: Added.
* platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
* platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt: Added.
* platform/chromium-win/platform/win/plugins/get-value-netscape-window-expected.txt: Added.
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index de37122..ae2b395 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -15,6 +15,37 @@
Add test expectations for Chromium.
+ * platform/chromium-linux/fast/blockflow/block-level-images-expected.checksum: Added.
+ * platform/chromium-linux/fast/blockflow/block-level-images-expected.png: Added.
+ * platform/chromium-linux/fast/css/rtl-to-viewport-expected.checksum: Added.
+ * platform/chromium-linux/fast/css/rtl-to-viewport-expected.png: Added.
+ * platform/chromium-linux/fast/css/rtl-to-viewport-expected.txt: Added.
+ * platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+ * platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt: Added.
+ * platform/chromium-mac/fast/blockflow/block-level-images-expected.checksum: Added.
+ * platform/chromium-mac/fast/blockflow/block-level-images-expected.png: Added.
+ * platform/chromium-mac/fast/css/rtl-to-viewport-expected.checksum: Added.
+ * platform/chromium-mac/fast/css/rtl-to-viewport-expected.png: Added.
+ * platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+ * platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt: Added.
+ * platform/chromium-win-xp/fast/blockflow/block-level-images-expected.png: Added.
+ * platform/chromium-win-xp/fast/css/rtl-to-viewport-expected.png: Added.
+ * platform/chromium-win/fast/blockflow/block-level-images-expected.checksum: Added.
+ * platform/chromium-win/fast/blockflow/block-level-images-expected.png: Added.
+ * platform/chromium-win/fast/css/rtl-to-viewport-expected.checksum: Added.
+ * platform/chromium-win/fast/css/rtl-to-viewport-expected.png: Added.
+ * platform/chromium-win/fast/css/rtl-to-viewport-expected.txt: Added.
+ * platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Copied from LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+ * platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt: Added.
+ * platform/chromium-win/platform/win/plugins/get-value-netscape-window-expected.txt: Added.
+ * platform/chromium/test_expectations.txt:
+
+2010-10-01 Alpha Lam <hclam at chromium.org>
+
+ Build fix. Not reviewed.
+
+ Add test expectations for Chromium.
+
* platform/chromium/test_expectations.txt:
2010-10-01 Adam Roben <aroben at apple.com>
diff --git a/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.checksum b/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.checksum
new file mode 100644
index 0000000..e82475a
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.checksum
@@ -0,0 +1 @@
+e49fdc4a0ad635711867fba7edcae267
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.png b/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.png
new file mode 100644
index 0000000..64c9ac9
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/fast/blockflow/block-level-images-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.checksum b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.checksum
new file mode 100644
index 0000000..0b43c15
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.checksum
@@ -0,0 +1 @@
+98b85d7d1ce16db534ef98535843cb62
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.png b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.png
new file mode 100644
index 0000000..40249c6
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.txt b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.txt
new file mode 100644
index 0000000..64fca44
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/css/rtl-to-viewport-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (696,0) size 104x104
+ RenderBlock {HTML} at (696,0) size 104x104 [border: (2px solid #000000)]
+ RenderBody {BODY} at (10,10) size 84x20
+ RenderText {#text} at (26,0) size 58x19
+ text run at (26,0) width 4 RTL: "."
+ text run at (30,0) width 54: "This is rtl"
diff --git a/LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt
copy to LayoutTests/platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
diff --git a/LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt b/LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt
new file mode 100644
index 0000000..6dc5441
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt
@@ -0,0 +1,22 @@
+CONSOLE MESSAGE: line 0: Invalid url for WebSocket ws://javascript:a/
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket http://127.0.0.1:8000/applet
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket javascript:a
+CONSOLE MESSAGE: line 0: WebSocket port 25 blocked
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#fragment
+Test WebSocket URL parsing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.checksum b/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.checksum
new file mode 100644
index 0000000..36672b6
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.checksum
@@ -0,0 +1 @@
+ff58ea57898f30b2e39e4b2f9489147a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.png b/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.png
new file mode 100644
index 0000000..e828e31
Binary files /dev/null and b/LayoutTests/platform/chromium-mac/fast/blockflow/block-level-images-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.checksum b/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.checksum
new file mode 100644
index 0000000..fcea0e1
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.checksum
@@ -0,0 +1 @@
+264e4a120d7f6adf4388bcba60c13356
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.png b/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.png
new file mode 100644
index 0000000..547516a
Binary files /dev/null and b/LayoutTests/platform/chromium-mac/fast/css/rtl-to-viewport-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium-linux/websocket/tests/bad-sub-protocol-control-chars-expected.txt
copy to LayoutTests/platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
diff --git a/LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt
new file mode 100644
index 0000000..6dc5441
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt
@@ -0,0 +1,22 @@
+CONSOLE MESSAGE: line 0: Invalid url for WebSocket ws://javascript:a/
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket http://127.0.0.1:8000/applet
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket javascript:a
+CONSOLE MESSAGE: line 0: WebSocket port 25 blocked
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#fragment
+Test WebSocket URL parsing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/LayoutTests/platform/chromium-win-xp/fast/blockflow/block-level-images-expected.png b/LayoutTests/platform/chromium-win-xp/fast/blockflow/block-level-images-expected.png
new file mode 100644
index 0000000..1667636
Binary files /dev/null and b/LayoutTests/platform/chromium-win-xp/fast/blockflow/block-level-images-expected.png differ
diff --git a/LayoutTests/platform/chromium-win-xp/fast/css/rtl-to-viewport-expected.png b/LayoutTests/platform/chromium-win-xp/fast/css/rtl-to-viewport-expected.png
new file mode 100644
index 0000000..9db776b
Binary files /dev/null and b/LayoutTests/platform/chromium-win-xp/fast/css/rtl-to-viewport-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.checksum b/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.checksum
new file mode 100644
index 0000000..32b5126
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.checksum
@@ -0,0 +1 @@
+52c04f03cd17961a85117e49720a96cf
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.png b/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.png
new file mode 100644
index 0000000..1667636
Binary files /dev/null and b/LayoutTests/platform/chromium-win/fast/blockflow/block-level-images-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.checksum
new file mode 100644
index 0000000..6e6e64e
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.checksum
@@ -0,0 +1 @@
+c7da080744074483b5746e175c83f353
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.png b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.png
new file mode 100644
index 0000000..9db776b
Binary files /dev/null and b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.txt b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.txt
new file mode 100644
index 0000000..c6426df
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/css/rtl-to-viewport-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (696,0) size 104x104
+ RenderBlock {HTML} at (696,0) size 104x104 [border: (2px solid #000000)]
+ RenderBody {BODY} at (10,10) size 84x20
+ RenderText {#text} at (26,0) size 58x19
+ text run at (26,0) width 4 RTL: "."
+ text run at (30,0) width 54: "This is rtl"
diff --git a/LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium-win/websocket/tests/bad-sub-protocol-control-chars-expected.txt
copy to LayoutTests/platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
diff --git a/LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt b/LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt
new file mode 100644
index 0000000..2a576cb
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt
@@ -0,0 +1,22 @@
+CONSOLE MESSAGE: line 0: Invalid url for WebSocket ws://javascript:a/
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket http://127.0.0.1:8000/applet
+CONSOLE MESSAGE: line 0: Wrong url scheme for WebSocket javascript:a
+CONSOLE MESSAGE: line 0: WebSocket port 25 blocked
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#
+CONSOLE MESSAGE: line 0: URL has fragment component ws://127.0.0.1/path#fragment
+Test WebSocket URL parsing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/LayoutTests/platform/chromium-win/platform/win/plugins/get-value-netscape-window-expected.txt b/LayoutTests/platform/chromium-win/platform/win/plugins/get-value-netscape-window-expected.txt
new file mode 100644
index 0000000..66e0b5d
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/platform/win/plugins/get-value-netscape-window-expected.txt
@@ -0,0 +1 @@
+This tests that the browser supports NPN_GetValue(NPNVnetscapeWindow).
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7ff2e6f..0599deb 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3160,8 +3160,5 @@ BUGWK46951 : fast/url/segments.html = TEXT
// New failure introduced in 68896.
BUGWK44406 : http/tests/appcache/foreign-fallback.html = TEXT
-// These tests need rebaseline. Will do that after Chromium Canary Bots are back running.
-BUG_HCLAM WIN LINUX : fast/css/rtl-to-viewport.html = IMAGE+TEXT
-BUG_HCLAM : fast/blockflow/block-level-images.html = IMAGE
-BUG_HCLAM : http/tests/websocket/tests/url-parsing.html = TEXT
-BUG_HCLAM : http/tests/websocket/tests/bad-sub-protocol-control-chars.html = TEXT
+// This test starts to timeout during build bots were down between 68880:68920
+BUG_HCLAM WIN : fast/css/acid2-pixel.html = TIMEOUT PASS
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list