Fix serializing of 'unset' sub-properties

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 336 matching lines @@
         PropertyValueForSerializer value = m_propertySet.propertyAt(index);
 
         hasImportant |= value.isImportant();
         hasNonImportant |= !value.isImportant();
         longhands[i] = value.value();
     }
 
     if (hasImportant && hasNonImportant)
         return emptyString();
 
-    // TODO(timloh): This should be isCSSWideKeyword()
-    if (longhands[0]->isInitialValue() || longhands[0]->isInheritedValue()
-        || longhands[0]->isPendingSubstitutionValue()) {
+    if (longhands[0]->isCSSWideKeyword() || longhands[0]->isPendingSubstitutionValue()) {
         bool success = true;
         for (int i = 1; i < longhandCount; i++) {
             if (!longhands[i]->equals(*longhands[0])) {
                 // This should just return emptyString() but some shorthands currently
                 // allow 'initial' for their longhands.
                 success = false;
                 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());
     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
-        if (value.isInheritedValue() || value.isPendingSubstitutionValue())
+        if (value.isInheritedValue() || value.isUnsetValue() || value.isPendingSubstitutionValue())
             return emptyString();
         if (value.isVariableReferenceValue())
             return emptyString();
     }
 
     return String();
 }
 
 String StylePropertySerializer::getPropertyValue(CSSPropertyID propertyID) const
 {
@@ skipping 471 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