[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:57:40 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d346c09818d13a86af227abc5f71a351a8f1cfe4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 7 20:58:14 2010 +0000
2010-01-07 Yuzo Fujishima <yuzo at google.com>
Reviewed by Darin Adler.
Allow leading/trailing space for CSS nth-*() and lang().
https://bugs.webkit.org/show_bug.cgi?id=17248
For pseudo-classes :nth-*() and :lang(), space must be allowed after '(' and before ')'.
See the bug comments for why we don't allow space at other places.
* fast/css/css3-space-in-nth-and-lang.html: Added.
* platform/mac/fast/css/css3-space-in-nth-and-lang-expected.txt: Added.
2010-01-07 Yuzo Fujishima <yuzo at google.com>
Reviewed by Darin Adler.
Allow leading/trailing space for CSS nth-*() and lang().
https://bugs.webkit.org/show_bug.cgi?id=17248
For pseudo-classes :nth-*() and :lang(), space must be allowed after '(' and before ')'.
See the bug comments for why we don't allow space at other places.
* css/CSSGrammar.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dd5b7b8..855b577 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07 Yuzo Fujishima <yuzo at google.com>
+
+ Reviewed by Darin Adler.
+
+ Allow leading/trailing space for CSS nth-*() and lang().
+ https://bugs.webkit.org/show_bug.cgi?id=17248
+
+ For pseudo-classes :nth-*() and :lang(), space must be allowed after '(' and before ')'.
+ See the bug comments for why we don't allow space at other places.
+
+ * fast/css/css3-space-in-nth-and-lang.html: Added.
+ * platform/mac/fast/css/css3-space-in-nth-and-lang-expected.txt: Added.
+
2010-01-07 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/LayoutTests/fast/css/css3-space-in-nth-and-lang.html b/LayoutTests/fast/css/css3-space-in-nth-and-lang.html
new file mode 100644
index 0000000..130e072
--- /dev/null
+++ b/LayoutTests/fast/css/css3-space-in-nth-and-lang.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+ <title>Leading/trailing space in :nth-* and :lang pseudo-classes</title>
+ <style type="text/css">
+ /* Integer */
+ div:nth-child( 1 ) { background-color: yellow; }
+
+ /* Identifier */
+ div:nth-child( odd ) { color: green; }
+ div:lang( en-GB ) { background-color: silver; }
+
+ /* an+b */
+ div:nth-child( 2n ) { color: blue; }
+ </style>
+</head>
+
+<body>
+ <div>Green on Yellow</div>
+ <div lang="en-GB">Blue on Silver</div>
+ <div>Green</div>
+ <div>Blue</div>
+ <div>Green</div>
+ <div>Blue</div>
+</body>
+</html>
+
diff --git a/LayoutTests/platform/mac/fast/css/css3-space-in-nth-and-lang-expected.txt b/LayoutTests/platform/mac/fast/css/css3-space-in-nth-and-lang-expected.txt
new file mode 100644
index 0000000..3e1a101
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css/css3-space-in-nth-and-lang-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+ RenderView 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 784x18 [color=#008000] [bgcolor=#FFFF00]
+ RenderText {#text} at (0,0) size 110x18
+ text run at (0,0) width 110: "Green on Yellow"
+ RenderBlock {DIV} at (0,18) size 784x18 [color=#0000FF] [bgcolor=#C0C0C0]
+ RenderText {#text} at (0,0) size 91x18
+ text run at (0,0) width 91: "Blue on Silver"
+ RenderBlock {DIV} at (0,36) size 784x18 [color=#008000]
+ RenderText {#text} at (0,0) size 39x18
+ text run at (0,0) width 39: "Green"
+ RenderBlock {DIV} at (0,54) size 784x18 [color=#0000FF]
+ RenderText {#text} at (0,0) size 30x18
+ text run at (0,0) width 30: "Blue"
+ RenderBlock {DIV} at (0,72) size 784x18 [color=#008000]
+ RenderText {#text} at (0,0) size 39x18
+ text run at (0,0) width 39: "Green"
+ RenderBlock {DIV} at (0,90) size 784x18 [color=#0000FF]
+ RenderText {#text} at (0,0) size 30x18
+ text run at (0,0) width 30: "Blue"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b2952f..2f2da26 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-07 Yuzo Fujishima <yuzo at google.com>
+
+ Reviewed by Darin Adler.
+
+ Allow leading/trailing space for CSS nth-*() and lang().
+ https://bugs.webkit.org/show_bug.cgi?id=17248
+
+ For pseudo-classes :nth-*() and :lang(), space must be allowed after '(' and before ')'.
+ See the bug comments for why we don't allow space at other places.
+
+ * css/CSSGrammar.y:
+
2010-01-07 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index cf87105..ed26935 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -1109,11 +1109,11 @@ pseudo:
}
}
// used by :nth-*(ax+b)
- | ':' FUNCTION NTH ')' {
+ | ':' FUNCTION maybe_space NTH maybe_space ')' {
CSSParser *p = static_cast<CSSParser*>(parser);
$$ = p->createFloatingSelector();
$$->m_match = CSSSelector::PseudoClass;
- $$->setArgument($3);
+ $$->setArgument($4);
$$->m_value = $2;
CSSSelector::PseudoType type = $$->pseudoType();
if (type == CSSSelector::PseudoUnknown)
@@ -1127,11 +1127,11 @@ pseudo:
}
}
// used by :nth-*
- | ':' FUNCTION INTEGER ')' {
+ | ':' FUNCTION maybe_space INTEGER maybe_space ')' {
CSSParser *p = static_cast<CSSParser*>(parser);
$$ = p->createFloatingSelector();
$$->m_match = CSSSelector::PseudoClass;
- $$->setArgument(String::number($3));
+ $$->setArgument(String::number($4));
$$->m_value = $2;
CSSSelector::PseudoType type = $$->pseudoType();
if (type == CSSSelector::PseudoUnknown)
@@ -1145,11 +1145,11 @@ pseudo:
}
}
// used by :nth-*(odd/even) and :lang
- | ':' FUNCTION IDENT ')' {
+ | ':' FUNCTION maybe_space IDENT maybe_space ')' {
CSSParser *p = static_cast<CSSParser*>(parser);
$$ = p->createFloatingSelector();
$$->m_match = CSSSelector::PseudoClass;
- $$->setArgument($3);
+ $$->setArgument($4);
$2.lower();
$$->m_value = $2;
CSSSelector::PseudoType type = $$->pseudoType();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list