Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: Source/WebCore/css/StylePropertySet.cpp

Issue 10140014: Merge 114699 - REGRESSION(r112177): Numbered list item rendered bulleted (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/css/CSSParser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/css/StylePropertySet.cpp
===================================================================
--- Source/WebCore/css/StylePropertySet.cpp (revision 114992)
+++ Source/WebCore/css/StylePropertySet.cpp (working copy)
@@ -382,12 +382,13 @@
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;
« no previous file with comments | « Source/WebCore/css/CSSParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698