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

Unified Diff: trunk/Source/core/rendering/RenderCombineText.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
Index: trunk/Source/core/rendering/RenderCombineText.cpp
===================================================================
--- trunk/Source/core/rendering/RenderCombineText.cpp (revision 190671)
+++ trunk/Source/core/rendering/RenderCombineText.cpp (working copy)
@@ -125,7 +125,7 @@
FontSelector* fontSelector = style()->font().fontSelector();
- bool shouldUpdateFont = mutableStyleRef().setFontDescription(description); // Need to change font orientation to horizontal.
+ bool shouldUpdateFont = style()->setFontDescription(description); // Need to change font orientation to horizontal.
if (m_combinedTextWidth <= emWidth) {
m_scaleX = 1.0f;
@@ -141,7 +141,7 @@
m_combinedTextWidth = runWidth;
// Replace my font with the new one.
- shouldUpdateFont = mutableStyleRef().setFontDescription(description);
+ shouldUpdateFont = style()->setFontDescription(description);
break;
}
}
« no previous file with comments | « trunk/Source/core/rendering/RenderBlock.cpp ('k') | trunk/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698