diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:24:24 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:22:51 +0000 |
| commit | 554cfd3a98768455a2914724d6f79f4e91b38f41 (patch) | |
| tree | c940d93b46be7b20716dea89d77b5885458e6ff4 | |
| parent | c445adfd59bd826c48b35b0041683932e4092228 (diff) | |
| download | external_webkit-554cfd3a98768455a2914724d6f79f4e91b38f41.zip external_webkit-554cfd3a98768455a2914724d6f79f4e91b38f41.tar.gz external_webkit-554cfd3a98768455a2914724d6f79f4e91b38f41.tar.bz2 | |
Merge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidColor.cpp
This is effectively a partial revert of
"Merge Webkit at r73109: Fix conflicts"
See http://trac.webkit.org/changeset/72926
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I956ac20ac4985ed69921a8efad4a351ba0034e84
| -rw-r--r-- | WebCore/rendering/RenderSVGResourceSolidColor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp index 1f8746f..8228c80 100644 --- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp +++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp @@ -87,7 +87,7 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte context->strokePath(); } -#if PLATFORM(SKIA) +#if PLATFORM(SKIA) && !PLATFORM(ANDROID) // FIXME: Move this into the GraphicsContext // WebKit implicitly expects us to reset the path. // For example in fillAndStrokePath() of RenderSVGPath.cpp the path is |