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/platform/graphics/GraphicsContext.cpp | |
| 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/platform/graphics/GraphicsContext.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/GraphicsContext.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
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) { } |