| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann |
| 3 * <zimmermann@kde.org> | 3 * <zimmermann@kde.org> |
| 4 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> | 4 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> |
| 5 * Copyright (C) 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 6 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 7 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> | 7 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 if (!correspondingElement()) | 1036 if (!correspondingElement()) |
| 1037 return document().ensureStyleResolver().styleForElement(this); | 1037 return document().ensureStyleResolver().styleForElement(this); |
| 1038 | 1038 |
| 1039 const ComputedStyle* style = nullptr; | 1039 const ComputedStyle* style = nullptr; |
| 1040 if (Element* parent = parentOrShadowHostElement()) { | 1040 if (Element* parent = parentOrShadowHostElement()) { |
| 1041 if (LayoutObject* layoutObject = parent->layoutObject()) | 1041 if (LayoutObject* layoutObject = parent->layoutObject()) |
| 1042 style = layoutObject->style(); | 1042 style = layoutObject->style(); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 return document().ensureStyleResolver().styleForElement( | 1045 return document().ensureStyleResolver().styleForElement( |
| 1046 correspondingElement(), style, DisallowStyleSharing); | 1046 correspondingElement(), style, style, DisallowStyleSharing); |
| 1047 } | 1047 } |
| 1048 | 1048 |
| 1049 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const { | 1049 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const { |
| 1050 if (hasSVGRareData()) | 1050 if (hasSVGRareData()) |
| 1051 return svgRareData()->animatedSMILStyleProperties(); | 1051 return svgRareData()->animatedSMILStyleProperties(); |
| 1052 return nullptr; | 1052 return nullptr; |
| 1053 } | 1053 } |
| 1054 | 1054 |
| 1055 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() { | 1055 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() { |
| 1056 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties(); | 1056 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties(); |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 visitor->trace(m_className); | 1309 visitor->trace(m_className); |
| 1310 Element::trace(visitor); | 1310 Element::trace(visitor); |
| 1311 } | 1311 } |
| 1312 | 1312 |
| 1313 const AtomicString& SVGElement::eventParameterName() { | 1313 const AtomicString& SVGElement::eventParameterName() { |
| 1314 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); | 1314 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); |
| 1315 return evtString; | 1315 return evtString; |
| 1316 } | 1316 } |
| 1317 | 1317 |
| 1318 } // namespace blink | 1318 } // namespace blink |
| OLD | NEW |