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

Unified Diff: trunk/Source/core/dom/Text.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 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 | « trunk/Source/core/dom/Text.h ('k') | trunk/Source/core/dom/TreeScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/dom/Text.cpp
===================================================================
--- trunk/Source/core/dom/Text.cpp (revision 190671)
+++ trunk/Source/core/dom/Text.cpp (working copy)
@@ -315,12 +315,12 @@
return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
}
-RenderText* Text::createTextRenderer(const LayoutStyle& style)
+RenderText* Text::createTextRenderer(LayoutStyle* style)
{
if (isSVGText(this))
return new LayoutSVGInlineText(this, dataImpl());
- if (style.hasTextCombine())
+ if (style->hasTextCombine())
return new RenderCombineText(this, dataImpl());
return new RenderText(this, dataImpl());
@@ -383,7 +383,7 @@
bool Text::needsWhitespaceRenderer()
{
ASSERT(!renderer());
- if (const LayoutStyle* style = parentLayoutStyle())
+ if (LayoutStyle* style = parentLayoutStyle())
return style->preserveNewline();
return false;
}
« no previous file with comments | « trunk/Source/core/dom/Text.h ('k') | trunk/Source/core/dom/TreeScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698