Changeset 160536 in webkit

Timestamp:

Dec 13, 2013 1:14:30 AM (10 years ago)

Author:

Darin Adler

Message:

Eliminate awkward virtualComputedStyle construction
​https://bugs.webkit.org/show_bug.cgi?id=125681

Reviewed by Andreas Kling.

• dom/Element.cpp:

(WebCore::Element::computedStyle): Tweak coding style a bit.

• dom/Element.h: Marked computedStyle virtual and got rid of virtualComputedStyle.

This fixes a bug that we would not call SVGElement::computedStyle if we called
it through an Element pointer or reference. Not sure how to get test coverage for this.

• dom/Node.cpp:

(WebCore::Node::computedStyle): Use a loop instead of recursive virtual calls.

• dom/Node.h: Made computedStyle virtual and got rid of virtualComputedStyle.

• svg/SVGElement.cpp:

(WebCore::SVGElement::computedStyle): Tweak coding style a bit.

• svg/SVGElement.h: Made computedStyle virtual (and FINAL) and got rid fo

virtualComputedStyle.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (2 diffs)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-13  Darin Adler  <darin@apple.com>
+
+        Eliminate awkward virtualComputedStyle construction
+        https://bugs.webkit.org/show_bug.cgi?id=125681
+
+        Reviewed by Andreas Kling.
+
+        * dom/Element.cpp:
+        (WebCore::Element::computedStyle): Tweak coding style a bit.
+
+        * dom/Element.h: Marked computedStyle virtual and got rid of virtualComputedStyle.
+        This fixes a bug that we would not call SVGElement::computedStyle if we called
+        it through an Element pointer or reference. Not sure how to get test coverage for this.
+
+        * dom/Node.cpp:
+        (WebCore::Node::computedStyle): Use a loop instead of recursive virtual calls.
+
+        * dom/Node.h: Made computedStyle virtual and got rid of virtualComputedStyle.
+
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::computedStyle): Tweak coding style a bit.
+
+        * svg/SVGElement.h: Made computedStyle virtual (and FINAL) and got rid fo
+        virtualComputedStyle.
+
 2013-12-13  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2155 +2155 @@
             RenderStyle* cachedPseudoStyle = usedStyle->getCachedPseudoStyle(pseudoElementSpecifier);
             return cachedPseudoStyle ? cachedPseudoStyle : usedStyle;
-         } else
-            return usedStyle;
-    }
-
-    if (!attached())
+        }
+        return usedStyle;
+    }
+
+    if (!attached()) {
         // FIXME: Try to do better than this. Ensure that styleForElement() works for elements that are not in the
         // document tree and figure out when to destroy the computed style for such elements.
-        return 0;
+        return nullptr;
+    }
 
     ElementRareData& data = ensureElementRareData();

trunk/Source/WebCore/dom/Element.h

@@ -341 +341 @@
     virtual Element* focusDelegate();
 
-    RenderStyle* computedStyle(PseudoId = NOPSEUDO);
+    virtual RenderStyle* computedStyle(PseudoId = NOPSEUDO) OVERRIDE;
 
     // Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
@@ -637 +637 @@
     void cancelFocusAppearanceUpdate();
 
-    virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) OVERRIDE { return computedStyle(pseudoElementSpecifier); }
-    
     // cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
     // are used instead.

trunk/Source/WebCore/dom/Node.cpp

@@ -885 +885 @@
 }
 
-RenderStyle* Node::virtualComputedStyle(PseudoId pseudoElementSpecifier)
-{
-    return parentOrShadowHostNode() ? parentOrShadowHostNode()->computedStyle(pseudoElementSpecifier) : 0;
+RenderStyle* Node::computedStyle(PseudoId pseudoElementSpecifier)
+{
+    for (Node* node = this; node; node = node->parentOrShadowHostNode()) {
+        if (node->isElementNode())
+            return toElement(node)->computedStyle(pseudoElementSpecifier);
+    }
+    return nullptr;
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -453 +453 @@
     RenderStyle* renderStyle() const;
 
-    RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) { return virtualComputedStyle(pseudoElementSpecifier); }
+    virtual RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO);
 
     // -----------------------------------------------------------------------------
@@ -665 +665 @@
 
     virtual RenderStyle* nonRendererStyle() const { return 0; }
-    virtual RenderStyle* virtualComputedStyle(PseudoId = NOPSEUDO);
 
     Element* ancestorElement() const;

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -783 +783 @@
         return Element::computedStyle(pseudoElementSpecifier);
 
-    RenderStyle* parentStyle = 0;
+    RenderStyle* parentStyle = nullptr;
     if (Element* parent = parentOrShadowHostElement()) {
         if (auto renderer = parent->renderer())

trunk/Source/WebCore/svg/SVGElement.h

@@ -172 +172 @@
     virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
 
-    RenderStyle* computedStyle(PseudoId = NOPSEUDO);
-    virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) OVERRIDE { return computedStyle(pseudoElementSpecifier); }
+    virtual RenderStyle* computedStyle(PseudoId = NOPSEUDO) OVERRIDE FINAL;
     virtual bool willRecalcStyle(Style::Change) OVERRIDE;