Revert of Evacuate ComputedStyle references from the CSS*Value hierarchy

third_party/WebKit/Source/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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/css/CSSPrimitiveValue.h"
 
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSHelper.h"
 #include "core/css/CSSMarkup.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/CSSValuePool.h"
+#include "core/css/StyleSheetContents.h"
+#include "core/dom/Node.h"
+#include "core/style/ComputedStyle.h"
 #include "platform/LayoutUnit.h"
+#include "platform/fonts/FontMetrics.h"
 #include "wtf/StdLibExtras.h"
+#include "wtf/text/StringBuffer.h"
+#include "wtf/text/StringBuilder.h"
 
 using namespace WTF;
 
 namespace blink {
 
 namespace {
 
 // Max/min values for CSS, needs to slightly smaller/larger than the true max/min values to allow for rounding without overflowing.
 // Subtract two (rather than one) to allow for values to be converted to float and back without exceeding the LayoutUnit::max.
 const int maxValueForCssLength = INT_MAX / kFixedPointDenominator - 2;
@@ skipping 93 matching lines @@
     case CSSPrimitiveValue::UnitType::Integer:
         result = pool.numberCacheValue(intValue);
         if (!result)
             result = pool.setNumberCacheValue(intValue, new CSSPrimitiveValue(value, CSSPrimitiveValue::UnitType::Integer));
         return result;
     default:
         return new CSSPrimitiveValue(value, type);
     }
 }
 
+CSSPrimitiveValue* CSSPrimitiveValue::create(const Length& value, const ComputedStyle& style)
+{
+    return CSSPrimitiveValue::create(value, style.effectiveZoom());
+}
+
 using CSSTextCache = PersistentHeapHashMap<WeakMember<const CSSPrimitiveValue>, String>;
 
 static CSSTextCache& cssTextCache()
 {
     DEFINE_STATIC_LOCAL(CSSTextCache, cache, ());
     return cache;
 }
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::typeWithCalcResolved() const
 {
@@ skipping 608 matching lines @@
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink