[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hyatt at apple.com
hyatt at apple.com
Thu Apr 8 00:08:28 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 5ccf9a12a94a12d048b30f90240451bdc1caa1d3
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 1 18:55:09 2009 +0000
@namespace directives need to use "maybe_space" in the "maybe_ns_prefix" portion of the grammar to match
the spec. Not doing so prevent comments from being used immmediately after the namespace prefix.
Reviewed by David Kilzer.
Added fast/css/namespaces-comments.xml
* css/CSSGrammar.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51549 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/css/namespaces/namespaces-comments.xml b/LayoutTests/fast/css/namespaces/namespaces-comments.xml
new file mode 100644
index 0000000..0985e89
--- /dev/null
+++ b/LayoutTests/fast/css/namespaces/namespaces-comments.xml
@@ -0,0 +1,30 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
+ <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+ <title>CSS Namespaces Test Suite: whitespace and comment handling</title>
+ <style>
+ test { background:red }
+ </style>
+ <style>
+ @namespace/* test */
+ a
+ url(
+test-a );
+
+ @namespace/**/b/**/url( 'test-b'
+);
+
+ @namespace c url("test-c"
+);
+
+ a|test, b|test, c|test { background:lime }
+ </style>
+ </head>
+ <body>
+ <p><test xmlns="test-a">This sentence should have a green background.</test></p>
+ <p><test xmlns="test-b">This sentence should have a green background.</test></p>
+ <p><test xmlns="test-c">This sentence should have a green background.</test></p>
+ </body>
+</html>
diff --git a/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.checksum b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.checksum
new file mode 100644
index 0000000..3556b17
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.checksum
@@ -0,0 +1 @@
+26451729dfd9c022b825cba344c46b1f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.png b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.png
new file mode 100644
index 0000000..532dcaf
Binary files /dev/null and b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.txt b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.txt
new file mode 100644
index 0000000..2d782fb
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css/namespaces/namespaces-comments-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x118
+ RenderBlock {html} at (0,0) size 800x118
+ RenderBody {body} at (8,16) size 784x86
+ RenderBlock {p} at (0,0) size 784x18
+ RenderInline {test} at (0,0) size 299x18 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 299x18
+ text run at (0,0) width 299: "This sentence should have a green background."
+ RenderBlock {p} at (0,34) size 784x18
+ RenderInline {test} at (0,0) size 299x18 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 299x18
+ text run at (0,0) width 299: "This sentence should have a green background."
+ RenderBlock {p} at (0,68) size 784x18
+ RenderInline {test} at (0,0) size 299x18 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 299x18
+ text run at (0,0) width 299: "This sentence should have a green background."
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0afcc93..be6ac77 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-01 Dave Hyatt <hyatt at apple.com>
+
+ Reviewed by David Kilzer.
+
+ @namespace directives need to use "maybe_space" in the "maybe_ns_prefix" portion of the grammar to match
+ the spec. Not doing so prevent comments from being used immmediately after the namespace prefix.
+
+ Added fast/css/namespaces-comments.xml
+
+ * css/CSSGrammar.y:
+
2009-12-01 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index 0530e91..7c5f630 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -580,7 +580,7 @@ NAMESPACE_SYM maybe_space maybe_ns_prefix string_or_uri maybe_space ';' {
maybe_ns_prefix:
/* empty */ { $$.characters = 0; }
-| IDENT WHITESPACE { $$ = $1; }
+| IDENT maybe_space { $$ = $1; }
;
string_or_uri:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list