Changeset 14879 in webkit

Timestamp:

Jun 15, 2006 2:37:13 PM (18 years ago)

Author:

jdevalk

Message:

Adding :lang support, patch by Nicholas Shanks, review by Hyatt

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/css3-modsel-22-expected.txt (added)
• LayoutTests/fast/css/css3-modsel-22.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (2 diffs)
• WebCore/css/CSSSelector.cpp (modified) (1 diff)
• WebCore/css/CSSSelector.h (modified) (3 diffs)
• WebCore/css/cssparser.cpp (modified) (1 diff)
• WebCore/css/cssstyleselector.cpp (modified) (4 diffs)
• WebCore/css/tokenizer.flex (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-06-15  Nicholas Shanks  <contact@nickshanks.com>
+
+        Reviewed by Hyatt, landed by Joost de Valk.
+
+        Testcases for fix to bug http://bugzilla.opendarwin.org/show_bug.cgi?id=3233
+
+        * fast/css/css3-modsel-22-expected.txt: Added.
+        * fast/css/css3-modsel-22.html: Added.
+
 2006-06-15  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-06-15  Nicholas Shanks  <contact@nickshanks.com>
+
+        Reviewed by Hyatt, landed by Joost de Valk.
+
+        Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3233
+
+        Add support for the :lang pseudo-class.
+
+        * css/CSSGrammar.y:
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::operator == ):
+        * css/CSSSelector.h:
+        (WebCore::CSSSelector::CSSSelector):
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::lex):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::checkOneSelector):
+        * css/tokenizer.flex:
+
 2006-06-15  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -219 +219 @@
 %token <string> URI
 %token <string> FUNCTION
+%token <string> NOTFUNCTION
 
 %token <string> UNICODERANGE
@@ -836 +837 @@
         $$->value = atomicString($3);
     }
-    | ':' FUNCTION maybe_space simple_selector maybe_space ')' {
+    // used by :lang
+    | ':' FUNCTION IDENT ')' {
+        $$ = new CSSSelector();
+        $$->match = CSSSelector::PseudoClass;
+        $$->argument = atomicString($3);
+        $2.lower();
+        $$->value = atomicString($2);
+    }
+    // used by :not
+    | ':' NOTFUNCTION maybe_space simple_selector ')' {
         CSSParser* p = static_cast<CSSParser*>(parser);
         $$ = p->createFloatingSelector();

trunk/WebCore/css/CSSSelector.cpp

@@ -181 +181 @@
              sel1->relation() != sel2->relation() || sel1->match != sel2->match ||
              sel1->value != sel2->value ||
-             sel1->pseudoType() != sel2->pseudoType())
+             sel1->pseudoType() != sel2->pseudoType() ||
+             sel1->argument != sel2->argument)
             return false;
         sel1 = sel1->tagHistory;

trunk/WebCore/css/CSSSelector.h

@@ -37 +37 @@
             , simpleSelector(0)
             , nextSelector(0)
+            , argument(nullAtom)
             , attr(anyQName())
             , tag(anyQName())
@@ -49 +50 @@
             , simpleSelector(0)
             , nextSelector(0)
+            , argument(nullAtom)
             , attr(anyQName())
             , tag(qName)
@@ -159 +161 @@
         CSSSelector* simpleSelector; // Used for :not.
         CSSSelector* nextSelector; // used for ,-chained selectors
+        AtomicString argument; // Used for :contains, :lang and :nth-*
         
         QualifiedName attr;

trunk/WebCore/css/cssparser.cpp

@@ -2672 +2672 @@
     case UNICODERANGE:
     case FUNCTION:
+    case NOTFUNCTION:
         yylval->string.characters = t;
         yylval->string.length = length;

trunk/WebCore/css/cssstyleselector.cpp

@@ -4 +4 @@
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
+ *           (C) 2006 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006 Apple Computer, Inc.
  *
@@ -1521 +1522 @@
                     return true;
                 break;
+            case CSSSelector::PseudoLang: {
+                const AtomicString& value = e->getAttribute(langAttr);
+                if (value.isEmpty() || !value.startsWith(sel->argument, false))
+                    break;
+                if (value.length() != sel->argument.length() && value[sel->argument.length()] != '-')
+                    break;
+                return true;
+            }
             case CSSSelector::PseudoNot: {
                 // check the simple selector
-                for (CSSSelector* subSel = sel->simpleSelector; subSel;
-                     subSel = subSel->tagHistory) {
-                    // :not cannot nest.  I don't really know why this is a restriction in CSS3,
-                    // but it is, so let's honor it.
+                for (CSSSelector* subSel = sel->simpleSelector; subSel; subSel = subSel->tagHistory) {
+                    // :not cannot nest. I don't really know why this is a
+                    // restriction in CSS3, but it is, so let's honour it.
                     if (subSel->simpleSelector)
                         break;
@@ -1534 +1542 @@
                 break;
             }
-            case CSSSelector::PseudoLang:
-                /* not supported for now */
             case CSSSelector::PseudoOther:
                 break;
@@ -1566 +1572 @@
                 break;
         }
-            return false;
+        return false;
     }
     // ### add the rest of the checks...

trunk/WebCore/css/tokenizer.flex

@@ -81 +81 @@
 {num}                   {yyTok = FLOAT; return yyTok;}
 
+"not("                  {yyTok = NOTFUNCTION; return yyTok;}
 "url("{w}{string}{w}")" {yyTok = URI; return yyTok;}
 "url("{w}{url}{w}")"    {yyTok = URI; return yyTok;}