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/WK/BCBitmapImageWK.h

    r243 r437  
    9292    friend class GraphicsContext; 
    9393public: 
    94 #if PLATFORM(CG) 
    95     BitmapImage(CGImageRef, ImageObserver* = 0); 
    96 #elif PLATFORM(CAIRO) 
    97     BitmapImage(cairo_surface_t*, ImageObserver* = 0); 
    98 #endif 
    99     BitmapImage(ImageObserver* = 0); 
     94    static PassRefPtr<BitmapImage> create(NativeImagePtr nativeImage, ImageObserver* observer = 0) 
     95    { 
     96        return adoptRef(new BitmapImage(nativeImage, observer)); 
     97    } 
     98    static PassRefPtr<BitmapImage> create(ImageObserver* observer = 0) 
     99    { 
     100        return adoptRef(new BitmapImage(observer)); 
     101    } 
    100102    ~BitmapImage(); 
    101103     
    …… 
    103105     
    104106    virtual IntSize size() const; 
     107    IntSize currentFrameSize() const; 
    105108 
    106109    virtual bool dataChanged(bool allDataReceived); 
    …… 
    136139 
    137140protected: 
     141    BitmapImage(NativeImagePtr, ImageObserver* = 0); 
     142    BitmapImage(ImageObserver* = 0); 
     143 
    138144#if PLATFORM(WIN) 
    139145    virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator); 
    …… 
    200206    mutable bool m_haveSize; // Whether or not our |m_size| member variable has the final overall image size yet. 
    201207    bool m_sizeAvailable; // Whether or not we can obtain the size of the first image frame yet from ImageIO. 
     208    mutable bool m_hasUniformFrameSize; 
     209 
    202210    unsigned m_decodedSize; // The current size of all decoded frames. 
    203211