| Index: Source/core/css/CSSPrimitiveValue.cpp
|
| diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
|
| index ff8dfa72a5c34d5d6359a3c706946a0fa64400cc..34fe4b6636ecaf48f896ae8e517fcd4453992315 100644
|
| --- a/Source/core/css/CSSPrimitiveValue.cpp
|
| +++ b/Source/core/css/CSSPrimitiveValue.cpp
|
| @@ -295,10 +295,10 @@ CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitTypes type)
|
| m_value.string->ref();
|
| }
|
|
|
| -CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize)
|
| +CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize, const RenderStyle& style)
|
| : CSSValue(PrimitiveClass)
|
| {
|
| - init(lengthSize);
|
| + init(lengthSize, style);
|
| }
|
|
|
| CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color, UnitTypes type)
|
| @@ -408,11 +408,11 @@ void CSSPrimitiveValue::init(const Length& length)
|
| }
|
| }
|
|
|
| -void CSSPrimitiveValue::init(const LengthSize& lengthSize)
|
| +void CSSPrimitiveValue::init(const LengthSize& lengthSize, const RenderStyle& style)
|
| {
|
| m_primitiveUnitType = CSS_PAIR;
|
| m_hasCachedCSSText = false;
|
| - m_value.pair = Pair::create(create(lengthSize.width()), create(lengthSize.height()), Pair::KeepIdenticalValues).leakRef();
|
| + m_value.pair = Pair::create(create(lengthSize.width(), style.effectiveZoom()), create(lengthSize.height(), style.effectiveZoom()), Pair::KeepIdenticalValues).leakRef();
|
| }
|
|
|
| void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Counter> c)
|
|
|