Changeset 90691 in webkit

Timestamp:

Jul 10, 2011, 8:37:30 AM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9750062> REGRESSION: Button text missing in many iTunes Store pages
​https://bugs.webkit.org/show_bug.cgi?id=64236

Reviewed by Maciej Stachowiak.

Source/WebCore:

Test: fast/css/empty-display-none.html

When an :empty selector caused an element to not have a renderer, the check for empty style
change when finishing parsing the elemenet did nothing, because it could not check if the
element’s current style was affected by :empty. The fix is to record the fact that the style
was affected by :empty in ElementRareData in the no-renderer case.

• dom/Element.cpp:

(WebCore::Element::recalcStyle): Clear the m_styleAffectedByEmpty flag.
(WebCore::checkForEmptyStyleChange): If the style is null (meaning there is no renderer), check
Element::styleAffectedByEmpty().
(WebCore::Element::setStyleAffectedByEmpty): Added. Sets the flag in rare data.
(WebCore::Element::styleAffectedByEmpty): Added. Checks for the flag in rare data.

• dom/Element.h:
• dom/ElementRareData.h:

(WebCore::ElementRareData::ElementRareData): Added m_styleAffectedByEmpty and initialized it
to false.

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRendererFactory::createRendererAndStyle): If an element doesn’t need a renderer
and its style is affected by :empty, record this fact in the element by calling setStyleAffectedByEmpty().

LayoutTests:

• fast/css/empty-display-none-expected.txt: Added.
• fast/css/empty-display-none.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/empty-display-none-expected.txt (added)
• LayoutTests/fast/css/empty-display-none.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (3 diffs)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/ElementRareData.h (modified) (2 diffs)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-10  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/9750062> REGRESSION: Button text missing in many iTunes Store pages
+        https://bugs.webkit.org/show_bug.cgi?id=64236
+
+        Reviewed by Maciej Stachowiak.
+
+        * fast/css/empty-display-none-expected.txt: Added.
+        * fast/css/empty-display-none.html: Added.
+
 2011-07-08  Stephen White  <senorblanco@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-10  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/9750062> REGRESSION: Button text missing in many iTunes Store pages
+        https://bugs.webkit.org/show_bug.cgi?id=64236
+
+        Reviewed by Maciej Stachowiak.
+
+        Test: fast/css/empty-display-none.html
+
+        When an :empty selector caused an element to not have a renderer, the check for empty style
+        change when finishing parsing the elemenet did nothing, because it could not check if the
+        element’s current style was affected by :empty. The fix is to record the fact that the style
+        was affected by :empty in ElementRareData in the no-renderer case.
+
+        * dom/Element.cpp:
+        (WebCore::Element::recalcStyle): Clear the m_styleAffectedByEmpty flag.
+        (WebCore::checkForEmptyStyleChange): If the style is null (meaning there is no renderer), check
+        Element::styleAffectedByEmpty().
+        (WebCore::Element::setStyleAffectedByEmpty): Added. Sets the flag in rare data.
+        (WebCore::Element::styleAffectedByEmpty): Added. Checks for the flag in rare data.
+        * dom/Element.h:
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::ElementRareData): Added m_styleAffectedByEmpty and initialized it
+        to false.
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRendererFactory::createRendererAndStyle): If an element doesn’t need a renderer
+        and its style is affected by :empty, record this fact in the element by calling setStyleAffectedByEmpty().
+
 2011-07-10  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1103 +1103 @@
 
     if ((change > NoChange || needsStyleRecalc())) {
-        if (hasRareData())
-            rareData()->resetComputedStyle();
+        if (hasRareData()) {
+            ElementRareData* data = rareData();
+            data->resetComputedStyle();
+            data->m_styleAffectedByEmpty = false;
+        }
     }
     if (hasParentStyle && (change >= Inherit || needsStyleRecalc())) {
@@ -1302 +1305 @@
 static void checkForEmptyStyleChange(Element* element, RenderStyle* style)
 {
-    if (!style)
-        return;
-
-    if (style->affectedByEmpty() && (!style->emptyState() || element->hasChildNodes()))
+    if (!style && !element->styleAffectedByEmpty())
+        return;
+
+    if (!style || (style->affectedByEmpty() && (!style->emptyState() || element->hasChildNodes())))
         element->setNeedsStyleRecalc();
 }
@@ -1751 +1754 @@
 }
 
+void Element::setStyleAffectedByEmpty()
+{
+    ElementRareData* data = ensureRareData();
+    data->m_styleAffectedByEmpty = true;
+}
+
+bool Element::styleAffectedByEmpty() const
+{
+    return hasRareData() && rareData()->m_styleAffectedByEmpty;
+}
+
 AtomicString Element::computeInheritedLanguage() const
 {

trunk/Source/WebCore/dom/Element.h

@@ -241 +241 @@
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
 
+    void setStyleAffectedByEmpty();
+    bool styleAffectedByEmpty() const;
+
     AtomicString computeInheritedLanguage() const;
 

trunk/Source/WebCore/dom/ElementRareData.h

@@ -51 +51 @@
     OwnPtr<ClassList> m_classList;
 
+    bool m_styleAffectedByEmpty;
+
 #if ENABLE(FULLSCREEN_API)
     bool m_containsFullScreenElement;
@@ -64 +66 @@
     : m_minimumSizeForResizing(defaultMinimumSizeForResizing())
     , m_shadowRoot(0)
+    , m_styleAffectedByEmpty(false)
 #if ENABLE(FULLSCREEN_API)
     , m_containsFullScreenElement(false)

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -272 +272 @@
 
     m_context.setStyle(node->styleForRenderer(m_context));
-    if (!node->rendererIsNeeded(m_context))
-        return 0;
+    if (!node->rendererIsNeeded(m_context)) {
+        if (node->isElementNode()) {
+            Element* element = toElement(node);
+            if (m_context.style()->affectedByEmpty())
+                element->setStyleAffectedByEmpty();
+        }
+        return 0;
+    }
 
     RenderObject* newRenderer = node->createRenderer(document->renderArena(), m_context.style());