Changeset 176529 in webkit

Timestamp:

Nov 24, 2014, 4:20:35 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

Move :placeholder-shown out of experimental
​https://bugs.webkit.org/show_bug.cgi?id=138998

Reviewed by Andreas Kling.

The pseudo class :placeholder-shown is used by the inspector, disabling it breaks
the sidebar.

The implementation has been stable for a while, we can move it to stable.

• css/CSSSelector.cpp:

(WebCore::CSSSelector::selectorText):

• css/CSSSelector.h:
• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):

• css/SelectorPseudoClassAndCompatibilityElementMap.in:
• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::addPseudoClassType):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasPlaceholderShown):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSSelector.cpp (modified) (1 diff)
• css/CSSSelector.h (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (2 diffs)
• css/SelectorPseudoClassAndCompatibilityElementMap.in (modified) (1 diff)
• cssjit/SelectorCompiler.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-24  Benjamin Poulain  <benjamin@webkit.org>
+
+        Move :placeholder-shown out of experimental
+        https://bugs.webkit.org/show_bug.cgi?id=138998
+
+        Reviewed by Andreas Kling.
+
+        The pseudo class :placeholder-shown is used by the inspector, disabling it breaks
+        the sidebar.
+
+        The implementation has been stable for a while, we can move it to stable.
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::selectorText):
+        * css/CSSSelector.h:
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+        * css/SelectorPseudoClassAndCompatibilityElementMap.in:
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::addPseudoClassType):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasPlaceholderShown):
+
 2014-11-24  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/CSSSelector.cpp

@@ -565 +565 @@
                 break;
             }
-#if ENABLE(CSS_SELECTORS_LEVEL4)
             case CSSSelector::PseudoClassPlaceholderShown:
                 str.appendLiteral(":placeholder-shown");
                 break;
-#endif
             case CSSSelector::PseudoClassOutOfRange:
                 str.appendLiteral(":out-of-range");

trunk/Source/WebCore/css/CSSSelector.h

@@ -121 +121 @@
             PseudoClassDefault,
             PseudoClassDisabled,
+            PseudoClassMatches,
             PseudoClassOptional,
-#if ENABLE(CSS_SELECTORS_LEVEL4)
             PseudoClassPlaceholderShown,
-#endif
-            PseudoClassMatches,
             PseudoClassRequired,
             PseudoClassReadOnly,

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -730 +730 @@
                 return hasMatchedAnything;
             }
-#if ENABLE(CSS_SELECTORS_LEVEL4)
         case CSSSelector::PseudoClassPlaceholderShown:
             if (is<HTMLTextFormControlElement>(*element)) {
@@ -740 +739 @@
             }
             return false;
-#endif
         case CSSSelector::PseudoClassNthChild:
             if (!selector->parseNth())

trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in

@@ -46 +46 @@
 optional
 out-of-range
-#if ENABLE(CSS_SELECTORS_LEVEL4)
 placeholder-shown
-#endif
 read-only
 read-write

trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

@@ -294 +294 @@
     void generateElementIsLastChild(Assembler::JumpList& failureCases, const SelectorFragment&);
     void generateElementIsOnlyChild(Assembler::JumpList& failureCases, const SelectorFragment&);
-#if ENABLE(CSS_SELECTORS_LEVEL4)
     void generateElementHasPlaceholderShown(Assembler::JumpList& failureCases, const SelectorFragment&);
-#endif
     void generateSynchronizeStyleAttribute(Assembler::RegisterID elementDataArraySizeAndFlags);
     void generateSynchronizeAllAnimatedSVGAttribute(Assembler::RegisterID elementDataArraySizeAndFlags);
@@ -611 +609 @@
     case CSSSelector::PseudoClassLastChild:
     case CSSSelector::PseudoClassOnlyChild:
-#if ENABLE(CSS_SELECTORS_LEVEL4)
     case CSSSelector::PseudoClassPlaceholderShown:
-#endif
         fragment.pseudoClasses.add(type);
         if (selectorContext == SelectorContext::QuerySelector)
@@ -2444 +2440 @@
     if (fragment.pseudoClasses.contains(CSSSelector::PseudoClassOnlyChild))
         generateElementIsOnlyChild(matchingPostTagNameFailureCases, fragment);
-#if ENABLE(CSS_SELECTORS_LEVEL4)
     if (fragment.pseudoClasses.contains(CSSSelector::PseudoClassPlaceholderShown))
         generateElementHasPlaceholderShown(matchingPostTagNameFailureCases, fragment);
-#endif
     if (fragment.pseudoClasses.contains(CSSSelector::PseudoClassFirstChild))
         generateElementIsFirstChild(matchingPostTagNameFailureCases, fragment);
@@ -3288 +3282 @@
 }
 
-#if ENABLE(CSS_SELECTORS_LEVEL4)
 static bool makeContextStyleUniqueIfNecessaryAndTestIsPlaceholderShown(Element* element, const SelectorChecker::CheckingContext* checkingContext)
 {
@@ -3338 +3331 @@
     failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));
 }
-#endif
 
 inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch)