diff options
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/DragImage.h | 7 | ||||
| -rw-r--r-- | WebCore/platform/graphics/Gradient.cpp | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index 64b4f02..3045e03 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -78,13 +78,10 @@ namespace WebCore { typedef GdkPixbuf* DragImageRef; #elif PLATFORM(HAIKU) typedef BBitmap* DragImageRef; -<<<<<<< HEAD -#elif PLATFORM(ANDROID) - typedef void* DragImageRef; -======= #elif PLATFORM(BREWMP) typedef IImage* DragImageRef; ->>>>>>> webkit.org at r54731 +#elif PLATFORM(ANDROID) + typedef void* DragImageRef; #endif IntSize dragImageSize(DragImageRef); diff --git a/WebCore/platform/graphics/Gradient.cpp b/WebCore/platform/graphics/Gradient.cpp index 0a751ac..daf4754 100644 --- a/WebCore/platform/graphics/Gradient.cpp +++ b/WebCore/platform/graphics/Gradient.cpp @@ -195,13 +195,8 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra setPlatformGradientSpaceTransform(gradientSpaceTransformation); } -<<<<<<< HEAD #if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -void Gradient::setPlatformGradientSpaceTransform(const TransformationMatrix&) -======= -#if !PLATFORM(SKIA) void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&) ->>>>>>> webkit.org at r54731 { } #endif |