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/BAL/WKAL/Concretizations/Graphics/Gtk/BCImageGtk.cpp

    r243 r437  
    2727 
    2828#include "BitmapImage.h" 
    29 #include "Image.h" 
    30 #include "NotImplemented.h" 
    3129 
    3230// This function loads resources from WebKit 
    …… 
    4341} 
    4442 
    45 Image* Image::loadPlatformResource(const char *name) 
     43PassRefPtr<Image> Image::loadPlatformResource(const char *name) 
    4644{ 
    4745    Vector<char> arr = loadResourceIntoArray(name); 
    48     BitmapImage* img = new BitmapImage; 
     46    RefPtr<BitmapImage> img = BitmapImage::create(); 
    4947    RefPtr<SharedBuffer> buffer = SharedBuffer::create(arr.data(), arr.size()); 
    5048    img->setData(buffer, true); 
    51     return img; 
     49    return img.release(); 
    5250} 
     51 
    5352}