Index: Source/core/css/resolver/FontBuilder.cpp |
diff --git a/Source/core/css/resolver/FontBuilder.cpp b/Source/core/css/resolver/FontBuilder.cpp |
index 024390bc146dbce79a85de984ba2bc927c3696e3..84da01518776723888c8da30f344ea758b0c2c00 100644 |
--- a/Source/core/css/resolver/FontBuilder.cpp |
+++ b/Source/core/css/resolver/FontBuilder.cpp |
@@ -25,6 +25,7 @@ |
#include "core/css/CSSCalculationValue.h" |
#include "core/css/CSSFontFeatureValue.h" |
+#include "core/css/CSSToLengthConversionData.h" |
#include "core/css/FontSize.h" |
#include "core/frame/Frame.h" |
#include "core/page/Settings.h" |
@@ -324,11 +325,11 @@ void FontBuilder::setFontSizeValue(CSSValue* value, RenderStyle* parentStyle, co |
} else { |
scope.fontDescription().setIsAbsoluteSize(parentIsAbsoluteSize || !(primitiveValue->isPercentage() || primitiveValue->isFontRelativeLength())); |
if (primitiveValue->isLength()) |
- size = primitiveValue->computeLength<float>(parentStyle, rootElementStyle, 1.0, true); |
+ size = primitiveValue->computeLength<float>(CSSToLengthConversionData(parentStyle, rootElementStyle, 1.0, true)); |
else if (primitiveValue->isPercentage()) |
size = (primitiveValue->getFloatValue() * parentSize) / 100.0f; |
else if (primitiveValue->isCalculatedPercentageWithLength()) |
- size = primitiveValue->cssCalcValue()->toCalcValue(parentStyle, rootElementStyle)->evaluate(parentSize); |
+ size = primitiveValue->cssCalcValue()->toCalcValue(CSSToLengthConversionData(parentStyle, rootElementStyle, 1.0f))->evaluate(parentSize); |
else if (primitiveValue->isViewportPercentageLength()) |
size = valueForLength(primitiveValue->viewportPercentageLength(), 0, m_document->renderView()); |
else |