Changeset 160138 in webkit

Timestamp:

Dec 4, 2013, 4:03:00 PM (13 years ago)

Author:

Antti Koivisto

Message:

Move pseudo element construction out from Element
​https://bugs.webkit.org/show_bug.cgi?id=125257

Reviewed by Anders Carlsson.

This is logically part of the style resolve/render tree construction. This will make future
refactoring easier.

• dom/Element.cpp:
• dom/Element.h:
• style/StyleResolveTree.cpp:

(WebCore::Style::beforeOrAfterPseudoElement):
(WebCore::Style::setBeforeOrAfterPseudoElement):
(WebCore::Style::clearBeforeOrAfterPseudoElement):
(WebCore::Style::needsPseudeElement):
(WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
(WebCore::Style::attachRenderTree):
(WebCore::Style::updateBeforeOrAfterPseudoElement):
(WebCore::Style::resolveTree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• style/StyleResolveTree.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-04  Antti Koivisto  <antti@apple.com>
+
+        Move pseudo element construction out from Element
+        https://bugs.webkit.org/show_bug.cgi?id=125257
+
+        Reviewed by Anders Carlsson.
+
+        This is logically part of the style resolve/render tree construction. This will make future
+        refactoring easier.
+
+        * dom/Element.cpp:
+        * dom/Element.h:
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::beforeOrAfterPseudoElement):
+        (WebCore::Style::setBeforeOrAfterPseudoElement):
+        (WebCore::Style::clearBeforeOrAfterPseudoElement):
+        (WebCore::Style::needsPseudeElement):
+        (WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
+        (WebCore::Style::attachRenderTree):
+        (WebCore::Style::updateBeforeOrAfterPseudoElement):
+        (WebCore::Style::resolveTree):
+
 2013-12-04  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2335 +2335 @@
 }
 
-bool Element::updateExistingPseudoElement(PseudoElement* existingPseudoElement, Style::Change change)
-{
-    // PseudoElement styles hang off their parent element's style so if we needed
-    // a style recalc we should Force one on the pseudo.
-    Style::resolveTree(*existingPseudoElement, needsStyleRecalc() ? Style::Force : change);
-
-    // FIXME: This is silly.
-    // Wait until our parent is not displayed or pseudoElementRendererIsNeeded
-    // is false, otherwise we could continously create and destroy PseudoElements
-    // when RenderElement::isChildAllowed on our parent returns false for the
-    // PseudoElement's renderer for each style recalc.
-    return renderer() && pseudoElementRendererIsNeeded(existingPseudoElement->renderStyle());
-}
-
-PassRefPtr<PseudoElement> Element::createPseudoElementIfNeeded(PseudoId pseudoId)
-{
-    if (!document().styleSheetCollection().usesBeforeAfterRules())
-        return 0;
-    if (!renderer() || !renderer()->canHaveGeneratedChildren())
-        return 0;
-    if (isPseudoElement())
-        return 0;
-    if (!pseudoElementRendererIsNeeded(renderer()->getCachedPseudoStyle(pseudoId)))
-        return 0;
-    RefPtr<PseudoElement> pseudoElement = PseudoElement::create(*this, pseudoId);
-    Style::attachRenderTree(*pseudoElement);
-    return pseudoElement.release();
-}
-
-void Element::updateBeforePseudoElement(Style::Change change)
-{
-    if (PseudoElement* existingPseudoElement = beforePseudoElement()) {
-        if (!updateExistingPseudoElement(existingPseudoElement, change))
-            clearBeforePseudoElement();
-        return;
-    }
-    if (RefPtr<PseudoElement> pseudo = createPseudoElementIfNeeded(BEFORE))
-        setBeforePseudoElement(pseudo.release());
-}
-
-void Element::updateAfterPseudoElement(Style::Change change)
-{
-    if (PseudoElement* existingPseudoElement = afterPseudoElement()) {
-        if (!updateExistingPseudoElement(existingPseudoElement, change))
-            clearAfterPseudoElement();
-        return;
-    }
-    if (RefPtr<PseudoElement> pseudo = createPseudoElementIfNeeded(AFTER))
-        setAfterPseudoElement(pseudo.release());
-}
-
 PseudoElement* Element::beforePseudoElement() const
 {

trunk/Source/WebCore/dom/Element.h

@@ -552 +552 @@
     virtual void didDetachRenderers();
 
-    void updateBeforePseudoElement(Style::Change);
-    void updateAfterPseudoElement(Style::Change);
+    void setBeforePseudoElement(PassRefPtr<PseudoElement>);
+    void setAfterPseudoElement(PassRefPtr<PseudoElement>);
+    void clearBeforePseudoElement();
+    void clearAfterPseudoElement();
     void resetComputedStyle();
     void clearStyleDerivedDataBeforeDetachingRenderer();
@@ -591 +593 @@
     bool isUserActionElementHovered() const;
 
-    PassRefPtr<PseudoElement> createPseudoElementIfNeeded(PseudoId);
-    bool updateExistingPseudoElement(PseudoElement* existing, Style::Change);
-
-    void setBeforePseudoElement(PassRefPtr<PseudoElement>);
-    void setAfterPseudoElement(PassRefPtr<PseudoElement>);
-    void clearBeforePseudoElement();
-    void clearAfterPseudoElement();
     void resetNeedsNodeRenderingTraversalSlowPath();
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -468 +468 @@
 }
 
+static PseudoElement* beforeOrAfterPseudoElement(Element& current, PseudoId pseudoId)
+{
+    ASSERT(pseudoId == BEFORE || pseudoId == AFTER);
+    if (pseudoId == BEFORE)
+        return current.beforePseudoElement();
+    return current.afterPseudoElement();
+}
+
+static void setBeforeOrAfterPseudoElement(Element& current, PassRefPtr<PseudoElement> pseudoElement, PseudoId pseudoId)
+{
+    ASSERT(pseudoId == BEFORE || pseudoId == AFTER);
+    if (pseudoId == BEFORE) {
+        current.setBeforePseudoElement(pseudoElement);
+        return;
+    }
+    current.setAfterPseudoElement(pseudoElement);
+}
+
+static void clearBeforeOrAfterPseudoElement(Element& current, PseudoId pseudoId)
+{
+    ASSERT(pseudoId == BEFORE || pseudoId == AFTER);
+    if (pseudoId == BEFORE) {
+        current.clearBeforePseudoElement();
+        return;
+    }
+    current.clearAfterPseudoElement();
+}
+
+static bool needsPseudeElement(Element& current, PseudoId pseudoId)
+{
+    if (!current.document().styleSheetCollection().usesBeforeAfterRules())
+        return false;
+    if (!current.renderer() || !current.renderer()->canHaveGeneratedChildren())
+        return false;
+    if (current.isPseudoElement())
+        return false;
+    if (!pseudoElementRendererIsNeeded(current.renderer()->getCachedPseudoStyle(pseudoId)))
+        return false;
+    return true;
+}
+
+static void attachBeforeOrAfterPseudoElementIfNeeded(Element& current, PseudoId pseudoId)
+{
+    if (!needsPseudeElement(current, pseudoId))
+        return;
+    RefPtr<PseudoElement> pseudoElement = PseudoElement::create(current, pseudoId);
+    setBeforeOrAfterPseudoElement(current, pseudoElement, pseudoId);
+    attachRenderTree(*pseudoElement, nullptr);
+}
+
 static void attachRenderTree(Element& current, PassRefPtr<RenderStyle> resolvedStyle)
 {
@@ -481 +531 @@
         current.setIsInCanvasSubtree(true);
 
-    current.updateBeforePseudoElement(NoChange);
+    attachBeforeOrAfterPseudoElementIfNeeded(current, BEFORE);
 
     StyleResolverParentPusher parentPusher(&current);
@@ -500 +550 @@
         cache->updateCacheAfterNodeIsAttached(&current);
 
-    current.updateAfterPseudoElement(NoChange);
+    attachBeforeOrAfterPseudoElementIfNeeded(current, AFTER);
 
     current.updateFocusAppearanceAfterAttachIfNeeded();
@@ -675 +725 @@
 }
 
+static void updateBeforeOrAfterPseudoElement(Element& current, Change change, PseudoId pseudoId)
+{
+    if (PseudoElement* existingPseudoElement = beforeOrAfterPseudoElement(current, pseudoId)) {
+        if (needsPseudeElement(current, pseudoId))
+            resolveTree(*existingPseudoElement, current.needsStyleRecalc() ? Force : change);
+        else
+            clearBeforeOrAfterPseudoElement(current, pseudoId);
+        return;
+    }
+    attachBeforeOrAfterPseudoElementIfNeeded(current, pseudoId);
+}
+
 #if PLATFORM(IOS)
 static EVisibility elementImplicitVisibility(const Element* element)
@@ -763 +825 @@
         }
 
-        current.updateBeforePseudoElement(change);
+        updateBeforeOrAfterPseudoElement(current, change, BEFORE);
 
         // FIXME: This check is good enough for :hover + foo, but it is not good enough for :hover + foo + bar.
@@ -789 +851 @@
         }
 
-        current.updateAfterPseudoElement(change);
+        updateBeforeOrAfterPseudoElement(current, change, AFTER);
     }