* css/tokenizer.flex: Rolled out the fix for 14453.

        The layout test wasn't passing. We'll try again.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 590fca9..df3e771 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,16 +1,3 @@
-2007-07-01  Rob Buis  <buis@kde.org>
-
-        Reviewed by Darin.
-
-        Regression test for:
-        http://bugs.webkit.org/show_bug.cgi?id=14453
-        REGRESSION: www.nzherald.co.nz almost all the formating is gone
-
-        * css2.1/hex-color-regression-expected.checksum: Added.
-        * css2.1/hex-color-regression-expected.png: Added.
-        * css2.1/hex-color-regression-expected.txt: Added.
-        * css2.1/hex-color-regression.html: Added.
-

 2007-07-01  Darin Adler  <darin@apple.com>
 
         Fixed a no-SVG test failure by removing a node that was affecting the test results differently
 2007-07-01  Darin Adler  <darin@apple.com>
 
         Fixed a no-SVG test failure by removing a node that was affecting the test results differently

diff --git a/LayoutTests/css2.1/hex-color-regression-expected.checksum b/LayoutTests/css2.1/hex-color-regression-expected.checksum
deleted file mode 100644 (file)
index ae7a7bd..0000000
--- a/LayoutTests/css2.1/hex-color-regression-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-18f1f64eab31dfb69467a497de9442d7
\ No newline at end of file

diff --git a/LayoutTests/css2.1/hex-color-regression-expected.png b/LayoutTests/css2.1/hex-color-regression-expected.png
deleted file mode 100644 (file)
index fc96c0b..0000000
Binary files a/LayoutTests/css2.1/hex-color-regression-expected.png and /dev/null differ

diff --git a/LayoutTests/css2.1/hex-color-regression-expected.txt b/LayoutTests/css2.1/hex-color-regression-expected.txt
deleted file mode 100644 (file)
index 7ce690f..0000000
--- a/LayoutTests/css2.1/hex-color-regression-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-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 100x100 [bgcolor=#008000]

diff --git a/LayoutTests/css2.1/hex-color-regression.html b/LayoutTests/css2.1/hex-color-regression.html
deleted file mode 100644 (file)
index 4af36d3..0000000
--- a/LayoutTests/css2.1/hex-color-regression.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<style>
-    span { color: #f0; }
-    div { background-color: green; width: 100px; height: 100px; }
-</style>
-<div></div>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9691bed..3f98a40 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-01  Darin Adler  <darin@apple.com>
+
+        * css/tokenizer.flex: Rolled out the fix for 14453.
+        The layout test wasn't passing. We'll try again.
+

 2007-07-01  Adam Roben  <aroben@apple.com>
 
         Fix a crash in ~PluginViewWin()
 2007-07-01  Adam Roben  <aroben@apple.com>
 
         Fix a crash in ~PluginViewWin()

diff --git a/WebCore/css/tokenizer.flex b/WebCore/css/tokenizer.flex
index 38665b8..a05b655 100644 (file)
--- a/WebCore/css/tokenizer.flex
+++ b/WebCore/css/tokenizer.flex
@@ -12,7 +12,7 @@ nmstart         [_a-zA-Z]|{nonascii}|{escape}
 nmchar          [_a-zA-Z0-9-]|{nonascii}|{escape}
 string1         \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
 string2         \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\'
 nmchar          [_a-zA-Z0-9-]|{nonascii}|{escape}
 string1         \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
 string2         \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\'

-hexcolor        {h}{2,6}
+hexcolor        {h}{3}|{h}{6}

 
 ident           -?{nmstart}{nmchar}*
 name            {nmchar}+
 
 ident           -?{nmstart}{nmchar}*
 name            {nmchar}+