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

Unified Diff: third_party/WebKit/Source/core/svg/SVGElement.cpp

Issue 2688343002: Unify SVG parent checks for LayoutObject construction using always the light tree parent. (Closed)
Patch Set: Unify SVG parent checks for LayoutObject construction using always the light tree parent. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.h ('k') | third_party/WebKit/Source/core/svg/SVGGElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/svg/SVGElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGElement.cpp
index 961d67e3d0c115786343754399437aa026e4dc1b..d6b1fec83182a18db1c090445c82620478f66b18 100644
--- a/third_party/WebKit/Source/core/svg/SVGElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGElement.cpp
@@ -1027,18 +1027,14 @@ PassRefPtr<ComputedStyle> SVGElement::customStyleForLayoutObject() {
}
bool SVGElement::layoutObjectIsNeeded(const ComputedStyle& style) {
- // SVG elements only render when inside <svg>, or if the element is an <svg>
- // itself.
- if (!isSVGSVGElement(*this)) {
- ContainerNode* parent = FlatTreeTraversal::parent(*this);
- if (!parent || !parent->isSVGElement())
- return false;
- }
-
- if (!isValid())
- return false;
+ return isValid() && hasSVGParent() && Element::layoutObjectIsNeeded(style);
+}
- return Element::layoutObjectIsNeeded(style);
+bool SVGElement::hasSVGParent() const {
+ // Should we use the flat tree parent instead? If so, we should probably fix a
+ // few other checks.
+ return parentOrShadowHostElement() &&
+ parentOrShadowHostElement()->isSVGElement();
}
MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const {
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.h ('k') | third_party/WebKit/Source/core/svg/SVGGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698