Show
Ignore:
Timestamp:
08/20/08 13:23:52 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCImageSourceCairo.h

    r437 r447  
    4444struct _cairo_surface; 
    4545typedef struct _cairo_surface cairo_surface_t; 
     46#elif PLATFORM(SKIA) 
     47class NativeImageSkia; 
    4648#endif 
    4749 
    …… 
    6365typedef ImageDecoderQt* NativeImageSourcePtr; 
    6466typedef QPixmap* NativeImagePtr; 
    65 #else 
     67#elif PLATFORM(CAIRO) 
    6668class ImageDecoder; 
    6769typedef ImageDecoder* NativeImageSourcePtr; 
    6870typedef cairo_surface_t* NativeImagePtr; 
     71#elif PLATFORM(SKIA) 
     72class ImageDecoder; 
     73typedef ImageDecoder* NativeImageSourcePtr; 
     74typedef NativeImageSkia* NativeImagePtr; 
    6975#endif 
    7076