diff options
Diffstat (limited to 'WebCore/platform/graphics/ImageSource.h')
| -rw-r--r-- | WebCore/platform/graphics/ImageSource.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h index eabeeab..19c7bf7 100644 --- a/WebCore/platform/graphics/ImageSource.h +++ b/WebCore/platform/graphics/ImageSource.h @@ -70,7 +70,6 @@ typedef CGImageRef NativeImagePtr; class ImageDecoderQt; typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; -<<<<<<< HEAD:WebCore/platform/graphics/ImageSource.h #elif PLATFORM(ANDROID) #if PLATFORM(SGL) class String; @@ -91,10 +90,7 @@ class ImageDecoder; typedef ImageDecoder* NativeImageSourcePtr; typedef NativeImageSkia* NativeImagePtr; #endif -#elif PLATFORM(CAIRO) -======= #else ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/ImageSource.h class ImageDecoder; typedef ImageDecoder* NativeImageSourcePtr; #if PLATFORM(WX) |