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

Unified Diff: Source/core/rendering/RenderCombineText.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. 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 | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderCombineText.cpp
diff --git a/Source/core/rendering/RenderCombineText.cpp b/Source/core/rendering/RenderCombineText.cpp
index e911b1f95afd40ed7494d61e61487483501e1ce8..4e751985ea552ffa45f3e39eaba2fe2e5f3af550 100644
--- a/Source/core/rendering/RenderCombineText.cpp
+++ b/Source/core/rendering/RenderCombineText.cpp
@@ -125,7 +125,7 @@ void RenderCombineText::updateFont()
FontSelector* fontSelector = style()->font().fontSelector();
- bool shouldUpdateFont = style()->setFontDescription(description); // Need to change font orientation to horizontal.
+ bool shouldUpdateFont = mutableStyleRef().setFontDescription(description); // Need to change font orientation to horizontal.
if (m_combinedTextWidth <= emWidth) {
m_scaleX = 1.0f;
@@ -141,7 +141,7 @@ void RenderCombineText::updateFont()
m_combinedTextWidth = runWidth;
// Replace my font with the new one.
- shouldUpdateFont = style()->setFontDescription(description);
+ shouldUpdateFont = mutableStyleRef().setFontDescription(description);
break;
}
}
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698