Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r434 r437  
    24012401                    } else if (childItem->isFontFaceRule() && styleSelector) { 
    24022402                        // Add this font face to our set. 
    2403                         const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(item); 
     2403                        const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(childItem); 
    24042404                        styleSelector->fontSelector()->addFontFaceRule(fontFaceRule); 
    24052405                    } else if (childItem->isKeyframesRule() && styleSelector) {