implicit WIP

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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.
@@ skipping 269 matching lines @@
         if (serializedAsShorthand)
             continue;
 
         result.append(getPropertyText(propertyID, property.value()->cssText(), property.isImportant(), numDecls++));
     }
 
     ASSERT(!numDecls ^ !result.isEmpty());
     return result.toString();
 }
 
-// As per css-cascade, shorthands do not expand longhands to the value
-// "initial", except when the shorthand is set to "initial", instead
-// setting "missing" sub-properties to their initial values. This means
-// that a shorthand can never represent a list of subproperties where
-// some are "initial" and some are not, and so serialization should
-// always fail in these cases (as per cssom). However we currently use
-// "initial" instead of the initial values for certain shorthands, so
-// these are special-cased here.
-// TODO(timloh): Don't use "initial" in shorthands and remove this
-// special-casing
-static bool allowInitialInShorthand(CSSPropertyID propertyID)
-{
-    switch (propertyID) {
-    case CSSPropertyBorder:
-    case CSSPropertyBorderTop:
-    case CSSPropertyBorderRight:
-    case CSSPropertyBorderBottom:
-    case CSSPropertyBorderLeft:
-    case CSSPropertyOutline:
-    case CSSPropertyColumnRule:
-    case CSSPropertyColumns:
-    case CSSPropertyFlex:
-    case CSSPropertyFlexFlow:
-    case CSSPropertyGridColumn:
-    case CSSPropertyGridRow:
-    case CSSPropertyGridArea:
-    case CSSPropertyGridGap:
-    case CSSPropertyMotion:
-    case CSSPropertyWebkitMarginCollapse:
-    case CSSPropertyListStyle:
-    case CSSPropertyWebkitTextEmphasis:
-    case CSSPropertyWebkitTextStroke:
-        return true;
-    default:
-        return false;
-    }
-}
-
-// TODO(timloh): This should go away eventually, see crbug.com/471917
-static bool allowImplicitInitialInShorthand(CSSPropertyID propertyID)
-{
-    return propertyID == CSSPropertyBackground || propertyID == CSSPropertyWebkitMask;
-}
-
 String StylePropertySerializer::commonShorthandChecks(const StylePropertyShorthand& shorthand) const
 {
     int longhandCount = shorthand.length();
     DCHECK_LE(longhandCount, 17);
     const CSSValue* longhands[17] = {};
 
     bool hasImportant = false;
     bool hasNonImportant = false;
 
     for (int i = 0; i < longhandCount; i++) {
@@ skipping 22 matching lines @@
                 break;
             }
         }
         if (success) {
             if (longhands[0]->isPendingSubstitutionValue())
                 return toCSSPendingSubstitutionValue(longhands[0])->shorthandValue()->cssText();
             return longhands[0]->cssText();
         }
     }
 
-    bool allowInitial = allowInitialInShorthand(shorthand.id());
-    bool allowImplicitInitial = allowInitial || allowImplicitInitialInShorthand(shorthand.id());
+    bool allowInitial = false;
+    bool allowImplicitInitial = true;
     for (int i = 0; i < longhandCount; i++) {
         const CSSValue& value = *longhands[i];
         if (value.isImplicitInitialValue()) {
             if (allowImplicitInitial)
                 continue;
             return emptyString();
         }
         if (!allowInitial && value.isInitialValue())
             return emptyString();
         // TODO(timloh): This should also check unset
@@ skipping 482 matching lines @@
             builder.append(", ");
 
         const CSSValue& xValue = repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX;
         const CSSValue& yValue = repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY;
         appendBackgroundRepeatValue(builder, xValue, yValue);
     }
     return builder.toString();
 }
 
 } // namespace blink