Merge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidCo...

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

diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp
index 1f8746f..8228c80 100644 (file)
--- 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