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/editing/DeleteButtonController.cpp

    r308 r437  
    196196    style->setProperty(CSSPropertyHeight, String::number(buttonHeight) + "px"); 
    197197 
    198     Image* buttonImage = Image::loadPlatformResource("deleteButton"); 
    199     if (buttonImage->isNull()) { 
    200         delete buttonImage; 
    201         return; 
    202     } 
    203      
    204     button->setCachedImage(new CachedImage(buttonImage)); 
     198    RefPtr<Image> buttonImage = Image::loadPlatformResource("deleteButton"); 
     199    if (buttonImage->isNull()) 
     200        return; 
     201 
     202    button->setCachedImage(new CachedImage(buttonImage.get())); 
    205203 
    206204    container->appendChild(button.get(), ec);