[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:23:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c40cb76ed47b1fe23ae06e30a2cbf76eb767fa96
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 26 22:42:01 2004 +0000
Namespace tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/css/namespaces/001-expected.txt b/LayoutTests/fast/css/namespaces/001-expected.txt
new file mode 100644
index 0000000..ea5cc93
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/001-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x34
+ RenderBlock {HTML} at (0,0) size 800x34
+ RenderBody {BODY} at (8,8) size 784x18 [color=#FF0000]
+ RenderInline {COMMENT} at (0,0) size 136x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/css/namespaces/001.xml b/LayoutTests/fast/css/namespaces/001.xml
new file mode 100644
index 0000000..b4127a6
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/001.xml
@@ -0,0 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS: 1 simple test of namespaces (attributes)</title>
+ <style type="text/css">
+ @namespace html url(http://www.w3.org/1999/xhtml);
+ @namespace test url(http://www.example.org/);
+ html|body { color: red; }
+ [test] { color: green; }
+ </style>
+ </head>
+ <body>
+ <test test="test" xmlns="http://www.example.org/">
+ This should be green.
+ </test>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/namespaces/002-expected.txt b/LayoutTests/fast/css/namespaces/002-expected.txt
new file mode 100644
index 0000000..ea5cc93
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/002-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x34
+ RenderBlock {HTML} at (0,0) size 800x34
+ RenderBody {BODY} at (8,8) size 784x18 [color=#FF0000]
+ RenderInline {COMMENT} at (0,0) size 136x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/css/namespaces/002.xml b/LayoutTests/fast/css/namespaces/002.xml
new file mode 100644
index 0000000..fc0a118
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/002.xml
@@ -0,0 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS: 1 other simple test of namespaces (elements)</title>
+ <style type="text/css">
+ @namespace html url(http://www.w3.org/1999/xhtml);
+ @namespace test url(http://www.example.org/);
+ html|body { color: red; }
+ test { color: green; }
+ </style>
+ </head>
+ <body>
+ <test test="test" xmlns="http://www.example.org/">
+ This should be green.
+ </test>
+ </body>
+</html>
diff --git a/LayoutTests/fast/overflow/003-expected.txt b/LayoutTests/fast/css/namespaces/003-expected.txt
similarity index 100%
copy from LayoutTests/fast/overflow/003-expected.txt
copy to LayoutTests/fast/css/namespaces/003-expected.txt
diff --git a/LayoutTests/fast/css/namespaces/003.xml b/LayoutTests/fast/css/namespaces/003.xml
new file mode 100644
index 0000000..ec55efc
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/003.xml
@@ -0,0 +1,4 @@
+<?xml-stylesheet href="resources/003.css"?>
+<test xmlns="http://www.example.org/b">
+ This should be green.
+</test>
diff --git a/LayoutTests/fast/css/namespaces/004-expected.txt b/LayoutTests/fast/css/namespaces/004-expected.txt
new file mode 100644
index 0000000..8d0327c
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/004-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x106
+ RenderBlock {HTML} at (0,0) size 800x106 [color=#FF0000]
+ RenderBody {BODY} at (8,8) size 784x90
+ RenderBlock {COMMENT} at (0,0) size 784x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {COMMENT} at (0,18) size 784x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {COMMENT} at (0,36) size 784x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {/A} at (0,54) size 784x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {/ABBR} at (0,72) size 784x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/fast/css/namespaces/004.xml b/LayoutTests/fast/css/namespaces/004.xml
new file mode 100644
index 0000000..3132719
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/004.xml
@@ -0,0 +1,34 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS: @namespace blocks across embedded stylesheets (part 1, positive tests)</title>
+ <style type="text/css">
+ @namespace a url(http://www.example.org/2);
+ @namespace b url(http://www.example.org/1);
+ test3 { color: green; } /* no default namespace, so this matches *:test3 */
+ </style>
+ <style type="text/css">
+ /* namespace declarations are reversed */
+ @namespace a url(http://www.example.org/2);
+ @namespace b url(http://www.example.org/1);
+ a|test2 { color: green; } /* matches 2:test2 */
+ </style>
+ <style type="text/css">
+ /* set a default namespace declaration */
+ @namespace url(http://www.example.org/1);
+ test1 { color: green; } /* matches 1:test1 */
+ </style>
+ <style type="text/css">
+ /* set the default to be red */
+ *|* { color: red; }
+ *|body *|* { display: block; }
+ </style>
+ </head>
+ <body>
+ <test3 xmlns="http://www.example.org/1"> This should be green. </test3>
+ <test3 xmlns="http://www.example.org/2"> This should be green. </test3>
+ <test3 xmlns="http://www.example.org/3"> This should be green. </test3>
+ <test2 xmlns="http://www.example.org/2"> This should be green. </test2>
+ <test1 xmlns="http://www.example.org/1"> This should be green. </test1>
+ <!-- tests 1:2, 1:3, 2:1 and 2:3 are checked in 005.xml -->
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/namespaces/005-expected.txt b/LayoutTests/fast/css/namespaces/005-expected.txt
new file mode 100644
index 0000000..2fc4296
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/005-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x88
+ RenderBlock {HTML} at (0,0) size 800x88 [color=#008000]
+ RenderBody {BODY} at (8,8) size 784x72
+ RenderBlock {/A} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {/A} at (0,18) size 784x18
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {/ABBR} at (0,36) size 784x18
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
+ RenderBlock {/ABBR} at (0,54) size 784x18
+ RenderText {TEXT} at (0,0) size 136x18
+ text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/fast/css/namespaces/005.xml b/LayoutTests/fast/css/namespaces/005.xml
new file mode 100644
index 0000000..31ce5dc
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/005.xml
@@ -0,0 +1,35 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS: @namespace blocks across embedded stylesheets (part 2, negative tests)</title>
+ <style type="text/css">
+ @namespace a url(http://www.example.org/2);
+ @namespace b url(http://www.example.org/1);
+ test3 { color: red; } /* this matches nothing */
+ </style>
+ <style type="text/css">
+ /* namespace declarations are reversed */
+ @namespace a url(http://www.example.org/2);
+ @namespace b url(http://www.example.org/1);
+ a|test2 { color: red; } /* matches nothing either */
+ </style>
+ <style type="text/css">
+ /* set a default namespace declaration */
+ @namespace url(http://www.example.org/1);
+ test1 { color: red; } /* still matches nothing */
+ </style>
+ <style type="text/css">
+ /* set the default to be red */
+ *|* { color:green; }
+ *|body *|* { display: block; }
+ </style>
+ </head>
+ <body>
+ <!-- tests *:3 are checked in 004.xml -->
+ <test2 xmlns="http://www.example.org/1"> This should be green. </test2>
+ <!-- test 2:2 is checked in 004.xml -->
+ <test2 xmlns="http://www.example.org/3"> This should be green. </test2>
+ <!-- test 1:1 is checked in 004.xml -->
+ <test1 xmlns="http://www.example.org/2"> This should be green. </test1>
+ <test1 xmlns="http://www.example.org/3"> This should be green. </test1>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/namespaces/006-expected.txt b/LayoutTests/fast/css/namespaces/006-expected.txt
new file mode 100644
index 0000000..7e2267b
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/006-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x34
+ RenderBlock {HTML} at (0,0) size 800x34
+ RenderBody {BODY} at (8,8) size 784x18 [color=#008000]
+ RenderInline {/A} at (0,0) size 540x18
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {/ABBR} at (0,0) size 82x18
+ RenderText {TEXT} at (0,0) size 82x18
+ text run at (0,0) width 82: "None of this "
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {COMMENT} at (0,0) size 92x18
+ RenderText {TEXT} at (82,0) size 92x18
+ text run at (82,0) width 92: "text should be "
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {/ACRONYM} at (0,0) size 118x18
+ RenderText {TEXT} at (174,0) size 118x18
+ text run at (174,0) width 118: "matching the style "
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 95x18
+ RenderText {TEXT} at (292,0) size 95x18
+ text run at (292,0) width 95: "rules, and thus "
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {/ADDRESS} at (0,0) size 64x18
+ RenderText {TEXT} at (387,0) size 64x18
+ text run at (387,0) width 64: "none of it "
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 89x18
+ RenderText {TEXT} at (451,0) size 89x18
+ text run at (451,0) width 89: "should be red."
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/css/namespaces/006.xml b/LayoutTests/fast/css/namespaces/006.xml
new file mode 100644
index 0000000..15893ac
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/006.xml
@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS: @namespace and default namespaces</title>
+ <style type="text/css">
+ @namespace url(http://www.example.org/);
+ :first-child { color: red; }
+ element { color: red; }
+ [attribute] { color: red; }
+ #id { color: red; }
+ * { color: red; }
+ .class { color: red; }
+ </style>
+ </head>
+ <body style="color: green"> <!-- I needed a way that would not interfere with the @namespace rule at all -->
+ <tests xmlns="http://www.example.com/not-the-default">
+ <first-child> None of this </first-child>
+ <element> text should be </element>
+ <attribute attribute="attribute"> matching the style </attribute>
+ <span id="id" xmlns="http://www.w3.org/1999/xhtml"> rules, and thus </span>
+ <universal> none of it </universal>
+ <span class="class" xmlns="http://www.w3.org/1999/xhtml"> should be red. </span>
+ </tests>
+ </body>
+</html>
diff --git a/LayoutTests/fast/overflow/003-expected.txt b/LayoutTests/fast/css/namespaces/007-expected.txt
similarity index 100%
copy from LayoutTests/fast/overflow/003-expected.txt
copy to LayoutTests/fast/css/namespaces/007-expected.txt
diff --git a/LayoutTests/fast/css/namespaces/007.xml b/LayoutTests/fast/css/namespaces/007.xml
new file mode 100644
index 0000000..eb894ee
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/007.xml
@@ -0,0 +1,4 @@
+<?xml-stylesheet href="resources/007.css"?>
+<test xmlns="http://www.example.org/b">
+ This should be green.
+</test>
diff --git a/LayoutTests/fast/css/namespaces/resources/003.css b/LayoutTests/fast/css/namespaces/resources/003.css
new file mode 100644
index 0000000..7445e68
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/resources/003.css
@@ -0,0 +1,4 @@
+ @namespace a url(http://www.example.org/a); /* bogus namespace */
+ @namespace b url(http://www.example.org/b); /* namespace in document */
+ b|test { color: red; } /* should match the test element */
+ test { color: green; } /* should match *|test and thus the test element */
diff --git a/LayoutTests/fast/css/namespaces/resources/007.css b/LayoutTests/fast/css/namespaces/resources/007.css
new file mode 100644
index 0000000..787b3fa
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/resources/007.css
@@ -0,0 +1,4 @@
+ @namespace a url(http://www.example.org/a); /* bogus namespace */
+ @namespace b url(http://www.example.org/b); /* namespace in document */
+ b|test { color: green; } /* should match the test element */
+ a|test { color: red; } /* should not match */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list