diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/Gradient.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/Gradient.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/Gradient.cpp b/Source/WebCore/platform/graphics/Gradient.cpp index 4edb4bd..7541646 100644 --- a/Source/WebCore/platform/graphics/Gradient.cpp +++ b/Source/WebCore/platform/graphics/Gradient.cpp @@ -221,11 +221,7 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra setPlatformGradientSpaceTransform(gradientSpaceTransformation); } -<<<<<<< HEAD -#if !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(CAIRO) -======= -#if !USE(SKIA) && !USE(CAIRO) ->>>>>>> WebKit.org at r84325 +#if !(USE(SKIA) && !PLATFORM(ANDROID)) && !USE(CAIRO) void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&) { } |