| Index: third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
|
| index 0b6d073c0ab81d11447914455e39d50c43181367..fcb6425c04e7d39ff616fb1b8bc5d7939445f6c3 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.cpp
|
| @@ -349,7 +349,7 @@ float SVGLengthContext::convertValueFromUserUnitsToCHS(float value) const
|
| if (!style)
|
| return 0;
|
|
|
| - float zeroWidth = style->fontMetrics().zeroWidth() / style->effectiveZoom();
|
| + float zeroWidth = style->getFontMetrics().zeroWidth() / style->effectiveZoom();
|
| if (!zeroWidth)
|
| return 0;
|
|
|
| @@ -362,7 +362,7 @@ float SVGLengthContext::convertValueFromCHSToUserUnits(float value) const
|
| if (!style)
|
| return 0;
|
|
|
| - return value * style->fontMetrics().zeroWidth() / style->effectiveZoom();
|
| + return value * style->getFontMetrics().zeroWidth() / style->effectiveZoom();
|
| }
|
|
|
| float SVGLengthContext::convertValueFromUserUnitsToEXS(float value) const
|
| @@ -373,7 +373,7 @@ float SVGLengthContext::convertValueFromUserUnitsToEXS(float value) const
|
|
|
| // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
|
| // if this causes problems in real world cases maybe it would be best to remove this
|
| - float xHeight = ceilf(style->fontMetrics().xHeight() / style->effectiveZoom());
|
| + float xHeight = ceilf(style->getFontMetrics().xHeight() / style->effectiveZoom());
|
| if (!xHeight)
|
| return 0;
|
|
|
| @@ -388,7 +388,7 @@ float SVGLengthContext::convertValueFromEXSToUserUnits(float value) const
|
|
|
| // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
|
| // if this causes problems in real world cases maybe it would be best to remove this
|
| - return value * ceilf(style->fontMetrics().xHeight() / style->effectiveZoom());
|
| + return value * ceilf(style->getFontMetrics().xHeight() / style->effectiveZoom());
|
| }
|
|
|
| bool SVGLengthContext::determineViewport(FloatSize& viewportSize) const
|
|
|