Restructure type tracking in StyleValues to work better with new numeric types

third_party/WebKit/Source/build/scripts/templates/CSSOMTypes.cpp.tmpl

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/cssom/CSSOMTypes.h"
 
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/cssom/CSSOMKeywords.h"
 #include "core/css/cssom/CSSKeywordValue.h"
 #include "core/css/cssom/CSSStyleValue.h"
 
 namespace blink {
 
 bool CSSOMTypes::PropertyCanTake(CSSPropertyID id,
                                  const CSSStyleValue& styleValue) {
-  // Shortcut special case.
-  if (styleValue.GetType() == CSSStyleValue::kSimpleLengthType ||
-      styleValue.GetType() == CSSStyleValue::kCalcLengthType) {
-    // TODO(meade): Rewrite this once the new length types are spec'd.
-    // if (ToCSSLengthValue(styleValue).ContainsPercent() &&
-    //     !CSSPropertyMetadata::PropertySupportsPercentage(id)) {
-    //   return false;
-    // }
-  } else if (styleValue.GetType() == CSSStyleValue::kKeywordType) {
-    // Keywords are also handled differently.
+  if (styleValue.GetType() == CSSStyleValue::kKeywordType) {
     return CSSOMKeywords::ValidKeywordForProperty(
         id, ToCSSKeywordValue(styleValue));
-  } else if (styleValue.GetType() == CSSStyleValue::kUnknown) {
+  }
+  if (styleValue.ContainsPercent() &&
+      !CSSPropertyMetadata::PropertySupportsPercentage(id)) {
+    return false;
+  }
+  if (styleValue.GetType() == CSSStyleValue::kUnknownType) {
     // The check happens later in this case.
     return true;
   }
 
   return CSSOMTypes::PropertyCanTakeType(id, styleValue.GetType());
 }
 
 bool CSSOMTypes::PropertyCanTakeType(CSSPropertyID id,
                                      CSSStyleValue::StyleValueType type) {
   switch (id) {
     {% for property_id, property in properties.items() if property.typedom_types %}
     case {{property_id}}:
       return (
           {% for type in property.typedom_types %}
           {{ "|| " if not loop.first }}type == CSSStyleValue::k{{type}}Type
           {% endfor %}
       );
     {% endfor %}
     default:
       return false;
   }
 }
 
 }  // namespace blink