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/rendering | |
| 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/rendering')
| -rw-r--r-- | Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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 |