Changeset 431 for trunk/WebCore/css/CSSGrammar.y

Timestamp:

08/06/08 13:29:36 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35588

Files:

• trunk/WebCore/css/CSSGrammar.y (modified) (7 diffs)

trunk/WebCore/css/CSSGrammar.y

@@ -34 +34 @@
-#include "HTMLNames.h"
-#include "MediaList.h"
+#include "WebKitCSSKeyframeRule.h"
+#include "WebKitCSSKeyframesRule.h"
-#include <stdlib.h>
-#include <string.h>
@@ -71 +73 @@
-    CSSParserValueList* valueList;
-    Vector<MediaQueryExp*>* mediaQueryExpList;
+    WebKitCSSKeyframeRule* keyframeRule;
+    WebKitCSSKeyframesRule* keyframesRule;
+    float val;
-}
-
@@ -121 +126 @@
-%token WEBKIT_RULE_SYM
-%token WEBKIT_DECLS_SYM
+%token WEBKIT_KEYFRAMES_SYM
-%token WEBKIT_VALUE_SYM
-%token WEBKIT_MEDIAQUERY_SYM
@@ -173 +179 @@
-%type <rule> page
-%type <rule> font_face
+%type <rule> keyframes
-%type <rule> invalid_rule
-%type <rule> save_block
@@ -206 +213 @@
-%type <mediaQueryExpList> maybe_and_media_query_exp_list
-
+%type <string> keyframe_name
+%type <keyframeRule> keyframe_rule
+%type <keyframesRule> keyframes_rule
+%type <val> key
+
-%type <integer> property
-
@@ -379 +391 @@
-  | page
-  | font_face
+  | keyframes
-  ;
-
@@ -658 +671 @@
-  }
-  ;
+
+keyframes:
+    WEBKIT_KEYFRAMES_SYM maybe_space keyframe_name maybe_space '{' maybe_space keyframes_rule '}' {
+        $$ = $7;
+        $7->setName($3);
+    }
+    ;
+  
+keyframe_name:
+    IDENT
+    | STRING
+    ;
+
+keyframes_rule:
+    /* empty */ { $$ = static_cast<CSSParser*>(parser)->createKeyframesRule(); }
+    | keyframes_rule keyframe_rule maybe_space {
+        $$ = $1;
+        if ($2)
+            $$->insert($2);
+    }
+    ;
+
+keyframe_rule:
+    key maybe_space '{' maybe_space declaration_list '}' {
+        $$ = static_cast<CSSParser*>(parser)->createKeyframeRule($1);
+    }
+    ;
+
+key:
+    PERCENTAGE { $$ = (float) $1; }
+    | IDENT {
+        $$ = -1;
+        CSSParserString& str = $1;
+        if (equalIgnoringCase(static_cast<const String&>(str), "from"))
+            $$ = 0;
+        else if (equalIgnoringCase(static_cast<const String&>(str), "to"))
+            $$ = 100;
+        else
+            YYERROR;
+    }
+    ;
-
-/*