diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 15:21:07 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:32:33 +0100 |
| commit | 82eeb7b660065e6e990280e6563ca7eafe4be1cd (patch) | |
| tree | 75be6b2f264796eb6d58fbff8c0cc0b6b1a4d5a3 /WebCore/platform/graphics/ImageSource.h | |
| parent | 6567c2a19dd910c1f036bc638bab106fd6350e96 (diff) | |
| download | external_webkit-82eeb7b660065e6e990280e6563ca7eafe4be1cd.zip external_webkit-82eeb7b660065e6e990280e6563ca7eafe4be1cd.tar.gz external_webkit-82eeb7b660065e6e990280e6563ca7eafe4be1cd.tar.bz2 | |
Merge Webkit at r65072 : Fix conflicts.
HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616
TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021
GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584
Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798
Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
Diffstat (limited to 'WebCore/platform/graphics/ImageSource.h')
| -rw-r--r-- | WebCore/platform/graphics/ImageSource.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h index 3226b41..014c136 100644 --- a/WebCore/platform/graphics/ImageSource.h +++ b/WebCore/platform/graphics/ImageSource.h @@ -47,19 +47,15 @@ QT_END_NAMESPACE struct _cairo_surface; typedef struct _cairo_surface cairo_surface_t; #elif PLATFORM(SKIA) -<<<<<<< HEAD #if PLATFORM(ANDROID) #include "SkString.h" class SkBitmapRef; class PrivateAndroidImageSourceRec; #else -class NativeImageSkia; -#endif -======= namespace WebCore { class NativeImageSkia; } ->>>>>>> webkit.org at r65072 +#endif #elif PLATFORM(HAIKU) class BBitmap; #elif OS(WINCE) @@ -84,9 +80,7 @@ typedef TiledImageOpenVG* NativeImagePtr; class ImageDecoderQt; typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; -#elif PLATFORM(SKIA) -#if PLATFORM(ANDROID) -class String; +#elif PLATFORM(SKIA) && PLATFORM(ANDROID) #ifdef ANDROID_ANIMATED_GIF class ImageDecoder; #endif @@ -102,11 +96,6 @@ typedef SkBitmapRef* NativeImagePtr; #else class ImageDecoder; typedef ImageDecoder* NativeImageSourcePtr; -typedef NativeImageSkia* NativeImagePtr; -#endif -#else -class ImageDecoder; -typedef ImageDecoder* NativeImageSourcePtr; #if PLATFORM(WX) #if USE(WXGC) typedef wxGraphicsBitmap* NativeImagePtr; @@ -115,11 +104,8 @@ typedef wxBitmap* NativeImagePtr; #endif #elif PLATFORM(CAIRO) typedef cairo_surface_t* NativeImagePtr; -<<<<<<< HEAD -======= #elif PLATFORM(SKIA) typedef WebCore::NativeImageSkia* NativeImagePtr; ->>>>>>> webkit.org at r65072 #elif PLATFORM(HAIKU) typedef BBitmap* NativeImagePtr; #elif OS(WINCE) |