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/SDL/BCBitmapImageSDL.h

    r243 r437  
    8181    friend class GraphicsContext; 
    8282public: 
    83     BitmapImage(BalSurface*, ImageObserver* = 0); 
    84     BitmapImage(ImageObserver* = 0); 
     83    static PassRefPtr<BitmapImage> create(NativeImagePtr nativeImage, ImageObserver* observer = 0) 
     84    { 
     85        return adoptRef(new BitmapImage(nativeImage, observer)); 
     86    } 
     87    static PassRefPtr<BitmapImage> create(ImageObserver* observer = 0) 
     88    { 
     89        return adoptRef(new BitmapImage(observer)); 
     90    } 
     91 
    8592    ~BitmapImage(); 
     93 
     94    virtual bool isBitmapImage() const { return true; } 
    8695     
    8796    virtual IntSize size() const; 
     97    IntSize currentFrameSize() const; 
    8898 
    8999    virtual bool dataChanged(bool allDataReceived); 
     
    100110 
    101111protected: 
     112    BitmapImage(NativeImagePtr, ImageObserver* = 0); 
     113    BitmapImage(ImageObserver* = 0); 
    102114    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator); 
    103115    size_t currentFrame() const { return m_currentFrame; } 
     
    153165    bool m_sizeAvailable; // Whether or not we can obtain the size of the first image frame yet from ImageIO. 
    154166    unsigned m_decodedSize; // The current size of all decoded frames. 
     167    mutable bool m_hasUniformFrameSize; 
    155168 
    156169    mutable bool m_haveFrameCount;