Show
Ignore:
Timestamp:
02/18/10 13:55:47 (7 months ago)
Author:
gpenin
Message:

merge with webkit revision 54942

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/BAL/ImageDecoder/WebCore/PNG/WK/BCPNGImageDecoderWK.h

    r1296 r1380  
    3838    public: 
    3939        PNGImageDecoder(); 
    40         ~PNGImageDecoder(); 
     40        virtual ~PNGImageDecoder(); 
    4141 
     42        // ImageDecoder 
    4243        virtual String filenameExtension() const { return "png"; } 
    43  
    44         // Take the data and store it. 
    4544        virtual void setData(SharedBuffer* data, bool allDataReceived); 
    46  
    47         // Whether or not the size information has been decoded yet. 
    4845        virtual bool isSizeAvailable(); 
    49  
    5046        virtual RGBA32Buffer* frameBufferAtIndex(size_t index); 
    51  
    52         void decode(bool sizeOnly = false); 
    5347 
    5448        // Callbacks from libpng 
     
    5953 
    6054    private: 
     55        // Decodes the image.  If |onlySize| is true, stops decoding after 
     56        // calculating the image size. 
     57        void decode(bool onlySize); 
     58 
    6159        OwnPtr<PNGImageReader> m_reader; 
    6260    };