diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/ImageSource.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/ImageSource.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h index a5c12d6..5ece15b 100644 --- a/Source/WebCore/platform/graphics/ImageSource.h +++ b/Source/WebCore/platform/graphics/ImageSource.h @@ -46,16 +46,12 @@ QT_END_NAMESPACE #elif PLATFORM(CAIRO) struct _cairo_surface; typedef struct _cairo_surface cairo_surface_t; -<<<<<<< HEAD -#elif PLATFORM(SKIA) +#elif USE(SKIA) #if PLATFORM(ANDROID) #include "SkString.h" class SkBitmapRef; class PrivateAndroidImageSourceRec; #else -======= -#elif USE(SKIA) ->>>>>>> WebKit at r80534 namespace WebCore { class NativeImageSkia; } @@ -89,7 +85,7 @@ typedef TiledImageOpenVG* NativeImagePtr; class ImageDecoderQt; typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; -#elif PLATFORM(SKIA) && PLATFORM(ANDROID) +#elif USE(SKIA) && PLATFORM(ANDROID) #ifdef ANDROID_ANIMATED_GIF class GIFImageDecoder; #endif |