Attachment 22253 Details for Bug 19965 – Fixed tabbing and added expected.txt

[patch] Fixed tabbing and added expected.txt

atrule.patch (text/plain), 3.95 KB, created by Jacob Refstrup on 2008-07-11 16:02:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jacob Refstrup

Created: 2008-07-11 16:02:14 PDT

Size: 3.95 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 35141)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2008-07-11  Jacob Refstrup  <set EMAIL_ADDRESS environment variable>
>+
>+        Reviewed by TBD
>+        https://bugs.webkit.org/show_bug.cgi?id=19965
>+
>+        - Added "@"{ident} rule (below other @-rules) to use flex for longest match
>+          (if an ealier rule - e.g. @media - also matches then flex chooses that one
>+           however, if a longer match - e.g. @mediaall matches flex will choose that)
>+        - Updated grammar to defined ATKEYWORD token and to use that instead of '@'
>+          in the error recovery grammar. 
>+
>+        Test: css2.1/atrule_longest_match.html
>+
>+        * ChangeLog:
>+        * css/CSSGrammar.y:
>+        * css/tokenizer.flex:
>+
> 2008-07-11  Brady Eidson  <beidson@apple.com>
> 
>         Rubberstamped by Sam
>Index: WebCore/css/CSSGrammar.y
>===================================================================
>--- WebCore/css/CSSGrammar.y	(revision 35141)
>+++ WebCore/css/CSSGrammar.y	(working copy)
>@@ -122,6 +122,7 @@ static int cssyylex(YYSTYPE* yylval, voi
> %token WEBKIT_MEDIAQUERY_SYM
> %token WEBKIT_VARIABLES_SYM
> %token WEBKIT_VARIABLES_DECLS_SYM
>+%token ATKEYWORD
> 
> %token IMPORTANT_SYM
> %token MEDIA_ONLY
>@@ -1256,10 +1257,10 @@ hexcolor:
> /* error handling rules */
> 
> invalid_at:
>-    '@' error invalid_block {
>+    ATKEYWORD error invalid_block {
>         $$ = 0;
>     }
>-  | '@' error ';' {
>+  | ATKEYWORD error ';' {
>         $$ = 0;
>     }
>     ;
>Index: WebCore/css/tokenizer.flex
>===================================================================
>--- WebCore/css/tokenizer.flex	(revision 35141)
>+++ WebCore/css/tokenizer.flex	(working copy)
>@@ -62,6 +62,8 @@ nth             (-?[0-9]*n[\+-][0-9]+)|(
> "@-webkit-variables"    {yyTok = WEBKIT_VARIABLES_SYM; return yyTok; }
> "@-webkit-variables-decls" { yyTok = WEBKIT_VARIABLES_DECLS_SYM; return yyTok; }
> 
>+"@"{ident}              {yyTok = ATKEYWORD; return yyTok; }
>+
> "!"{w}"important"       {yyTok = IMPORTANT_SYM; return yyTok;}
> 
> {num}em                 {yyTok = EMS; return yyTok;}
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 35141)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,11 @@
>+2008-07-11  Jacob Refstrup  <jacob.refstrup@hp.com>
>+
>+        Reviewed by TBD
>+
>+        Added test case for ensuring the longest @-rule is matched (e.g. @mediall over @media)
>+
>+        * css2.1/atrule_longest_match.html: Added.
>+
> 2008-07-11  Simon Fraser  <simon.fraser@apple.com>
> 
>         Reviewed by Dave Hyatt
>Index: LayoutTests/css2.1/atrule_longest_match-expected.txt
>===================================================================
>--- LayoutTests/css2.1/atrule_longest_match-expected.txt	(revision 0)
>+++ LayoutTests/css2.1/atrule_longest_match-expected.txt	(revision 0)
>@@ -0,0 +1,7 @@
>+Below should be a line saying: PASSED
>+
>+PASSED
>+
>+See Bug 19965.
>+
>+
>Index: LayoutTests/css2.1/atrule_longest_match.html
>===================================================================
>--- LayoutTests/css2.1/atrule_longest_match.html	(revision 0)
>+++ LayoutTests/css2.1/atrule_longest_match.html	(revision 0)
>@@ -0,0 +1,23 @@
>+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
>+<html>
>+<head>
>+<title>CSS atrules - tokenizer must match "@"{ident} longest match</title>
>+<style type="text/css">
>+p.test { display: none }
>+@media all { span.test { display: inline } }
>+@mediaall { span.test { display: none } }
>+p.test { display: block }
>+</style>
>+<script type="text/javascript">
>+    if (window.layoutTestController)
>+        layoutTestController.dumpAsText();
>+</script>
>+</head>
>+<body>
>+<p>Below should be a line saying: PASSED</p>
>+<p class="test"><span class="test">PASSED</span></p>
>+<p>See <a href="http://bugs.webkit.org/show_bug.cgi?id=19965">Bug 19965<a>.</p>
>+</body>
>+</html>
>+</body>
>+</html>

Flags:

rwlbuis: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 19965: 22189 | 22190 | 22245 | 22251 | 22252 | 22253 | 22307 | 22316