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