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

Unified Diff: Source/core/dom/RenderTreeBuilder.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/dom/NodeRenderingTraversal.cpp ('k') | Source/core/dom/shadow/ComposedTreeWalker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/RenderTreeBuilder.cpp
diff --git a/Source/core/dom/RenderTreeBuilder.cpp b/Source/core/dom/RenderTreeBuilder.cpp
index bb52e93f7887955aeff8327bfd0b24bc111bf499..439e7845f0f68f591bdc1f595a31562c623d6ff7 100644
--- a/Source/core/dom/RenderTreeBuilder.cpp
+++ b/Source/core/dom/RenderTreeBuilder.cpp
@@ -161,10 +161,7 @@ void RenderTreeBuilder::createRendererForTextIfNeeded()
Text* textNode = toText(m_node);
RenderObject* parentRenderer = this->parentRenderer();
- if (m_parentDetails.resetStyleInheritance())
- m_style = textNode->document().ensureStyleResolver().defaultStyleForElement();
- else
- m_style = parentRenderer->style();
+ m_style = parentRenderer->style();
if (!textNode->textRendererIsNeeded(*m_style, *parentRenderer))
return;
« no previous file with comments | « Source/core/dom/NodeRenderingTraversal.cpp ('k') | Source/core/dom/shadow/ComposedTreeWalker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698