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

Unified Diff: Source/core/css/resolver/StyleResolverState.cpp

Issue 201683003: Remove resetStyleInheritance. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Resolve conflicts Created 6 years, 9 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 | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/dom/NodeRenderingTraversal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolverState.cpp
diff --git a/Source/core/css/resolver/StyleResolverState.cpp b/Source/core/css/resolver/StyleResolverState.cpp
index 370877c061a43223d3f0b8c75ac9c4cf025a85d1..f7299230631d84a0ab562eca3f1db4c6dc1e6e5f 100644
--- a/Source/core/css/resolver/StyleResolverState.cpp
+++ b/Source/core/css/resolver/StyleResolverState.cpp
@@ -41,9 +41,7 @@ StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
, m_styleMap(*this, m_elementStyleResources)
, m_currentRule(0)
{
- if (m_elementContext.resetStyleInheritance())
- m_parentStyle = nullptr;
- else if (!parentStyle && m_elementContext.parentNode())
+ if (!parentStyle && m_elementContext.parentNode())
m_parentStyle = m_elementContext.parentNode()->renderStyle();
// FIXME: Animation unitests will start animations on non-active documents!
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/dom/NodeRenderingTraversal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698