| Index: Source/core/css/MediaValues.cpp
|
| diff --git a/Source/core/css/MediaValues.cpp b/Source/core/css/MediaValues.cpp
|
| index 1dd27f4d7a54f4ef37013d1536533e9b95694bf5..5ae52fcc6400fbc02adce688168532e0f54cf749 100644
|
| --- a/Source/core/css/MediaValues.cpp
|
| +++ b/Source/core/css/MediaValues.cpp
|
| @@ -138,7 +138,7 @@ MediaValues::PointerDeviceType MediaValues::calculateLeastCapablePrimaryPointerD
|
| return MediaValues::UnknownPointer;
|
| }
|
|
|
| -bool MediaValues::computeLength(double value, CSSPrimitiveValue::UnitTypes type, unsigned defaultFontSize, unsigned viewportWidth, unsigned viewportHeight, int& result)
|
| +bool MediaValues::computeLengthImpl(double value, CSSPrimitiveValue::UnitTypes type, unsigned defaultFontSize, unsigned viewportWidth, unsigned viewportHeight, double& result)
|
| {
|
| // The logic in this function is duplicated from CSSPrimitiveValue::computeLengthDouble
|
| // because MediaValues::computeLength needs nearly identical logic, but we haven't found a way to make
|
| @@ -196,9 +196,10 @@ bool MediaValues::computeLength(double value, CSSPrimitiveValue::UnitTypes type,
|
| return false;
|
| }
|
|
|
| - ASSERT(factor > 0);
|
| - result = roundForImpreciseConversion<int>(value*factor);
|
| + result = value * factor;
|
| return true;
|
| +
|
| + ASSERT(factor > 0);
|
| }
|
|
|
| } // namespace
|
|
|