| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> | 4 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> |
| 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceM
ode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback) | 43 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceM
ode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback) |
| 44 { | 44 { |
| 45 ASSERT(object); | 45 ASSERT(object); |
| 46 ASSERT(style); | 46 ASSERT(style); |
| 47 | 47 |
| 48 hasFallback = false; | 48 hasFallback = false; |
| 49 | 49 |
| 50 // If we have no style at all, ignore it. | 50 // If we have no style at all, ignore it. |
| 51 const SVGRenderStyle& svgStyle = style->svgStyle(); | 51 const SVGRenderStyle& svgStyle = style->svgStyle(); |
| 52 | 52 |
| 53 bool isRenderingMask = SVGRenderSupport::isRenderingMaskImage(*object); | 53 bool isRenderingMask = SVGRenderSupport::isRenderingClipPathAsMaskImage(*obj
ect); |
| 54 | 54 |
| 55 // If we have no fill/stroke, return 0. | 55 // If we have no fill/stroke, return 0. |
| 56 if (mode == ApplyToFillMode) { | 56 if (mode == ApplyToFillMode) { |
| 57 // When rendering the mask for a RenderSVGResourceClipper, always use th
e initial fill paint server, and ignore stroke. | 57 // When rendering the mask for a RenderSVGResourceClipper, always use th
e initial fill paint server, and ignore stroke. |
| 58 if (isRenderingMask) { | 58 if (isRenderingMask) { |
| 59 RenderSVGResourceSolidColor* colorResource = RenderSVGResource::shar
edSolidPaintingResource(); | 59 RenderSVGResourceSolidColor* colorResource = RenderSVGResource::shar
edSolidPaintingResource(); |
| 60 colorResource->setColor(SVGRenderStyle::initialFillPaintColor()); | 60 colorResource->setColor(SVGRenderStyle::initialFillPaintColor()); |
| 61 return colorResource; | 61 return colorResource; |
| 62 } | 62 } |
| 63 | 63 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 // This will process the rest of the ancestors. | 197 // This will process the rest of the ancestors. |
| 198 toRenderSVGResourceContainer(current)->removeAllClientsFromCache(); | 198 toRenderSVGResourceContainer(current)->removeAllClientsFromCache(); |
| 199 break; | 199 break; |
| 200 } | 200 } |
| 201 | 201 |
| 202 current = current->parent(); | 202 current = current->parent(); |
| 203 } | 203 } |
| 204 } | 204 } |
| 205 | 205 |
| 206 } | 206 } |
| OLD | NEW |