Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef StyleBuilderConverter_h
 #define StyleBuilderConverter_h
 
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
 #include "core/style/StyleMotionRotation.h"
 #include "core/style/StyleReflection.h"
 #include "core/style/StyleScrollSnapData.h"
 #include "core/style/TransformOrigin.h"
@@ skipping 88 matching lines @@
 template <typename T>
 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, const CSSValue& value)
 {
     return toCSSPrimitiveValue(value).computeLength<T>(state.cssToLengthConversionData());
 }
 
 template <typename T>
 T StyleBuilderConverter::convertFlags(StyleResolverState& state, const CSSValue& value)
 {
     T flags = static_cast<T>(0);
-    if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone)
+    if (value.isIdentifierValue() && toCSSIdentifierValue(value).getValueID() == CSSValueNone)
         return flags;
     for (auto& flagValue : toCSSValueList(value))
-        flags |= toCSSPrimitiveValue(*flagValue).convertTo<T>();
+        flags |= toCSSIdentifierValue(*flagValue).convertTo<T>();
     return flags;
 }
 
 template <typename T>
 T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, const CSSValue& value)
 {
+    if (value.isIdentifierValue()) {
+        CSSValueID valueID = toCSSIdentifierValue(value).getValueID();
+        if (valueID == CSSValueThin)
+            return 1;
+        if (valueID == CSSValueMedium)
+            return 3;
+        if (valueID == CSSValueThick)
+            return 5;
+        NOTREACHED();
+        return 0;
+    }
     const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
-    CSSValueID valueID = primitiveValue.getValueID();
-    if (valueID == CSSValueThin)
-        return 1;
-    if (valueID == CSSValueMedium)
-        return 3;
-    if (valueID == CSSValueThick)
-        return 5;
-    if (valueID == CSSValueInvalid) {
-        // FIXME: We are moving to use the full page zoom implementation to handle high-dpi.
-        // In that case specyfing a border-width of less than 1px would result in a border that is one device pixel thick.
-        // With this change that would instead be rounded up to 2 device pixels.
-        // Consider clamping it to device pixels or zoom adjusted CSS pixels instead of raw CSS pixels.
-        // Reference crbug.com/485650 and crbug.com/382483
-        double result = primitiveValue.computeLength<double>(state.cssToLengthConversionData());
-        if (result > 0.0 && result < 1.0)
-            return 1.0;
-        return clampTo<T>(roundForImpreciseConversion<T>(result), defaultMinimumForClamp<T>(), defaultMaximumForClamp<T>());
-    }
-    ASSERT_NOT_REACHED();
-    return 0;
+    // FIXME: We are moving to use the full page zoom implementation to handle high-dpi.
+    // In that case specyfing a border-width of less than 1px would result in a border that is one device pixel thick.
+    // With this change that would instead be rounded up to 2 device pixels.
+    // Consider clamping it to device pixels or zoom adjusted CSS pixels instead of raw CSS pixels.
+    // Reference crbug.com/485650 and crbug.com/382483
+    double result = primitiveValue.computeLength<double>(state.cssToLengthConversionData());
+    if (result > 0.0 && result < 1.0)
+        return 1.0;
+    return clampTo<T>(roundForImpreciseConversion<T>(result), defaultMinimumForClamp<T>(), defaultMaximumForClamp<T>());
 }
 
 template <CSSValueID IdForNone>
 AtomicString StyleBuilderConverter::convertString(StyleResolverState&, const CSSValue& value)
 {
     if (value.isStringValue())
         return AtomicString(toCSSStringValue(value).value());
-    ASSERT(toCSSPrimitiveValue(value).getValueID() == IdForNone);
+    DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), IdForNone);
     return nullAtom;
 }
 
 } // namespace blink
 
 #endif