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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 11 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: Source/core/css/resolver/FontBuilder.cpp
diff --git a/Source/core/css/resolver/FontBuilder.cpp b/Source/core/css/resolver/FontBuilder.cpp
index 6a8d79507f5a6897da59b24e203711b892539068..6b6972f158ff107f2a4b9f072927152561072394 100644
--- a/Source/core/css/resolver/FontBuilder.cpp
+++ b/Source/core/css/resolver/FontBuilder.cpp
@@ -295,7 +295,7 @@ static void getFontAndGlyphOrientation(const RenderStyle* style, FontOrientation
}
}
-void FontBuilder::checkForOrientationChange(RenderStyle* style)
+void FontBuilder::checkForOrientationChange(const RenderStyle* style)
{
FontOrientation fontOrientation;
NonCJKGlyphOrientation glyphOrientation;
@@ -310,7 +310,7 @@ void FontBuilder::checkForOrientationChange(RenderStyle* style)
m_fontDescription.setOrientation(fontOrientation);
}
-void FontBuilder::checkForGenericFamilyChange(RenderStyle* style, const RenderStyle* parentStyle)
+void FontBuilder::checkForGenericFamilyChange(const RenderStyle* style, const RenderStyle* parentStyle)
{
FontDescriptionChangeScope scope(this);
@@ -347,13 +347,13 @@ void FontBuilder::checkForGenericFamilyChange(RenderStyle* style, const RenderSt
updateComputedSize(m_fontDescription, style);
}
-void FontBuilder::updateComputedSize(RenderStyle* style, const RenderStyle* parentStyle)
+void FontBuilder::updateComputedSize(const RenderStyle* style, const RenderStyle* parentStyle)
{
FontDescriptionChangeScope scope(this);
updateComputedSize(m_fontDescription, style);
}
-void FontBuilder::updateComputedSize(FontDescription& fontDescription, RenderStyle* style)
+void FontBuilder::updateComputedSize(FontDescription& fontDescription, const RenderStyle* style)
{
float computedSize = getComputedSizeFromSpecifiedSize(fontDescription, style->effectiveZoom(), fontDescription.specifiedSize());
float multiplier = style->textAutosizingMultiplier();

Powered by Google App Engine
This is Rietveld 408576698