diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 13:32:53 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-05 14:29:48 +0000 |
| commit | f912b6f62505f60109e7300787c93111dbd70560 (patch) | |
| tree | 2432507bd57c2620b2e167f8368e548506c041f1 /WebCore/svg | |
| parent | 8c8c7b43f311d492d2c13ee68bc91875262ae072 (diff) | |
| download | external_webkit-f912b6f62505f60109e7300787c93111dbd70560.zip external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.gz external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.bz2 | |
Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.
Skia is used by Chromium, which defines PLATFORM(SKIA).
Android also uses Skia, but currently defines PLATFORM(SGL) to account for
platform-specific differences between Android and Chromum.
We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL).
Platform-specific differences are achieved with PLATFORM(ANDROID) guards.
This reduces our diff with webkit.org.
Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
Diffstat (limited to 'WebCore/svg')
| -rw-r--r-- | WebCore/svg/graphics/SVGPaintServer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/svg/graphics/SVGPaintServer.cpp b/WebCore/svg/graphics/SVGPaintServer.cpp index 728ff1b..6b81f72 100644 --- a/WebCore/svg/graphics/SVGPaintServer.cpp +++ b/WebCore/svg/graphics/SVGPaintServer.cpp @@ -38,7 +38,7 @@ #include "SVGStyledElement.h" #include "SVGURIReference.h" -#if PLATFORM(SKIA) +#if PLATFORM(SKIA) && !PLATFORM(ANDROID) #include "PlatformContextSkia.h" #endif @@ -184,7 +184,7 @@ void SVGPaintServer::renderPath(GraphicsContext*& context, const RenderObject* p context->strokePath(); } -#if PLATFORM(SKIA) +#if PLATFORM(SKIA) && !PLATFORM(ANDROID) void SVGPaintServer::teardown(GraphicsContext*& context, const RenderObject*, SVGPaintTargetType, bool) const { // FIXME: Move this into the GraphicsContext |