Changeset 431 for trunk/WebCore/dom/Element.cpp
- Timestamp:
- 08/06/08 13:29:36 (5 months ago)
- Files:
-
- trunk/WebCore/dom/Element.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/WebCore/dom/Element.cpp
r418 r431 786 786 } 787 787 788 if (ch != NoChange) 788 if (ch != NoChange) { 789 789 setRenderStyle(newStyle); 790 else if (changed() && (document()->usesSiblingRules() || document()->usesDescendantRules())) {790 } else if (changed() && (styleChangeType() != AnimationStyleChange) && (document()->usesSiblingRules() || document()->usesDescendantRules())) { 791 791 // Although no change occurred, we use the new style so that the cousin style sharing code won't get 792 792 // fooled into believing this style is the same. This is only necessary if the document actually uses … … 797 797 else 798 798 setRenderStyle(newStyle); 799 } 799 } else if (styleChangeType() == AnimationStyleChange) 800 setRenderStyle(newStyle); 800 801 801 802 newStyle->deref(document()->renderArena()); 802 803 803 804 if (change != Force) { 804 if ((document()->usesDescendantRules() || hasPositionalRules) && styleChangeType() == FullStyleChange)805 if ((document()->usesDescendantRules() || hasPositionalRules) && styleChangeType() >= FullStyleChange) 805 806 change = Force; 806 807 else
