Changeset 172591 in webkit

Timestamp:

Aug 14, 2014, 10:49:55 AM (11 years ago)

Author:

Antti Koivisto

Message:

Remove nonRendererStyle
​https://bugs.webkit.org/show_bug.cgi?id=135938

Reviewed by Andreas Kling.

It is used to support styling of non-renderer option elements. We have a better
mechanism for this, Element::computedStyle().

• dom/Element.cpp:

(WebCore::Element::resetComputedStyle):
(WebCore::Element::willResetComputedStyle):

Add a virtual callback for computed style reset.

• dom/Element.h:
• dom/Node.h:

(WebCore::Node::nonRendererStyle): Deleted.

• dom/NodeRenderStyle.h:

(WebCore::Node::renderStyle):

renderStyle() now always matches renderer()->style()

• html/HTMLOptGroupElement.cpp:

(WebCore::HTMLOptGroupElement::HTMLOptGroupElement):
(WebCore::HTMLOptGroupElement::isFocusable):
(WebCore::HTMLOptGroupElement::didAttachRenderers): Deleted.
(WebCore::HTMLOptGroupElement::willDetachRenderers): Deleted.
(WebCore::HTMLOptGroupElement::updateNonRenderStyle): Deleted.
(WebCore::HTMLOptGroupElement::nonRendererStyle): Deleted.
(WebCore::HTMLOptGroupElement::customStyleForRenderer): Deleted.

• html/HTMLOptGroupElement.h:
• html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::isFocusable):

Use computedStyle.

(WebCore::HTMLOptionElement::willResetComputedStyle):
(WebCore::HTMLOptionElement::didAttachRenderers): Deleted.
(WebCore::HTMLOptionElement::willDetachRenderers): Deleted.
(WebCore::HTMLOptionElement::updateNonRenderStyle): Deleted.
(WebCore::HTMLOptionElement::nonRendererStyle): Deleted.
(WebCore::HTMLOptionElement::customStyleForRenderer): Deleted.
(WebCore::HTMLOptionElement::didRecalcStyle): Deleted.

• html/HTMLOptionElement.h:
• rendering/RenderMenuList.cpp:

(RenderMenuList::updateOptionsWidth):
(RenderMenuList::setTextFromOption):

Use computedStyle.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Element.h (modified) (1 diff)
• dom/Node.h (modified) (1 diff)
• dom/NodeRenderStyle.h (modified) (1 diff)
• html/HTMLOptGroupElement.cpp (modified) (3 diffs)
• html/HTMLOptGroupElement.h (modified) (2 diffs)
• html/HTMLOptionElement.cpp (modified) (2 diffs)
• html/HTMLOptionElement.h (modified) (3 diffs)
• rendering/RenderMenuList.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-14  Antti Koivisto  <antti@apple.com>
+
+        Remove nonRendererStyle
+        https://bugs.webkit.org/show_bug.cgi?id=135938
+
+        Reviewed by Andreas Kling.
+
+        It is used to support styling of non-renderer option elements. We have a better
+        mechanism for this, Element::computedStyle().
+
+        * dom/Element.cpp:
+        (WebCore::Element::resetComputedStyle):
+        (WebCore::Element::willResetComputedStyle):
+        
+            Add a virtual callback for computed style reset.
+
+        * dom/Element.h:
+        * dom/Node.h:
+        (WebCore::Node::nonRendererStyle): Deleted.
+        * dom/NodeRenderStyle.h:
+        (WebCore::Node::renderStyle):
+        
+            renderStyle() now always matches renderer()->style()
+
+        * html/HTMLOptGroupElement.cpp:
+        (WebCore::HTMLOptGroupElement::HTMLOptGroupElement):
+        (WebCore::HTMLOptGroupElement::isFocusable):
+        (WebCore::HTMLOptGroupElement::didAttachRenderers): Deleted.
+        (WebCore::HTMLOptGroupElement::willDetachRenderers): Deleted.
+        (WebCore::HTMLOptGroupElement::updateNonRenderStyle): Deleted.
+        (WebCore::HTMLOptGroupElement::nonRendererStyle): Deleted.
+        (WebCore::HTMLOptGroupElement::customStyleForRenderer): Deleted.
+        * html/HTMLOptGroupElement.h:
+        * html/HTMLOptionElement.cpp:
+        (WebCore::HTMLOptionElement::isFocusable):
+        
+            Use computedStyle.
+
+        (WebCore::HTMLOptionElement::willResetComputedStyle):
+        (WebCore::HTMLOptionElement::didAttachRenderers): Deleted.
+        (WebCore::HTMLOptionElement::willDetachRenderers): Deleted.
+        (WebCore::HTMLOptionElement::updateNonRenderStyle): Deleted.
+        (WebCore::HTMLOptionElement::nonRendererStyle): Deleted.
+        (WebCore::HTMLOptionElement::customStyleForRenderer): Deleted.
+        (WebCore::HTMLOptionElement::didRecalcStyle): Deleted.
+        * html/HTMLOptionElement.h:
+        * rendering/RenderMenuList.cpp:
+        (RenderMenuList::updateOptionsWidth):
+        (RenderMenuList::setTextFromOption):
+        
+            Use computedStyle.
+
 2014-08-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2862 +2862 @@
     if (!hasRareData() || !elementRareData()->computedStyle())
         return;
-    elementRareData()->resetComputedStyle();
-    for (auto& child : descendantsOfType<Element>(*this)) {
-        if (child.hasRareData())
-            child.elementRareData()->resetComputedStyle();
-    }
+
+    auto reset = [](Element& element) {
+        if (!element.hasRareData() || !element.elementRareData()->computedStyle())
+            return;
+        if (element.hasCustomStyleResolveCallbacks())
+            element.willResetComputedStyle();
+        element.elementRareData()->resetComputedStyle();
+    };
+    reset(*this);
+    for (auto& child : descendantsOfType<Element>(*this))
+        reset(child);
 }
 
@@ -2900 +2906 @@
 
 void Element::didRecalcStyle(Style::Change)
+{
+    ASSERT(hasCustomStyleResolveCallbacks());
+}
+
+void Element::willResetComputedStyle()
 {
     ASSERT(hasCustomStyleResolveCallbacks());

trunk/Source/WebCore/dom/Element.h

@@ -547 +547 @@
     virtual bool willRecalcStyle(Style::Change);
     virtual void didRecalcStyle(Style::Change);
+    virtual void willResetComputedStyle();
     virtual void willAttachRenderers();
     virtual void didAttachRenderers();

trunk/Source/WebCore/dom/Node.h

@@ -687 +687 @@
     virtual void derefEventTarget() override;
 
-    virtual RenderStyle* nonRendererStyle() const { return nullptr; }
-
     Element* ancestorElement() const;
 

trunk/Source/WebCore/dom/NodeRenderStyle.h

@@ -35 +35 @@
 inline RenderStyle* Node::renderStyle() const
 {
-    // Using a ternary here confuses the Solaris Studio 12/12.1/12.2 compilers:
-    // Bug is CR 6569194, "Problem with question operator binding in inline function"
-    if (RenderObject* renderer = this->renderer())
-        return &renderer->style();
-    return nonRendererStyle();
+    auto* renderer = this->renderer();
+    if (!renderer)
+        return nullptr;
+    return &renderer->style();
 }
 

trunk/Source/WebCore/html/HTMLOptGroupElement.cpp

@@ -42 +42 @@
 {
     ASSERT(hasTagName(optgroupTag));
-    setHasCustomStyleResolveCallbacks();
 }
 
@@ -57 +56 @@
 bool HTMLOptGroupElement::isFocusable() const
 {
-    // Optgroup elements do not have a renderer so we check the renderStyle instead.
-    return supportsFocus() && renderStyle() && renderStyle()->display() != NONE;
+    if (!supportsFocus())
+        return false;
+    // Optgroup elements do not have a renderer.
+    auto* style = const_cast<HTMLOptGroupElement&>(*this).computedStyle();
+    return style && style->display() != NONE;
 }
 
@@ -89 +91 @@
     if (select)
         toHTMLSelectElement(select)->setRecalcListItems();
-}
-
-void HTMLOptGroupElement::didAttachRenderers()
-{
-    // If after attaching nothing called styleForRenderer() on this node we
-    // manually cache the value. This happens if our parent doesn't have a
-    // renderer like <optgroup> or if it doesn't allow children like <select>.
-    if (!m_style && parentNode()->renderStyle())
-        updateNonRenderStyle(*parentNode()->renderStyle());
-}
-
-void HTMLOptGroupElement::willDetachRenderers()
-{
-    m_style.clear();
-}
-
-void HTMLOptGroupElement::updateNonRenderStyle(RenderStyle& parentStyle)
-{
-    m_style = document().ensureStyleResolver().styleForElement(this, &parentStyle);
-}
-
-RenderStyle* HTMLOptGroupElement::nonRendererStyle() const
-{
-    return m_style.get();
-}
-
-PassRefPtr<RenderStyle> HTMLOptGroupElement::customStyleForRenderer(RenderStyle& parentStyle)
-{
-    // styleForRenderer is called whenever a new style should be associated
-    // with an Element so now is a good time to update our cached style.
-    updateNonRenderStyle(parentStyle);
-    return m_style;
 }
 

trunk/Source/WebCore/html/HTMLOptGroupElement.h

@@ -47 +47 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
     virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
-    virtual void didAttachRenderers() override;
-    virtual void willDetachRenderers() override;
 
     virtual void childrenChanged(const ChildChange&) override;
@@ -54 +52 @@
     virtual void accessKeyAction(bool sendMouseEvents) override;
 
-    // <optgroup> never has a renderer so we manually manage a cached style.
-    void updateNonRenderStyle(RenderStyle& parentStyle);
-    virtual RenderStyle* nonRendererStyle() const override;
-    virtual PassRefPtr<RenderStyle> customStyleForRenderer(RenderStyle& parentStyle) override;
-
     void recalcSelectOptions();
-
-    RefPtr<RenderStyle> m_style;
 };
 

trunk/Source/WebCore/html/HTMLOptionElement.cpp

@@ -89 +89 @@
 }
 
-void HTMLOptionElement::didAttachRenderers()
-{
-    // If after attaching nothing called styleForRenderer() on this node we
-    // manually cache the value. This happens if our parent doesn't have a
-    // renderer like <optgroup> or if it doesn't allow children like <select>.
-    if (!m_style && parentNode()->renderStyle())
-        updateNonRenderStyle(*parentNode()->renderStyle());
-}
-
-void HTMLOptionElement::willDetachRenderers()
-{
-    m_style.clear();
-}
-
 bool HTMLOptionElement::isFocusable() const
 {
-    // Option elements do not have a renderer so we check the renderStyle instead.
-    return supportsFocus() && renderStyle() && renderStyle()->display() != NONE;
+    if (!supportsFocus())
+        return false;
+    // Option elements do not have a renderer.
+    auto* style = const_cast<HTMLOptionElement&>(*this).computedStyle();
+    return style && style->display() != NONE;
 }
 
@@ -301 +290 @@
 }
 
-void HTMLOptionElement::updateNonRenderStyle(RenderStyle& parentStyle)
-{
-    m_style = document().ensureStyleResolver().styleForElement(this, &parentStyle);
-}
-
-RenderStyle* HTMLOptionElement::nonRendererStyle() const
-{
-    return m_style.get();
-}
-
-PassRefPtr<RenderStyle> HTMLOptionElement::customStyleForRenderer(RenderStyle& parentStyle)
-{
-    // styleForRenderer is called whenever a new style should be associated
-    // with an Element so now is a good time to update our cached style.
-    updateNonRenderStyle(parentStyle);
-    return m_style;
-}
-
-void HTMLOptionElement::didRecalcStyle(Style::Change)
+void HTMLOptionElement::willResetComputedStyle()
 {
     // FIXME: This is nasty, we ask our owner select to repaint even if the new

trunk/Source/WebCore/html/HTMLOptionElement.h

@@ -72 +72 @@
     virtual bool isFocusable() const override;
     virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
-    virtual void didAttachRenderers() override;
-    virtual void willDetachRenderers() override;
 
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
@@ -82 +80 @@
     virtual void childrenChanged(const ChildChange&) override;
 
-    // <option> never has a renderer so we manually manage a cached style.
-    void updateNonRenderStyle(RenderStyle& parentStyle);
-    virtual RenderStyle* nonRendererStyle() const override;
-    virtual PassRefPtr<RenderStyle> customStyleForRenderer(RenderStyle& parentStyle) override;
-
-    virtual void didRecalcStyle(Style::Change) override;
+    virtual void willResetComputedStyle() override;
 
     String collectOptionInnerText() const;
@@ -93 +86 @@
     bool m_disabled;
     bool m_isSelected;
-    RefPtr<RenderStyle> m_style;
 };
 

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -223 +223 @@
             // Add in the option's text indent.  We can't calculate percentage values for now.
             float optionWidth = 0;
-            if (RenderStyle* optionStyle = element->renderStyle())
+            if (RenderStyle* optionStyle = element->computedStyle())
                 optionWidth += minimumValueForLength(optionStyle->textIndent(), 0);
             if (!text.isEmpty()) {
@@ -273 +273 @@
         if (isHTMLOptionElement(element)) {
             text = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
-            m_optionStyle = element->renderStyle();
+            m_optionStyle = element->computedStyle();
         }
     }