From 0416fc3b3da8e36f371c6a9b2b47d0dc68b4bd72 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Wed, 8 Dec 2010 11:32:25 -0800 Subject: Merge Webkit at r73109: Fix conflicts 1. WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/72590 http://trac.webkit.org/changeset/72344 2. WebCore/WebCore.vcproj/WebCore.vcproj too many changes between 72274 and 73109 http://trac.webkit.org/log/trunk/WebCore/WebCore.vcproj/WebCore.vcproj also due to Android change. https://android-git.corp.google.com/g/#change,37374 3. WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/72631 4. WebCore/rendering/RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 our code is not upstreamed 5. WebCore/rendering/RenderView.h http://trac.webkit.org/changeset/72852 http://trac.webkit.org/changeset/73063 Change-Id: Id7a1dbdfef6327b4fe08c9884122bf9decd039ca --- WebCore/rendering/RenderSVGResourceSolidColor.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'WebCore/rendering/RenderSVGResourceSolidColor.cpp') diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp index f9449bb..41d1513 100644 --- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp +++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp @@ -86,20 +86,6 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte else if (resourceMode & ApplyToStrokeMode) context->strokePath(*path); } -<<<<<<< HEAD - -#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 - // added back to the context after filling. This is because internally it - // calls CGContextFillPath() which closes the path. - context->beginPath(); - context->platformContext()->setFillShader(0); - context->platformContext()->setStrokeShader(0); -#endif -======= ->>>>>>> webkit.org at r73109 } } -- cgit v1.1