| 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 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1018 if (!correspondingElement()) | 1018 if (!correspondingElement()) |
| 1019 return document().ensureStyleResolver().styleForElement(this); | 1019 return document().ensureStyleResolver().styleForElement(this); |
| 1020 | 1020 |
| 1021 const ComputedStyle* style = nullptr; | 1021 const ComputedStyle* style = nullptr; |
| 1022 if (Element* parent = parentOrShadowHostElement()) { | 1022 if (Element* parent = parentOrShadowHostElement()) { |
| 1023 if (LayoutObject* layoutObject = parent->layoutObject()) | 1023 if (LayoutObject* layoutObject = parent->layoutObject()) |
| 1024 style = layoutObject->style(); | 1024 style = layoutObject->style(); |
| 1025 } | 1025 } |
| 1026 | 1026 |
| 1027 return document().ensureStyleResolver().styleForElement( | 1027 return document().ensureStyleResolver().styleForElement( |
| 1028 correspondingElement(), style, DisallowStyleSharing); | 1028 correspondingElement(), style, style, DisallowStyleSharing); |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 bool SVGElement::layoutObjectIsNeeded(const ComputedStyle& style) { | 1031 bool SVGElement::layoutObjectIsNeeded(const ComputedStyle& style) { |
| 1032 return isValid() && hasSVGParent() && Element::layoutObjectIsNeeded(style); | 1032 return isValid() && hasSVGParent() && Element::layoutObjectIsNeeded(style); |
| 1033 } | 1033 } |
| 1034 | 1034 |
| 1035 bool SVGElement::hasSVGParent() const { | 1035 bool SVGElement::hasSVGParent() const { |
| 1036 // Should we use the flat tree parent instead? If so, we should probably fix a | 1036 // Should we use the flat tree parent instead? If so, we should probably fix a |
| 1037 // few other checks. | 1037 // few other checks. |
| 1038 return parentOrShadowHostElement() && | 1038 return parentOrShadowHostElement() && |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1302 visitor->trace(m_className); | 1302 visitor->trace(m_className); |
| 1303 Element::trace(visitor); | 1303 Element::trace(visitor); |
| 1304 } | 1304 } |
| 1305 | 1305 |
| 1306 const AtomicString& SVGElement::eventParameterName() { | 1306 const AtomicString& SVGElement::eventParameterName() { |
| 1307 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); | 1307 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); |
| 1308 return evtString; | 1308 return evtString; |
| 1309 } | 1309 } |
| 1310 | 1310 |
| 1311 } // namespace blink | 1311 } // namespace blink |
| OLD | NEW |