| 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. |
| 11 * | 11 * |
| 12 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Library General Public License for more details. | 15 * Library General Public License for more details. |
| 16 * | 16 * |
| 17 * You should have received a copy of the GNU Library General Public License | 17 * You should have received a copy of the GNU Library General Public License |
| 18 * along with this library; see the file COPYING.LIB. If not, write to | 18 * along with this library; see the file COPYING.LIB. If not, write to |
| 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 * Boston, MA 02110-1301, USA. | 20 * Boston, MA 02110-1301, USA. |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include "config.h" | 23 #include "config.h" |
| 24 | 24 |
| 25 #if ENABLE(SVG) | 25 #if ENABLE(SVG) |
| 26 #include "RenderSVGResource.h" | 26 #include "core/rendering/svg/RenderSVGResource.h" |
| 27 | 27 |
| 28 #include "Frame.h" | 28 #include "Frame.h" |
| 29 #include "FrameView.h" | 29 #include "FrameView.h" |
| 30 #include "RenderSVGResourceClipper.h" | |
| 31 #include "RenderSVGResourceContainer.h" | |
| 32 #include "RenderSVGResourceFilter.h" | |
| 33 #include "RenderSVGResourceMasker.h" | |
| 34 #include "RenderSVGResourceSolidColor.h" | |
| 35 #include "SVGResources.h" | |
| 36 #include "SVGResourcesCache.h" | |
| 37 #include "SVGURIReference.h" | 30 #include "SVGURIReference.h" |
| 31 #include "core/rendering/svg/RenderSVGResourceClipper.h" |
| 32 #include "core/rendering/svg/RenderSVGResourceContainer.h" |
| 33 #include "core/rendering/svg/RenderSVGResourceFilter.h" |
| 34 #include "core/rendering/svg/RenderSVGResourceMasker.h" |
| 35 #include "core/rendering/svg/RenderSVGResourceSolidColor.h" |
| 36 #include "core/rendering/svg/SVGResources.h" |
| 37 #include "core/rendering/svg/SVGResourcesCache.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 static inline bool inheritColorFromParentStyleIfNeeded(RenderObject* object, boo
l applyToFill, Color& color) | 41 static inline bool inheritColorFromParentStyleIfNeeded(RenderObject* object, boo
l applyToFill, Color& color) |
| 42 { | 42 { |
| 43 if (color.isValid()) | 43 if (color.isValid()) |
| 44 return true; | 44 return true; |
| 45 if (!object->parent() || !object->parent()->style()) | 45 if (!object->parent() || !object->parent()->style()) |
| 46 return false; | 46 return false; |
| 47 const SVGRenderStyle* parentSVGStyle = object->parent()->style()->svgStyle()
; | 47 const SVGRenderStyle* parentSVGStyle = object->parent()->style()->svgStyle()
; |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 } | 212 } |
| 213 | 213 |
| 214 current = current->parent(); | 214 current = current->parent(); |
| 215 } | 215 } |
| 216 } | 216 } |
| 217 | 217 |
| 218 } | 218 } |
| 219 | 219 |
| 220 #endif | 220 #endif |
| 221 | 221 |
| OLD | NEW |