Changeset 176313 in webkit

Timestamp:

Nov 19, 2014, 12:57:13 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add selector checker for :lang pseudo class in Selectors level 4
​https://bugs.webkit.org/show_bug.cgi?id=138281

Patch by Dhi Aurrahman <​diorahman@rockybars.com> on 2014-11-19
Reviewed by Benjamin Poulain.

Source/WebCore:

Add selector checker for :lang pseudo class in Selectors level 4.

The language tags matching is specified in [1,2].

[1] ​http://www.ietf.org/rfc/rfc4647.txt
[2] ​http://dev.w3.org/csswg/selectors4/#the-lang-pseudo

Tests: fast/selectors/lang-extended-filtering.html

fast/selectors/lang-multiple.html

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):

• css/SelectorCheckerTestFunctions.h:

(WebCore::containslanguageSubtagMatchingRange):
(WebCore::matchesLangPseudoClass):
(WebCore::matchesLangPseudoClassDeprecated):

• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::addPseudoClassType):

LayoutTests:

Add layout tests for :lang selector checker with multiple arguments and
related behaviors on extended filtering.

• fast/selectors/lang-extended-filtering-expected.txt: Added.
• fast/selectors/lang-extended-filtering.html: Added.
• fast/selectors/lang-multiple-expected.txt: Added.
• fast/selectors/lang-multiple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/lang-extended-filtering-expected.txt (added)
• LayoutTests/fast/selectors/lang-extended-filtering.html (added)
• LayoutTests/fast/selectors/lang-multiple-expected.txt (added)
• LayoutTests/fast/selectors/lang-multiple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/SelectorChecker.cpp (modified) (1 diff)
• Source/WebCore/css/SelectorCheckerTestFunctions.h (modified) (2 diffs)
• Source/WebCore/cssjit/SelectorCompiler.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-19  Dhi Aurrahman  <diorahman@rockybars.com>
+
+        Add selector checker for :lang pseudo class in Selectors level 4
+        https://bugs.webkit.org/show_bug.cgi?id=138281
+
+        Reviewed by Benjamin Poulain.
+
+        Add layout tests for :lang selector checker with multiple arguments and
+        related behaviors on extended filtering.
+
+        * fast/selectors/lang-extended-filtering-expected.txt: Added.
+        * fast/selectors/lang-extended-filtering.html: Added.
+        * fast/selectors/lang-multiple-expected.txt: Added.
+        * fast/selectors/lang-multiple.html: Added.
+
 2014-11-18  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-19  Dhi Aurrahman  <diorahman@rockybars.com>
+
+        Add selector checker for :lang pseudo class in Selectors level 4
+        https://bugs.webkit.org/show_bug.cgi?id=138281
+
+        Reviewed by Benjamin Poulain.
+
+        Add selector checker for :lang pseudo class in Selectors level 4.
+
+        The language tags matching is specified in [1,2].
+
+        [1] http://www.ietf.org/rfc/rfc4647.txt
+        [2] http://dev.w3.org/csswg/selectors4/#the-lang-pseudo
+
+        Tests: fast/selectors/lang-extended-filtering.html
+               fast/selectors/lang-multiple.html
+
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+        * css/SelectorCheckerTestFunctions.h:
+        (WebCore::containslanguageSubtagMatchingRange):
+        (WebCore::matchesLangPseudoClass):
+        (WebCore::matchesLangPseudoClassDeprecated):
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::addPseudoClassType):
+
 2014-11-18  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -968 +968 @@
 #if ENABLE(CSS_SELECTORS_LEVEL4)
                 ASSERT(selector->argumentList() && !selector->argumentList()->isEmpty());
-                const AtomicString& argument = selector->argumentList()->first();
+                return matchesLangPseudoClass(element, *selector->argumentList());
 #else
-                const AtomicString& argument = selector->argument();
-#endif                
+                const AtomicString& argument = selector->argument();      
                 if (argument.isNull())
                     return false;
-                return matchesLangPseudoClass(element, argument.impl());
+                return matchesLangPseudoClassDeprecated(element, argument.impl());
+#endif                          
             }
 #if ENABLE(FULLSCREEN_API)

trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Dhi Aurrahman <diorahman@rockybars.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119 +120 @@
     return !element->document().page()->focusController().isActive();
 }
+
+#if ENABLE(CSS_SELECTORS_LEVEL4)
+inline bool containslanguageSubtagMatchingRange(const Vector<String>& languageSubtags, const String& range, size_t& position)
+{
+    for (size_t languageSubtagIndex = position; languageSubtagIndex < languageSubtags.size(); ++languageSubtagIndex) {
+        const String& currentLanguageSubtag = languageSubtags[languageSubtagIndex];
+        if (currentLanguageSubtag.length() == 1)
+            return false;
+        if (equalIgnoringCase(range, currentLanguageSubtag)) {
+            position = languageSubtagIndex + 1;
+            return true;
+        }
+    }
+    return false;
+}
+
+inline bool matchesLangPseudoClass(const Element* element, const Vector<AtomicString>& ranges)
+{
+    ASSERT(element);
+
+    AtomicString language;
+#if ENABLE(VIDEO_TRACK)
+    if (is<WebVTTElement>(*element))
+        language = downcast<WebVTTElement>(*element).language();
+    else
+#endif
+        language = element->computeInheritedLanguage();
+
+    if (language.isNull())
+        return false;
+
+    // Implement basic and extended filterings of given language tags 
+    // as specified in www.ietf.org/rfc/rfc4647.txt.
+    Vector<String> rangeSubtags;
+    Vector<String> languageSubtags;
+
+    language.string().split('-', true, languageSubtags);
+
+    for (const AtomicString& range : ranges) {
+        if (equalIgnoringCase(language, range) && !language.contains('-'))
+            return true;
+
+        range.string().split('-', true, rangeSubtags);
+
+        if (rangeSubtags.size() > languageSubtags.size()) 
+            continue;
+
+        if (!equalIgnoringCase(rangeSubtags.first(), languageSubtags.first())) 
+            continue;
+
+        size_t lastMatchedLanguageSubtagIndex = 1;
+        bool matchedRange = true;
+        for (size_t rangeSubtagIndex = 1; rangeSubtagIndex < rangeSubtags.size(); ++rangeSubtagIndex) {
+            if (!containslanguageSubtagMatchingRange(languageSubtags, rangeSubtags[rangeSubtagIndex], lastMatchedLanguageSubtagIndex)) {
+                matchedRange = false;
+                break;
+            }
+        }
+        if (matchedRange)
+            return true;
+    }
+    return false;
+}
+#endif
     
-inline bool matchesLangPseudoClass(const Element* element, AtomicStringImpl* filter)
+inline bool matchesLangPseudoClassDeprecated(const Element* element, AtomicStringImpl* filter)
 {
     AtomicString value;

trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

@@ -735 +735 @@
         {
 #if ENABLE(CSS_SELECTORS_LEVEL4)
-            ASSERT(selector.argumentList() && !selector.argumentList()->isEmpty());
-            const AtomicString& argument = selector.argumentList()->first();
+            return FunctionType::CannotCompile;
 #else
             const AtomicString& argument = selector.argument();
-#endif
+
             if (argument.isEmpty())
                 return FunctionType::CannotMatchAnything;
@@ -755 +754 @@
             }
             return FunctionType::SimpleSelectorChecker;
+#endif
         }
 
@@ -3147 +3147 @@
     Assembler::RegisterID elementAddress = elementAddressRegister;
     FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
-    functionCall.setFunctionAddress(matchesLangPseudoClass);
+    functionCall.setFunctionAddress(matchesLangPseudoClassDeprecated);
     functionCall.setTwoArguments(elementAddress, langFilterRegister);
     failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));