Merge 114699 - REGRESSION(r112177): Numbered list item rendered bulleted

Source/WebCore/css/StylePropertySet.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.
  *
  * 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 364 matching lines @@
     }
     return res;
 }
 
 String StylePropertySet::getShorthandValue(const CSSPropertyLonghand& longhand) const
 {
     String res;
     for (unsigned i = 0; i < longhand.length(); ++i) {
         if (!isPropertyImplicit(longhand.properties()[i])) {
             RefPtr<CSSValue> value = getPropertyCSSValue(longhand.properties()[i]);
-            // FIXME: provide default value if !value or value is initial value
-            if (value && !value->isInitialValue()) {
-                if (!res.isNull())
-                    res += " ";
-                res += value->cssText();
-            }
+            if (value && value->isInitialValue())
+                continue;
+            if (!value)
+                return String();
+            if (!res.isNull())
+                res += " ";
+            res += value->cssText();
         }
     }
     return res;
 }
 
 // only returns a non-null value if all properties have the same, non-null value
 String StylePropertySet::getCommonValue(const CSSPropertyLonghand& longhand) const
 {
     String res;
     for (unsigned i = 0; i < longhand.length(); ++i) {
@@ skipping 592 matching lines @@
     propertySetCSSOMWrapperMap().get(this)->clearParentElement();
 }
 
 class SameSizeAsStylePropertySet : public RefCounted<SameSizeAsStylePropertySet> {
     Vector<CSSProperty, 4> properties;
     unsigned bitfield;
 };
 COMPILE_ASSERT(sizeof(StylePropertySet) == sizeof(SameSizeAsStylePropertySet), style_property_set_should_stay_small);
 
 } // namespace WebCore