Changeset 171486 in webkit

Timestamp:

Jul 23, 2014 1:19:37 PM (10 years ago)

Author:

achristensen@apple.com

Message:

Compile window-inactive and fullscreen pseudoclasses in css selectors.
​https://bugs.webkit.org/show_bug.cgi?id=135200

Reviewed by Benjamin Poulain.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):
Removed the check of context.hasSelectionPseudo for a window-inactive pseudoclass.
Moved logic to SelectorCheckerTestFunctions.h to share with the selector compiler.

• css/SelectorCheckerTestFunctions.h:

(WebCore::isWindowInactive):
(WebCore::matchesFullScreenAnimatingFullScreenTransitionPseudoClass):
(WebCore::matchesFullScreenAncestorPseudoClass):
(WebCore::matchesFullScreenDocumentPseudoClass):
Added from SelectorChecker.cpp.

• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::addPseudoClassType):
Added unoptimized pseudoclass cases for window-inactive and fullscreen pseudoclasses.
Explicitly listed uncompiled pseudoclasses for future work instead of using a default.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (4 diffs)
• css/SelectorCheckerTestFunctions.h (modified) (3 diffs)
• cssjit/SelectorCompiler.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-23  Alex Christensen  <achristensen@webkit.org>
+
+        Compile window-inactive and fullscreen pseudoclasses in css selectors.
+        https://bugs.webkit.org/show_bug.cgi?id=135200
+
+        Reviewed by Benjamin Poulain.
+
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+        Removed the check of context.hasSelectionPseudo for a window-inactive pseudoclass.
+        Moved logic to SelectorCheckerTestFunctions.h to share with the selector compiler.
+        * css/SelectorCheckerTestFunctions.h:
+        (WebCore::isWindowInactive):
+        (WebCore::matchesFullScreenAnimatingFullScreenTransitionPseudoClass):
+        (WebCore::matchesFullScreenAncestorPseudoClass):
+        (WebCore::matchesFullScreenDocumentPseudoClass):
+        Added from SelectorChecker.cpp.
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::addPseudoClassType):
+        Added unoptimized pseudoclass cases for window-inactive and fullscreen pseudoclasses.
+        Explicitly listed uncompiled pseudoclasses for future work instead of using a default.
+
 2014-07-23  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -33 +33 @@
 #include "Document.h"
 #include "ElementTraversal.h"
-#include "FocusController.h"
 #include "Frame.h"
 #include "FrameSelection.h"
@@ -482 +481 @@
             // (since there are no elements involved).
             return checkScrollbarPseudoClass(context, &element->document(), selector);
-        } else if (context.hasSelectionPseudo) {
-            if (selector->pseudoClassType() == CSSSelector::PseudoClassWindowInactive)
-                return !element->document().page()->focusController().isActive();
         }
 
@@ -746 +742 @@
             return matchesFullScreenPseudoClass(element);
         case CSSSelector::PseudoClassAnimatingFullScreenTransition:
-            if (element != element->document().webkitCurrentFullScreenElement())
-                return false;
-            return element->document().isAnimatingFullScreen();
+            return matchesFullScreenAnimatingFullScreenTransitionPseudoClass(element);
         case CSSSelector::PseudoClassFullScreenAncestor:
-            return element->containsFullScreenElement();
+            return matchesFullScreenAncestorPseudoClass(element);
         case CSSSelector::PseudoClassFullScreenDocument:
-            // While a Document is in the fullscreen state, the 'full-screen-document' pseudoclass applies
-            // to all elements of that Document.
-            if (!element->document().webkitIsFullScreen())
-                return false;
-            return true;
+            return matchesFullScreenDocumentPseudoClass(element);
 #endif
         case CSSSelector::PseudoClassInRange:
@@ -778 +768 @@
 
         case CSSSelector::PseudoClassWindowInactive:
-            return !element->document().page()->focusController().isActive();
+            return isWindowInactive(element);
 
         case CSSSelector::PseudoClassHorizontal:

trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h

@@ -27 +27 @@
 #define SelectorCheckerTestFunctions_h
 
+#include "FocusController.h"
 #include "HTMLInputElement.h"
 #include "HTMLOptionElement.h"
@@ -112 +113 @@
 }
 
+ALWAYS_INLINE bool isWindowInactive(const Element* element)
+{
+    return !element->document().page()->focusController().isActive();
+}
+    
 inline bool matchesLangPseudoClass(const Element* element, AtomicStringImpl* filter)
 {
@@ -164 +170 @@
     return element == element->document().webkitCurrentFullScreenElement();
 }
+
+ALWAYS_INLINE bool matchesFullScreenAnimatingFullScreenTransitionPseudoClass(const Element* element)
+{
+    if (element != element->document().webkitCurrentFullScreenElement())
+        return false;
+    return element->document().isAnimatingFullScreen();
+}
+
+ALWAYS_INLINE bool matchesFullScreenAncestorPseudoClass(const Element* element)
+{
+    return element->containsFullScreenElement();
+}
+
+ALWAYS_INLINE bool matchesFullScreenDocumentPseudoClass(const Element* element)
+{
+    // While a Document is in the fullscreen state, the 'full-screen-document' pseudoclass applies
+    // to all elements of that Document.
+    if (!element->document().webkitIsFullScreen())
+        return false;
+    return true;
+}
 #endif
 

trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

@@ -397 +397 @@
         fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isValid));
         return FunctionType::SimpleSelectorChecker;
+    case CSSSelector::PseudoClassWindowInactive:
+        fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isWindowInactive));
+        return FunctionType::SimpleSelectorChecker;
+            
 #if ENABLE(FULLSCREEN_API)
     case CSSSelector::PseudoClassFullScreen:
         fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesFullScreenPseudoClass));
+        return FunctionType::SimpleSelectorChecker;
+    case CSSSelector::PseudoClassFullScreenDocument:
+        fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesFullScreenDocumentPseudoClass));
+        return FunctionType::SimpleSelectorChecker;
+    case CSSSelector::PseudoClassFullScreenAncestor:
+        fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesFullScreenAncestorPseudoClass));
+        return FunctionType::SimpleSelectorChecker;
+    case CSSSelector::PseudoClassAnimatingFullScreenTransition:
+        fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesFullScreenAnimatingFullScreenTransitionPseudoClass));
         return FunctionType::SimpleSelectorChecker;
 #endif
@@ -410 +423 @@
         return FunctionType::SimpleSelectorChecker;
 #endif
+
+    // FIXME: Compile these pseudoclasses, too!
+    case CSSSelector::PseudoClassEmpty:
+    case CSSSelector::PseudoClassFirstOfType:
+    case CSSSelector::PseudoClassLastOfType:
+    case CSSSelector::PseudoClassOnlyOfType:
+    case CSSSelector::PseudoClassNthOfType:
+    case CSSSelector::PseudoClassNthLastChild:
+    case CSSSelector::PseudoClassNthLastOfType:
+    case CSSSelector::PseudoClassVisited:
+    case CSSSelector::PseudoClassDrag:
+    case CSSSelector::PseudoClassFullPageMedia:
+    case CSSSelector::PseudoClassScope:
+    case CSSSelector::PseudoClassCornerPresent:
+    case CSSSelector::PseudoClassDecrement:
+    case CSSSelector::PseudoClassIncrement:
+    case CSSSelector::PseudoClassHorizontal:
+    case CSSSelector::PseudoClassVertical:
+    case CSSSelector::PseudoClassStart:
+    case CSSSelector::PseudoClassEnd:
+    case CSSSelector::PseudoClassDoubleButton:
+    case CSSSelector::PseudoClassSingleButton:
+    case CSSSelector::PseudoClassNoButton:
+        return FunctionType::CannotCompile;
 
     // Optimized pseudo selectors.
@@ -534 +571 @@
             return FunctionType::SimpleSelectorChecker;
         }
-
-    default:
-        break;
-    }
+            
+    case CSSSelector::PseudoClassUnknown:
+        ASSERT_NOT_REACHED();
+        return FunctionType::CannotMatchAnything;
+    }
+    
+    ASSERT_NOT_REACHED();
     return FunctionType::CannotCompile;
 }