Refactored out need to pass property to IsValidAnimationPropertyList.

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

 // Copyright 2015 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/parser/CSSPropertyParser.h"
 
 #include <memory>
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
@@ skipping 472 matching lines @@
       return ConsumeTransitionProperty(range);
     case CSSPropertyAnimationTimingFunction:
     case CSSPropertyTransitionTimingFunction:
       return ConsumeAnimationTimingFunction(range);
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
-static bool IsValidAnimationPropertyList(CSSPropertyID property,
-                                         const CSSValueList& value_list) {
-  if (property != CSSPropertyTransitionProperty || value_list.length() < 2)
+static bool IsValidAnimationPropertyList(const CSSValueList& value_list) {
+  if (value_list.length() < 2)
     return true;
   for (auto& value : value_list) {
     if (value->IsIdentifierValue() &&
         ToCSSIdentifierValue(*value).GetValueID() == CSSValueNone)
       return false;
   }
   return true;
 }
 
 static CSSValueList* ConsumeAnimationPropertyList(
     CSSPropertyID property,
     CSSParserTokenRange& range,
     const CSSParserContext* context,
     bool use_legacy_parsing) {
   CSSValueList* list = CSSValueList::CreateCommaSeparated();
   do {
     CSSValue* value =
         ConsumeAnimationValue(property, range, context, use_legacy_parsing);
     if (!value)
       return nullptr;
     list->Append(*value);
   } while (ConsumeCommaIncludingWhitespace(range));
-  if (!IsValidAnimationPropertyList(property, *list))
+  if (property == CSSPropertyTransitionProperty &&
+      !IsValidAnimationPropertyList(*list))
     return nullptr;
   DCHECK(list->length());
   return list;
 }
 
 bool CSSPropertyParser::ConsumeAnimationShorthand(
     const StylePropertyShorthand& shorthand,
     bool use_legacy_parsing,
     bool important) {
   const unsigned longhand_count = shorthand.length();
@@ skipping 25 matching lines @@
 
     // TODO(timloh): This will make invalid longhands, see crbug.com/386459
     for (size_t i = 0; i < longhand_count; ++i) {
       if (!parsed_longhand[i])
         longhands[i]->Append(*CSSInitialValue::Create());
       parsed_longhand[i] = false;
     }
   } while (ConsumeCommaIncludingWhitespace(range_));
 
   for (size_t i = 0; i < longhand_count; ++i) {
-    if (!IsValidAnimationPropertyList(shorthand.properties()[i], *longhands[i]))
+    // TODO(bugsnash): Refactor out the need to check for
+    // CSSPropertyTransitionProperty here when this is method implemented in the
+    // property APIs
+    if (shorthand.properties()[i] == CSSPropertyTransitionProperty &&
+        !IsValidAnimationPropertyList(*longhands[i]))
       return false;
   }
 
   for (size_t i = 0; i < longhand_count; ++i)
     AddProperty(shorthand.properties()[i], shorthand.id(), *longhands[i],
                 important);
 
   return range_.AtEnd();
 }
 
@@ skipping 2852 matching lines @@
     case CSSPropertyPlaceItems:
       return ConsumePlaceItemsShorthand(important);
     case CSSPropertyPlaceSelf:
       return ConsumePlaceSelfShorthand(important);
     default:
       return false;
   }
 }
 
 }  // namespace blink