diff options
Diffstat (limited to 'WebCore/platform/graphics')
| -rw-r--r-- | WebCore/platform/graphics/GraphicsContext.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/GraphicsContext.cpp b/WebCore/platform/graphics/GraphicsContext.cpp index eac8bcd..0105c53 100644 --- a/WebCore/platform/graphics/GraphicsContext.cpp +++ b/WebCore/platform/graphics/GraphicsContext.cpp @@ -506,11 +506,7 @@ void GraphicsContext::setPlatformTextDrawingMode(int mode) } #endif -<<<<<<< HEAD -#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) -======= -#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !PLATFORM(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG) ->>>>>>> webkit.org at r54127 +#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG) void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle&) { } |