diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/rendering/RenderSVGResourceSolidColor.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/rendering/RenderSVGResourceSolidColor.cpp')
| -rw-r--r-- | WebCore/rendering/RenderSVGResourceSolidColor.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp index 8228c80..f9449bb 100644 --- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp +++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp @@ -75,17 +75,18 @@ bool RenderSVGResourceSolidColor::applyResource(RenderObject* object, RenderStyl return true; } -void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode) +void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path) { ASSERT(context); ASSERT(resourceMode != ApplyToDefaultMode); - if (!(resourceMode & ApplyToTextMode)) { + if (path && !(resourceMode & ApplyToTextMode)) { if (resourceMode & ApplyToFillMode) - context->fillPath(); + context->fillPath(*path); else if (resourceMode & ApplyToStrokeMode) - context->strokePath(); + context->strokePath(*path); } +<<<<<<< HEAD #if PLATFORM(SKIA) && !PLATFORM(ANDROID) // FIXME: Move this into the GraphicsContext @@ -97,6 +98,8 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte context->platformContext()->setFillShader(0); context->platformContext()->setStrokeShader(0); #endif +======= +>>>>>>> webkit.org at r73109 } } |