Revert of Removing duplicate functions and symbol names in core/css

third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 17 matching lines @@
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyIDTemplates.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSVariableData.h"
 #include "core/css/ComputedStyleCSSValueMapping.h"
 #include "core/css/parser/CSSParser.h"
-#include "core/css/zoomAdjustedPixelValue.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/StyleEngine.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
@@ skipping 128 matching lines @@
     CSSPropertyScrollSnapPointsY, CSSPropertyScrollSnapCoordinate,
     CSSPropertyScrollSnapDestination, CSSPropertyTranslate, CSSPropertyRotate,
     CSSPropertyScale, CSSPropertyCaretColor};
 
 CSSValueID cssIdentifierForFontSizeKeyword(int keywordSize) {
   DCHECK_NE(keywordSize, 0);
   DCHECK_LE(keywordSize, 8);
   return static_cast<CSSValueID>(CSSValueXxSmall + keywordSize - 1);
 }
 
+inline CSSPrimitiveValue* zoomAdjustedPixelValue(double value,
+                                                 const ComputedStyle& style) {
+  return CSSPrimitiveValue::create(adjustFloatForAbsoluteZoom(value, style),
+                                   CSSPrimitiveValue::UnitType::Pixels);
+}
+
 void logUnimplementedPropertyID(CSSPropertyID propertyID) {
   DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ());
   if (!propertyIDSet.insert(propertyID).isNewEntry)
     return;
 
   DLOG(ERROR) << "Blink does not yet implement getComputedStyle for '"
               << getPropertyName(propertyID) << "'.";
 }
 
 bool isLayoutDependent(CSSPropertyID propertyID,
@@ skipping 361 matching lines @@
       "These styles are computed, and therefore the '" +
           getPropertyNameString(id) + "' property is read-only.");
 }
 
 DEFINE_TRACE(CSSComputedStyleDeclaration) {
   visitor->trace(m_node);
   CSSStyleDeclaration::trace(visitor);
 }
 
 }  // namespace blink