Chromium Code Reviews| 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 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1014 if (!correspondingElement()) | 1014 if (!correspondingElement()) |
| 1015 return document().ensureStyleResolver().styleForElement(this); | 1015 return document().ensureStyleResolver().styleForElement(this); |
| 1016 | 1016 |
| 1017 const ComputedStyle* style = nullptr; | 1017 const ComputedStyle* style = nullptr; |
| 1018 if (Element* parent = parentOrShadowHostElement()) { | 1018 if (Element* parent = parentOrShadowHostElement()) { |
| 1019 if (LayoutObject* layoutObject = parent->layoutObject()) | 1019 if (LayoutObject* layoutObject = parent->layoutObject()) |
| 1020 style = layoutObject->style(); | 1020 style = layoutObject->style(); |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 return document().ensureStyleResolver().styleForElement( | 1023 return document().ensureStyleResolver().styleForElement( |
| 1024 correspondingElement(), style, DisallowStyleSharing); | 1024 correspondingElement(), style, style, DisallowStyleSharing); |
|
rune
2017/01/27 13:09:23
Is this correct? Can we get here for SVGSVGElement
emilio
2017/01/27 22:13:15
Note that style will only be non-null when the par
rune
2017/02/06 22:40:44
The display property applies to SVG elements, but
emilio
2017/02/08 10:59:24
Makes sense, will do.
| |
| 1025 } | 1025 } |
| 1026 | 1026 |
| 1027 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const { | 1027 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const { |
| 1028 if (hasSVGRareData()) | 1028 if (hasSVGRareData()) |
| 1029 return svgRareData()->animatedSMILStyleProperties(); | 1029 return svgRareData()->animatedSMILStyleProperties(); |
| 1030 return nullptr; | 1030 return nullptr; |
| 1031 } | 1031 } |
| 1032 | 1032 |
| 1033 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() { | 1033 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() { |
| 1034 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties(); | 1034 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties(); |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1287 visitor->trace(m_className); | 1287 visitor->trace(m_className); |
| 1288 Element::trace(visitor); | 1288 Element::trace(visitor); |
| 1289 } | 1289 } |
| 1290 | 1290 |
| 1291 const AtomicString& SVGElement::eventParameterName() { | 1291 const AtomicString& SVGElement::eventParameterName() { |
| 1292 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); | 1292 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); |
| 1293 return evtString; | 1293 return evtString; |
| 1294 } | 1294 } |
| 1295 | 1295 |
| 1296 } // namespace blink | 1296 } // namespace blink |
| OLD | NEW |