Remove zoom() and effectiveZoom().

sky/engine/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 279 matching lines @@
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     ASSERT(type == CSS_RGBCOLOR);
     m_primitiveUnitType = CSS_RGBCOLOR;
     m_value.rgbcolor = color;
 }
 
-CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
+CSSPrimitiveValue::CSSPrimitiveValue(const Length& length)
     : CSSValue(PrimitiveClass)
 {
     switch (length.type()) {
     case Auto:
         m_primitiveUnitType = CSS_VALUE_ID;
         m_value.valueID = CSSValueAuto;
         break;
     case Intrinsic:
         m_primitiveUnitType = CSS_VALUE_ID;
         m_value.valueID = CSSValueIntrinsic;
@@ skipping 22 matching lines @@
         m_primitiveUnitType = CSS_VALUE_ID;
         m_value.valueID = CSSValueInternalExtendToZoom;
         break;
     case Percent:
         m_primitiveUnitType = CSS_PERCENTAGE;
         ASSERT(std::isfinite(length.percent()));
         m_value.num = length.percent();
         break;
     case Fixed:
         m_primitiveUnitType = CSS_PX;
-        m_value.num = length.value() / zoom;
+        m_value.num = length.value();
         break;
     case Calculated: {
         const CalculationValue& calc = length.calculationValue();
         if (calc.pixels() && calc.percent()) {
             init(CSSCalcValue::create(
-                CSSCalcValue::createExpressionNode(calc.pixels() / zoom, calc.percent()),
+                CSSCalcValue::createExpressionNode(calc.pixels(), calc.percent()),
                 calc.isNonNegative() ? ValueRangeNonNegative : ValueRangeAll));
             break;
         }
         if (calc.percent()) {
             m_primitiveUnitType = CSS_PERCENTAGE;
             m_value.num = calc.percent();
         } else {
             m_primitiveUnitType = CSS_PX;
-            m_value.num = calc.pixels() / zoom;
+            m_value.num = calc.pixels();
         }
         if (m_value.num < 0 && calc.isNonNegative())
             m_value.num = 0;
         break;
     }
     case DeviceWidth:
     case DeviceHeight:
     case MaxSizeNone:
         ASSERT_NOT_REACHED();
         break;
     }
 }
 
 void CSSPrimitiveValue::init(const LengthSize& lengthSize, const RenderStyle& style)
 {
     m_primitiveUnitType = CSS_PAIR;
     m_hasCachedCSSText = false;
-    m_value.pair = Pair::create(create(lengthSize.width(), style.effectiveZoom()), create(lengthSize.height(), style.effectiveZoom()), Pair::KeepIdenticalValues).leakRef();
+    m_value.pair = Pair::create(create(lengthSize.width()), create(lengthSize.height()), Pair::KeepIdenticalValues).leakRef();
 }
 
 void CSSPrimitiveValue::init(PassRefPtr<Rect> r)
 {
     m_primitiveUnitType = CSS_RECT;
     m_hasCachedCSSText = false;
     m_value.rect = r.leakRef();
 }
 
 void CSSPrimitiveValue::init(PassRefPtr<Quad> quad)
@@ skipping 258 matching lines @@
             return -1.0;
     }
 
     // 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."
     double result = getDoubleValue() * factor;
     if (computingFontSize || isFontRelativeLength())
         return result;
 
-    return result * conversionData.zoom();
+    return result;
 }
 
 void CSSPrimitiveValue::accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const
 {
     ASSERT(lengthArray.size() == LengthUnitTypeCount);
 
     if (m_primitiveUnitType == CSS_CALC) {
         cssCalcValue()->accumulateLengthArray(lengthArray, multiplier);
         return;
     }
@@ skipping 685 matching lines @@
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink