diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/svg/SVGLength.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/svg/SVGLength.cpp')
| -rw-r--r-- | Source/WebCore/svg/SVGLength.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/svg/SVGLength.cpp b/Source/WebCore/svg/SVGLength.cpp index 6d75f8b..281ee14 100644 --- a/Source/WebCore/svg/SVGLength.cpp +++ b/Source/WebCore/svg/SVGLength.cpp @@ -438,7 +438,7 @@ float SVGLength::convertValueFromUserUnitsToEXS(float value, const SVGElement* c // 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->font().xHeight()); + float xHeight = ceilf(style->fontMetrics().xHeight()); if (!xHeight) { ec = NOT_SUPPORTED_ERR; return 0; @@ -457,7 +457,7 @@ float SVGLength::convertValueFromEXSToUserUnits(float value, const SVGElement* c RenderStyle* style = context->renderer()->style(); // 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->font().xHeight()); + return value * ceilf(style->fontMetrics().xHeight()); } SVGLength SVGLength::fromCSSPrimitiveValue(CSSPrimitiveValue* value) |