List marker pseudo elements.

Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 52 matching lines @@
 #include "core/css/resolver/MediaQueryResult.h"
 #include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/css/resolver/SharedStyleFinder.h"
 #include "core/css/resolver/StyleAdjuster.h"
 #include "core/css/resolver/StyleResolverParentScope.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/css/resolver/StyleResolverStats.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/CSSSelectorWatch.h"
 #include "core/dom/FirstLetterPseudoElement.h"
+#include "core/dom/MarkerPseudoElement.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/rendering/RenderView.h"
@@ skipping 630 matching lines @@
 
 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(StyleResolverState& state, CSSPropertyID property, CSSValue& value)
 {
     StyleBuilder::applyProperty(property, state, &value);
     state.fontBuilder().createFont(state.document().styleEngine()->fontSelector(), state.style(), state.parentStyle());
     return CSSAnimatableValueFactory::create(property, *state.style());
 }
 
 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElement(Element* parent, PseudoId pseudoId)
 {
+    if (RuntimeEnabledFeatures::listMarkerPseudoElementEnabled() && pseudoId == MARKER)
+        return MarkerPseudoElement::create(parent);
     if (pseudoId == FIRST_LETTER)
         return FirstLetterPseudoElement::create(parent);
     return PseudoElement::create(parent, pseudoId);
 }
 
+bool StyleResolver::pseudoElementRequired(PseudoId pseudoId, RenderObject& parentRenderer)
+{
+    if (pseudoId == FIRST_LETTER)
+        return true;
+    if (RuntimeEnabledFeatures::listMarkerPseudoElementEnabled() && pseudoId == MARKER)
+        return true;
+    if (parentRenderer.style()->hasPseudoStyle(pseudoId))
+        return true;
+    return pseudoId >= FIRST_INTERNAL_PSEUDOID;
+}
+
 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& parent, PseudoId pseudoId)
 {
     RenderObject* parentRenderer = parent.renderer();
     if (!parentRenderer)
         return nullptr;
 
-    // The first letter pseudo element has to look up the tree and see if any
-    // of the ancestors are first letter.
-    if (pseudoId < FIRST_INTERNAL_PSEUDOID && pseudoId != FIRST_LETTER && !parentRenderer->style()->hasPseudoStyle(pseudoId))
+    if (!pseudoElementRequired(pseudoId, *parentRenderer))
         return nullptr;
 
     if (pseudoId == BACKDROP && !parent.isInTopLayer())
         return nullptr;
 
+    // FIXME: This should also probably take inline-list-item into account when
+    // we add support.
+    if (RuntimeEnabledFeatures::listMarkerPseudoElementEnabled() && pseudoId == MARKER && parentRenderer->style()->display() != LIST_ITEM)

[Julien - ping for review, 2015/02/04 01:56:33]

pseudoId == MARKER && parentRenderer->style()->display() != LIST_ITEM is
repeated 3 times, we need a function to share the code.

[dsinclair, 2015/02/04 15:30:59]

They're slightly different. This one is == && != and the other one on is != ||
!=

+        return nullptr;
+
     if (pseudoId == FIRST_LETTER && (parent.isSVGElement() || !FirstLetterPseudoElement::firstLetterTextRenderer(parent)))
         return nullptr;
 
     if (!parentRenderer->canHaveGeneratedChildren())
         return nullptr;
 
     RenderStyle* parentStyle = parentRenderer->style();
     if (RenderStyle* cachedStyle = parentStyle->getCachedPseudoStyle(pseudoId)) {
         if (!pseudoElementRendererIsNeeded(cachedStyle))
             return nullptr;
@@ skipping 49 matching lines @@
     // user agent rules, don't waste time walking those rules.
 
     if (!baseRenderStyle) {
         // Check UA, user and author rules.
         ElementRuleCollector collector(state.elementContext(), m_selectorFilter, state.style());
         collector.setPseudoStyleRequest(pseudoStyleRequest);
 
         matchUARules(collector);
         matchAuthorRules(state.element(), collector, false);
 
-        if (collector.matchedResult().matchedProperties.isEmpty())
+        if (!collector.matchedResult().matchedProperties.isEmpty())
+            applyMatchedProperties(state, collector.matchedResult());
+        else if (pseudoStyleRequest.pseudoId != MARKER || parentStyle->display() != LIST_ITEM)

[Julien - ping for review, 2015/02/04 01:56:33]

This code is pretty confusing now IMHO. Keeping the old logic (with an
_unconditional_ applyMatchedProperties called).

[dsinclair, 2015/02/04 04:41:33]

Not sure what you mean, do you mean keeping the old logic with the unconditional
applyCallbackSelectors?

The applyCallbackSelectors will only be called in the MARKER or LIST_ITEM case
at the moment. If it isn't a marker then we will return as we did previously.

             return false;
 
-        applyMatchedProperties(state, collector.matchedResult());
         applyCallbackSelectors(state);
 
         // Cache our original display.
         state.style()->setOriginalDisplay(state.style()->display());
 
         // FIXME: Passing 0 as the Element* introduces a lot of complexity
         // in the adjustRenderStyle code.
         adjustRenderStyle(state, 0);
 
         if (activeAnimations)
@@ skipping 748 matching lines @@
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingRules);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink