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

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 216803002: Implement all shorthand property. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated css-properties-as-js-properties-expected.txt Created 6 years, 9 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
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index 400fa3d79b3a344160ccc4432c94e76d2af82520..bd64f46b490370f014878b191fa102fe6a3162bd 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -1615,6 +1615,15 @@ bool CSSPropertyParser::parseValue(CSSPropertyID propId, bool important)
case CSSPropertyTransformOrigin:
case CSSPropertyTransformStyle:
return false;
+
+ case CSSPropertyAll:
+ // FIXME: need to add CSSValueUnset here.
+ if (id == CSSValueInitial || id == CSSValueInherit) {
+ validPrimitive = true;
+ break;
+ }
+ return false;
+
default:
return parseSVGValue(propId, important);
}
@@ -7032,7 +7041,9 @@ bool CSSPropertyParser::parseWillChange(bool important)
CSSPropertyID property = cssPropertyID(currentValue->string);
if (property && RuntimeCSSEnabled::isCSSPropertyEnabled(property)) {
- if (property == CSSPropertyWillChange)
+ // Now "all" is used by both CSSValue and CSSPropertyValue.
+ // Need to return false when curretValue is CSSPropertyAll.
dglazkov 2014/03/28 16:56:03 curretValue -> currentValue
tasak 2014/04/01 10:17:49 Done.
+ if (property == CSSPropertyWillChange || property == CSSPropertyAll)
return false;
values->append(cssValuePool().createIdentifierValue(property));
} else {

Powered by Google App Engine
This is Rietveld 408576698