[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0bda516d590ff3fe860f8f2a498d903a6453b524
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 26 00:22:45 2010 +0000

    2010-11-25  Mike Lawther  <mikelawther at chromium.org>
    
            Reviewed by Kent Tamura.
    
            Fix typos in CSS grammar (HERZ -> HERTZ)
            https://bugs.webkit.org/show_bug.cgi?id=50094
    
            * css/CSSGrammar.y:
            * css/CSSParser.cpp:
            (WebCore::CSSParser::lex):
            * css/tokenizer.flex:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 281c51f..3fe6a9c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-25  Mike Lawther  <mikelawther at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Fix typos in CSS grammar (HERZ -> HERTZ)
+        https://bugs.webkit.org/show_bug.cgi?id=50094
+
+        * css/CSSGrammar.y:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::lex):
+        * css/tokenizer.flex:
+
 2010-11-25  Antti Koivisto  <antti at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index c045335..db79b68 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -180,8 +180,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
 %token <number> TURNS
 %token <number> MSECS
 %token <number> SECS
-%token <number> HERZ
-%token <number> KHERZ
+%token <number> HERTZ
+%token <number> KHERTZ
 %token <string> DIMEN
 %token <number> PERCENTAGE
 %token <number> FLOATTOKEN
@@ -1444,8 +1444,8 @@ unary_term:
   | TURNS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_TURN; }
   | MSECS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_MS; }
   | SECS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_S; }
-  | HERZ maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_HZ; }
-  | KHERZ maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_KHZ; }
+  | HERTZ maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_HZ; }
+  | KHERTZ maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_KHZ; }
   | EMS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EMS; }
   | QEMS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSParserValue::Q_EMS; }
   | EXS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EXS; }
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 487512b..2622c5f 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -5128,11 +5128,11 @@ int CSSParser::lex(void* yylvalWithoutType)
         length--;
     case DEGS:
     case RADS:
-    case KHERZ:
+    case KHERTZ:
     case REMS:
         length--;
     case MSECS:
-    case HERZ:
+    case HERTZ:
     case EMS:
     case EXS:
     case PXS:
diff --git a/WebCore/css/tokenizer.flex b/WebCore/css/tokenizer.flex
index bd4808d..21ea247 100644
--- a/WebCore/css/tokenizer.flex
+++ b/WebCore/css/tokenizer.flex
@@ -99,8 +99,8 @@ nth             [\+-]?{intnum}*n([\+-]{intnum})?
 {num}turn               {yyTok = TURNS; return yyTok;}
 {num}ms                 {yyTok = MSECS; return yyTok;}
 {num}s                  {yyTok = SECS; return yyTok;}
-{num}Hz                 {yyTok = HERZ; return yyTok;}
-{num}kHz                {yyTok = KHERZ; return yyTok;}
+{num}Hz                 {yyTok = HERTZ; return yyTok;}
+{num}kHz                {yyTok = KHERTZ; return yyTok;}
 {num}{ident}            {yyTok = DIMEN; return yyTok;}
 {num}%+                 {yyTok = PERCENTAGE; return yyTok;}
 {intnum}                {yyTok = INTEGER; return yyTok;}

-- 
WebKit Debian packaging