[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

Fri Jan 21 14:56:30 UTC 2011

The following commit has been merged in the debian/experimental branch:
commit b392a81365459a0c347c2103e31f1819ab4a5a58
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 02:21:00 2011 +0000

    2011-01-04  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Darin Adler.
    
            CSS3 :nth-child selector and valid whitespace test fails
            https://bugs.webkit.org/show_bug.cgi?id=36279
    
            * fast/css/css3-nth-space-expected.txt: Added.
            * fast/css/css3-nth-space.html: Added.
    2011-01-04  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Darin Adler.
    
            CSS3 :nth-child selector and valid whitespace test fails
            https://bugs.webkit.org/show_bug.cgi?id=36279
    
            Teach the tokenizer to allow white spaces around [+/-] signs in nth constructs.
    
            Test: fast/css/css3-nth-space.html
    
            * css/tokenizer.flex:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d1c98f2..fdebe89 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-04  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        CSS3 :nth-child selector and valid whitespace test fails
+        https://bugs.webkit.org/show_bug.cgi?id=36279
+
+        * fast/css/css3-nth-space-expected.txt: Added.
+        * fast/css/css3-nth-space.html: Added.
+
 2011-01-04  Tony Gentilcore  <tonyg at chromium.org>
 
         Unreviewed expectations update.
diff --git a/LayoutTests/fast/css/css3-nth-space-expected.txt b/LayoutTests/fast/css/css3-nth-space-expected.txt
new file mode 100644
index 0000000..29d6251
--- /dev/null
+++ b/LayoutTests/fast/css/css3-nth-space-expected.txt
@@ -0,0 +1,13 @@
+This test passes if the nth-of-type(3n + 1) is parsed correctly, regardless of the whitespaces.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color') is 'rgb(0, 128, 0)'
+PASS document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color') is 'rgb(255, 0, 0)'
+PASS document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color') is 'rgb(255, 0, 0)'
+PASS document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color') is 'rgb(0, 128, 0)'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/css/css3-nth-space.html b/LayoutTests/fast/css/css3-nth-space.html
new file mode 100644
index 0000000..7ddaf24
--- /dev/null
+++ b/LayoutTests/fast/css/css3-nth-space.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+<style>
+div.class { background-color: red; }
+div.class:nth-of-type(3n
+ +   1) {background-color: green;}
+</style>
+
+</head>
+<body>
+<p id="description"></p>
+<div tabindex=1" id="first" class="class"></div>
+<div tabindex=2" id="second" class="class"></div>
+<div tabindex=3" id="third" class="class"></div>
+<div tabindex=4" id="fourth" class="class"></div>
+<div id="console"></div>
+<script>
+description('This test passes if the nth-of-type(3n + 1) is parsed correctly, regardless of the whitespaces.');
+
+
+
+el = document.getElementById("first");
+shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(0, 128, 0)'");
+
+el = document.getElementById("second");
+shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(255, 0, 0)'");
+
+el = document.getElementById("third");
+shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(255, 0, 0)'");
+
+el = document.getElementById("fourth");
+shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(0, 128, 0)'");
+
+var successfullyParsed = true;
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 127ba15..9fee8d1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-04  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        CSS3 :nth-child selector and valid whitespace test fails
+        https://bugs.webkit.org/show_bug.cgi?id=36279
+
+        Teach the tokenizer to allow white spaces around [+/-] signs in nth constructs.
+
+        Test: fast/css/css3-nth-space.html
+
+        * css/tokenizer.flex:
+
 2011-01-04  Chris Fleizach  <cfleizach at apple.com>
 
         Unreviewed. Build fix.
diff --git a/WebCore/css/tokenizer.flex b/WebCore/css/tokenizer.flex
index 21ea247..eb18cb9 100644
--- a/WebCore/css/tokenizer.flex
+++ b/WebCore/css/tokenizer.flex
@@ -23,7 +23,7 @@ url             ([!#$%&*-~]|{nonascii}|{escape})*
 w               [ \t\r\n\f]*
 nl              \n|\r\n|\r|\f
 range           \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
-nth             [\+-]?{intnum}*n([\+-]{intnum})?
+nth             [\+-]?{intnum}*n([\t\r\n ]*[\+-][\t\r\n ]*{intnum})?
 
 %%
 

-- 
WebKit Debian packaging

