| Index: third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| index 9c09b8c988ccee87e1958fbdc98b8f50b8572342..0874a35243ff5cccb3d434e3ae3d0cf6992bb036 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| @@ -52,9 +52,9 @@ CSSToLengthConversionData::FontSizes::FontSizes(const ComputedStyle* style,
|
|
|
| float CSSToLengthConversionData::FontSizes::ex() const {
|
| ASSERT(m_font);
|
| - // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
|
| - // We really need to compute EX using fontMetrics for the original specifiedSize and not use
|
| - // our actual constructed layoutObject font.
|
| + // FIXME: We have a bug right now where the zoom will be applied twice to EX
|
| + // units. We really need to compute EX using fontMetrics for the original
|
| + // specifiedSize and not use our actual constructed layoutObject font.
|
| if (!m_font->getFontMetrics().hasXHeight())
|
| return m_em / 2.0f;
|
| return m_font->getFontMetrics().xHeight();
|
| @@ -119,8 +119,9 @@ double CSSToLengthConversionData::zoomedComputedPixels(
|
| double value,
|
| CSSPrimitiveValue::UnitType type) const {
|
| // The logic in this function is duplicated in MediaValues::computeLength()
|
| - // because MediaValues::computeLength() needs nearly identical logic, but we haven't found a way to make
|
| - // zoomedComputedPixels() more generic (to solve both cases) without hurting performance.
|
| + // because MediaValues::computeLength() needs nearly identical logic, but we
|
| + // haven't found a way to make zoomedComputedPixels() more generic (to solve
|
| + // both cases) without hurting performance.
|
| switch (type) {
|
| case CSSPrimitiveValue::UnitType::Pixels:
|
| case CSSPrimitiveValue::UnitType::UserUnits:
|
| @@ -153,8 +154,9 @@ double CSSToLengthConversionData::zoomedComputedPixels(
|
| case CSSPrimitiveValue::UnitType::ViewportMax:
|
| return value * viewportMaxPercent() * zoom();
|
|
|
| - // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming
|
| - // for font sizes is much more complicated, since we have to worry about enforcing the minimum font size preference
|
| + // We do not apply the zoom factor when we are computing the value of the
|
| + // font-size property. The zooming for font sizes is much more complicated,
|
| + // since we have to worry about enforcing the minimum font size preference
|
| // as well as enforcing the implicit "smart minimum."
|
| case CSSPrimitiveValue::UnitType::Ems:
|
| case CSSPrimitiveValue::UnitType::QuirkyEms:
|
|
|