Changeset 122302 in webkit

Timestamp:

Jul 10, 2012 11:23:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Style not updated for element with display:none becoming first/last-child
​https://bugs.webkit.org/show_bug.cgi?id=90356

Patch by Douglas Stockwell <​dstockwell@chromium.org> on 2012-07-10
Reviewed by Kent Tamura.

Source/WebCore:

Always trigger style recalc when an element without a renderer becomes the first/last-child.

Tests: fast/css/first-child-display-change.html

fast/css/last-child-display-change.html

• dom/Element.cpp:

(WebCore::checkForSiblingStyleChanges):

LayoutTests:

• fast/css/first-child-display-change-expected.txt: Added.
• fast/css/first-child-display-change-inverse-expected.txt: Added.
• fast/css/first-child-display-change-inverse.html: Added.
• fast/css/first-child-display-change.html: Added.
• fast/css/last-child-display-change-expected.txt: Added.
• fast/css/last-child-display-change-inverse-expected.txt: Added.
• fast/css/last-child-display-change-inverse.html: Added.
• fast/css/last-child-display-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/first-child-display-change-expected.txt (added)
• LayoutTests/fast/css/first-child-display-change-inverse-expected.txt (added)
• LayoutTests/fast/css/first-child-display-change-inverse.html (added)
• LayoutTests/fast/css/first-child-display-change.html (added)
• LayoutTests/fast/css/last-child-display-change-expected.txt (added)
• LayoutTests/fast/css/last-child-display-change-inverse-expected.txt (added)
• LayoutTests/fast/css/last-child-display-change-inverse.html (added)
• LayoutTests/fast/css/last-child-display-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-10  Douglas Stockwell  <dstockwell@chromium.org>
+
+        Style not updated for element with display:none becoming first/last-child
+        https://bugs.webkit.org/show_bug.cgi?id=90356
+
+        Reviewed by Kent Tamura.
+
+        * fast/css/first-child-display-change-expected.txt: Added.
+        * fast/css/first-child-display-change-inverse-expected.txt: Added.
+        * fast/css/first-child-display-change-inverse.html: Added.
+        * fast/css/first-child-display-change.html: Added.
+        * fast/css/last-child-display-change-expected.txt: Added.
+        * fast/css/last-child-display-change-inverse-expected.txt: Added.
+        * fast/css/last-child-display-change-inverse.html: Added.
+        * fast/css/last-child-display-change.html: Added.
+
 2012-07-10  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Douglas Stockwell  <dstockwell@chromium.org>
+
+        Style not updated for element with display:none becoming first/last-child
+        https://bugs.webkit.org/show_bug.cgi?id=90356
+
+        Reviewed by Kent Tamura.
+
+        Always trigger style recalc when an element without a renderer becomes the first/last-child.
+
+        Tests: fast/css/first-child-display-change.html
+               fast/css/last-child-display-change.html
+
+        * dom/Element.cpp:
+        (WebCore::checkForSiblingStyleChanges):
+
 2012-07-10  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1257 +1257 @@
             
         // We also have to handle node removal.
-        if (childCountDelta < 0 && newFirstChild == firstElementAfterInsertion && newFirstChild && newFirstChild->renderStyle() && !newFirstChild->renderStyle()->firstChildState())
+        if (childCountDelta < 0 && newFirstChild == firstElementAfterInsertion && newFirstChild && (!newFirstChild->renderStyle() || !newFirstChild->renderStyle()->firstChildState()))
             newFirstChild->setNeedsStyleRecalc();
     }
@@ -1280 +1280 @@
         // We also have to handle node removal.  The parser callback case is similar to node removal as well in that we need to change the last child
         // to match now.
-        if ((childCountDelta < 0 || finishedParsingCallback) && newLastChild == lastElementBeforeInsertion && newLastChild && newLastChild->renderStyle() && !newLastChild->renderStyle()->lastChildState())
+        if ((childCountDelta < 0 || finishedParsingCallback) && newLastChild == lastElementBeforeInsertion && newLastChild && (!newLastChild->renderStyle() || !newLastChild->renderStyle()->lastChildState()))
             newLastChild->setNeedsStyleRecalc();
     }