| 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();
|
|
|