Chromium Code Reviews| Index: Source/core/css/resolver/ViewportStyleResolver.cpp |
| diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp |
| index 21e30fe915c50820ffdb326471ecaf084e0da73d..a92a7cd35e7489fabffb499bceb46376e3b45f2d 100644 |
| --- a/Source/core/css/resolver/ViewportStyleResolver.cpp |
| +++ b/Source/core/css/resolver/ViewportStyleResolver.cpp |
| @@ -31,6 +31,7 @@ |
| #include "core/css/resolver/ViewportStyleResolver.h" |
| #include "CSSValueKeywords.h" |
| +#include "core/css/CSSToLengthConversionData.h" |
| #include "core/css/StylePropertySet.h" |
| #include "core/css/StyleRule.h" |
| #include "core/dom/Document.h" |
| @@ -183,7 +184,7 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const |
| CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get()); |
| if (primitiveValue->isLength()) |
| - return primitiveValue->computeLength<Length>(m_document->renderStyle(), m_document->renderStyle()); |
| + return primitiveValue->computeLength<Length>(CSSToLengthConversionData(m_document->renderStyle(), m_document->renderStyle(), 1)); |
|
Julien - ping for review
2013/11/26 05:31:07
1.0f <- let's avoid implicit conversion.
Timothy Loh
2013/11/27 05:44:51
The style guide says not to append .0f... but afte
|
| if (primitiveValue->isViewportPercentageLength()) |
| return primitiveValue->viewportPercentageLength(); |