diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 14:37:08 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:36:18 +0100 |
commit | 7fb1198349cf58688611c0b98189560871faa49f (patch) | |
tree | 0bc688968b9183e14ff57116f5ba2b7f98cd1d1b /Source/WebCore | |
parent | a551df194f6950988c7accff3018f55c9c674bc3 (diff) | |
download | external_webkit-7fb1198349cf58688611c0b98189560871faa49f.zip external_webkit-7fb1198349cf58688611c0b98189560871faa49f.tar.gz external_webkit-7fb1198349cf58688611c0b98189560871faa49f.tar.bz2 |
Merge WebKit at r80534: Update uses of PLATFORM(SKIA).
PLATFORM(SKIA) is replaced with USE(SKIA), see
http://trac.webkit.org/changeset/79578
Fix conflicts and update our code to reflect this.
Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
Diffstat (limited to 'Source/WebCore')
6 files changed, 9 insertions, 41 deletions
diff --git a/Source/WebCore/platform/graphics/Gradient.cpp b/Source/WebCore/platform/graphics/Gradient.cpp index f64fe6b..783e552 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 !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(CAIRO) -======= -#if !USE(SKIA) && !PLATFORM(CAIRO) ->>>>>>> WebKit at r80534 +#if !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(CAIRO) void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&) { } 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; diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp index cb991b7..fa3280e 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext.cpp +++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp @@ -656,11 +656,7 @@ CompositeOperator GraphicsContext::compositeOperation() const return m_state.compositeOperator; } -<<<<<<< HEAD -#if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -======= -#if !USE(SKIA) ->>>>>>> WebKit at r80534 +#if !(USE(SKIA) && !PLATFORM(ANDROID)) void GraphicsContext::setPlatformFillGradient(Gradient*) { } @@ -678,11 +674,7 @@ void GraphicsContext::setPlatformStrokePattern(Pattern*) } #endif -<<<<<<< HEAD -#if !PLATFORM(CG) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -======= -#if !PLATFORM(CG) && !USE(SKIA) ->>>>>>> WebKit at r80534 +#if !PLATFORM(CG) && !(USE(SKIA) && !PLATFORM(ANDROID)) // Implement this if you want to go ahead and push the drawing mode into your native context // immediately. void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode) @@ -690,11 +682,7 @@ void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode) } #endif -<<<<<<< HEAD -#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG) -======= -#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !USE(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG) ->>>>>>> WebKit at r80534 +#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG) void GraphicsContext::setPlatformStrokeStyle(StrokeStyle) { } diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h index f69c340..5eafa16 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext.h +++ b/Source/WebCore/platform/graphics/GraphicsContext.h @@ -74,8 +74,7 @@ class wxWindowDC; #else typedef wxWindowDC PlatformGraphicsContext; #endif -<<<<<<< HEAD -#elif PLATFORM(SKIA) +#elif USE(SKIA) #if PLATFORM(ANDROID) namespace WebCore { class PlatformGraphicsContext; @@ -83,9 +82,6 @@ class PlatformGraphicsContext; class SkPaint; struct SkPoint; #else -======= -#elif USE(SKIA) ->>>>>>> WebKit at r80534 namespace WebCore { class PlatformContextSkia; } diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h index a5c12d6..5ece15b 100644 --- a/Source/WebCore/platform/graphics/ImageSource.h +++ b/Source/WebCore/platform/graphics/ImageSource.h @@ -46,16 +46,12 @@ QT_END_NAMESPACE #elif PLATFORM(CAIRO) struct _cairo_surface; typedef struct _cairo_surface cairo_surface_t; -<<<<<<< HEAD -#elif PLATFORM(SKIA) +#elif USE(SKIA) #if PLATFORM(ANDROID) #include "SkString.h" class SkBitmapRef; class PrivateAndroidImageSourceRec; #else -======= -#elif USE(SKIA) ->>>>>>> WebKit at r80534 namespace WebCore { class NativeImageSkia; } @@ -89,7 +85,7 @@ typedef TiledImageOpenVG* NativeImagePtr; class ImageDecoderQt; typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; -#elif PLATFORM(SKIA) && PLATFORM(ANDROID) +#elif USE(SKIA) && PLATFORM(ANDROID) #ifdef ANDROID_ANIMATED_GIF class GIFImageDecoder; #endif diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp index d429bdc..28e7ddd 100644 --- a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp +++ b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp @@ -26,11 +26,7 @@ #include "RenderStyle.h" #include "SVGRenderSupport.h" -<<<<<<< HEAD -#if PLATFORM(SKIA) && !PLATFORM(ANDROID) -======= -#if USE(SKIA) ->>>>>>> WebKit at r80534 +#if USE(SKIA) && !PLATFORM(ANDROID) #include "PlatformContextSkia.h" #endif |