Changeset 27576 in webkit

Timestamp:

Nov 7, 2007, 10:52:09 AM (18 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix a bug where CSS rules with :hover in the ancestor chain stopped working after changing the inline style declaration of the ancestor

Test: fast/css/affected-by-hover-after-style-change.html

• dom/Element.cpp: (WebCore::Element::recalcStyle): If we are not forcing style recalculation for all descendants, preserve any "affected by {hover|active|drag} bits that we may have acquired from them. Also renamed _style to currentStyle.

WebKitSite:

Reviewed by Darin Adler.

• removed a workaround for the bug fixed in the WebCore part of this patch

• misc/DatabaseExample.html:

LayoutTests:

Reviewed by Darin Adler.

• test that CSS rules with :hover in the ancestor chain continue to work after changing the inline style declaration of the ancestor

• fast/css/affected-by-hover-after-style-change.html: Added.
• platform/mac/fast/css/affected-by-hover-after-style-change-expected.checksum: Added.
• platform/mac/fast/css/affected-by-hover-after-style-change-expected.png: Added.
• platform/mac/fast/css/affected-by-hover-after-style-change-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/affected-by-hover-after-style-change.html (added)
• LayoutTests/platform/mac/fast/css/affected-by-hover-after-style-change-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/affected-by-hover-after-style-change-expected.png (added)
• LayoutTests/platform/mac/fast/css/affected-by-hover-after-style-change-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (3 diffs)
• WebKitSite/ChangeLog (modified) (1 diff)
• WebKitSite/misc/DatabaseExample.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-11-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test that CSS rules with :hover in the ancestor chain continue to work
+          after changing the inline style declaration of the ancestor
+
+        * fast/css/affected-by-hover-after-style-change.html: Added.
+        * platform/mac/fast/css/affected-by-hover-after-style-change-expected.checksum: Added.
+        * platform/mac/fast/css/affected-by-hover-after-style-change-expected.png: Added.
+        * platform/mac/fast/css/affected-by-hover-after-style-change-expected.txt: Added.
+
 2007-11-06  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix a bug where CSS rules with :hover in the ancestor chain stopped
+          working after changing the inline style declaration of the ancestor
+
+        Test: fast/css/affected-by-hover-after-style-change.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::recalcStyle): If we are not forcing style
+        recalculation for all descendants, preserve any "affected by
+        {hover|active|drag} bits that we may have acquired from them.
+        Also renamed _style to currentStyle.
+
 2007-11-06  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/dom/Element.cpp

@@ -698 +698 @@
 {
     // ### should go away and be done in renderobject
-    RenderStyle* _style = renderStyle();
+    RenderStyle* currentStyle = renderStyle();
     bool hasParentStyle = parentNode() ? parentNode()->renderStyle() : false;
 
@@ -712 +712 @@
     if (hasParentStyle && (change >= Inherit || changed())) {
         RenderStyle *newStyle = document()->styleSelector()->styleForElement(this);
-        StyleChange ch = diff(_style, newStyle);
+        StyleChange ch = diff(currentStyle, newStyle);
         if (ch == Detach) {
             if (attached())
@@ -724 +724 @@
             return;
         }
-        else if (ch != NoChange) {
+
+        if (newStyle && change != Force && styleChangeType() != FullStyleChange && document()->usesDescendantRules()) {
+            // Preserve "affected by" bits that were propagated to us from descendants
+            if (currentStyle->affectedByHoverRules())
+                newStyle->setAffectedByHoverRules(true);
+            if (currentStyle->affectedByActiveRules())
+                newStyle->setAffectedByActiveRules(true);
+            if (currentStyle->affectedByDragRules())
+                newStyle->setAffectedByDragRules(true);
+        }
+
+        if (ch != NoChange) {
             if (newStyle)
                 setRenderStyle(newStyle);
-        }
-        else if (changed() && newStyle && (document()->usesSiblingRules() || document()->usesDescendantRules())) {
+        } else if (changed() && newStyle && (document()->usesSiblingRules() || document()->usesDescendantRules())) {
             // Although no change occurred, we use the new style so that the cousin style sharing code won't get
             // fooled into believing this style is the same.  This is only necessary if the document actually uses

trunk/WebKitSite/ChangeLog

@@ +1 @@
+2007-11-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - removed a workaround for the bug fixed in the WebCore part of this
+          patch
+
+        * misc/DatabaseExample.html:
+
 2007-11-04  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebKitSite/misc/DatabaseExample.html

@@ -17 +17 @@
 }
 
-/* FIXME: this empty rule works around a bug in our css handling */
-.note:hover { }
 .note:hover .closebutton {
     display: block;