diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/Gradient.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/Gradient.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/Gradient.h b/Source/WebCore/platform/graphics/Gradient.h index 432262d..acc6125 100644 --- a/Source/WebCore/platform/graphics/Gradient.h +++ b/Source/WebCore/platform/graphics/Gradient.h @@ -57,15 +57,11 @@ typedef QGradient* PlatformGradient; #elif PLATFORM(CAIRO) typedef struct _cairo_pattern cairo_pattern_t; typedef cairo_pattern_t* PlatformGradient; -<<<<<<< HEAD -#elif PLATFORM(SKIA) +#elif USE(SKIA) #if PLATFORM(ANDROID) #include "SkShader.h" typedef class PlatformGradientRec* PlatformGradient; #else -======= -#elif USE(SKIA) ->>>>>>> WebKit at r80534 class SkShader; typedef class SkShader* PlatformGradient; typedef class SkShader* PlatformPattern; |