Show
Ignore:
Timestamp:
08/06/08 13:29:36 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35588

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/dom/Node.cpp

    r427 r431  
    413413        return; 
    414414 
    415     if (!(changeType == InlineStyleChange && m_styleChange == FullStyleChange)) 
     415    if (!(changeType == InlineStyleChange && (m_styleChange == FullStyleChange || m_styleChange == AnimationStyleChange))) 
    416416        m_styleChange = changeType; 
    417417