Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGElement.cpp

Issue 2684833003: Disable display: contents in SVG. (Closed)
Patch Set: Disable display: contents in SVG. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 const ComputedStyle* style = nullptr; 1019 const ComputedStyle* style = nullptr;
1020 if (Element* parent = parentOrShadowHostElement()) { 1020 if (Element* parent = parentOrShadowHostElement()) {
1021 if (LayoutObject* layoutObject = parent->layoutObject()) 1021 if (LayoutObject* layoutObject = parent->layoutObject())
1022 style = layoutObject->style(); 1022 style = layoutObject->style();
1023 } 1023 }
1024 1024
1025 return document().ensureStyleResolver().styleForElement( 1025 return document().ensureStyleResolver().styleForElement(
1026 correspondingElement(), style, DisallowStyleSharing); 1026 correspondingElement(), style, DisallowStyleSharing);
1027 } 1027 }
1028 1028
1029 bool SVGElement::layoutObjectIsNeeded(const ComputedStyle& style) {
1030 // Display: contents on SVG isn't really specified, see:
1031 // https://www.w3.org/TR/SVG/painting.html#DisplayProperty
1032 if (style.display() == EDisplay::Contents)
1033 return true;
1034 return Element::layoutObjectIsNeeded(style);
1035 }
1036
1029 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const { 1037 MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const {
1030 if (hasSVGRareData()) 1038 if (hasSVGRareData())
1031 return svgRareData()->animatedSMILStyleProperties(); 1039 return svgRareData()->animatedSMILStyleProperties();
1032 return nullptr; 1040 return nullptr;
1033 } 1041 }
1034 1042
1035 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() { 1043 MutableStylePropertySet* SVGElement::ensureAnimatedSMILStyleProperties() {
1036 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties(); 1044 return ensureSVGRareData()->ensureAnimatedSMILStyleProperties();
1037 } 1045 }
1038 1046
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 visitor->trace(m_className); 1297 visitor->trace(m_className);
1290 Element::trace(visitor); 1298 Element::trace(visitor);
1291 } 1299 }
1292 1300
1293 const AtomicString& SVGElement::eventParameterName() { 1301 const AtomicString& SVGElement::eventParameterName() {
1294 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); 1302 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
1295 return evtString; 1303 return evtString;
1296 } 1304 }
1297 1305
1298 } // namespace blink 1306 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698