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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 validPrimitive = false; 1608 validPrimitive = false;
1609 break; 1609 break;
1610 // FIXME: crbug.com/154772 Unimplemented css-transforms properties 1610 // FIXME: crbug.com/154772 Unimplemented css-transforms properties
1611 case CSSPropertyBackfaceVisibility: 1611 case CSSPropertyBackfaceVisibility:
1612 case CSSPropertyPerspective: 1612 case CSSPropertyPerspective:
1613 case CSSPropertyPerspectiveOrigin: 1613 case CSSPropertyPerspectiveOrigin:
1614 case CSSPropertyTransform: 1614 case CSSPropertyTransform:
1615 case CSSPropertyTransformOrigin: 1615 case CSSPropertyTransformOrigin:
1616 case CSSPropertyTransformStyle: 1616 case CSSPropertyTransformStyle:
1617 return false; 1617 return false;
1618
1619 case CSSPropertyAll:
1620 // FIXME: need to add CSSValueUnset here.
1621 if (id == CSSValueInitial || id == CSSValueInherit) {
1622 validPrimitive = true;
1623 break;
1624 }
1625 return false;
1626
1618 default: 1627 default:
1619 return parseSVGValue(propId, important); 1628 return parseSVGValue(propId, important);
1620 } 1629 }
1621 1630
1622 if (validPrimitive) { 1631 if (validPrimitive) {
1623 parsedValue = parseValidPrimitive(id, value); 1632 parsedValue = parseValidPrimitive(id, value);
1624 m_valueList->next(); 1633 m_valueList->next();
1625 } 1634 }
1626 ASSERT(!m_parsedCalculation); 1635 ASSERT(!m_parsedCalculation);
1627 if (parsedValue) { 1636 if (parsedValue) {
(...skipping 5397 matching lines...) Expand 10 before | Expand all | Expand 10 after
7025 expectComma = false; 7034 expectComma = false;
7026 m_valueList->next(); 7035 m_valueList->next();
7027 continue; 7036 continue;
7028 } 7037 }
7029 7038
7030 if (currentValue->unit != CSSPrimitiveValue::CSS_IDENT) 7039 if (currentValue->unit != CSSPrimitiveValue::CSS_IDENT)
7031 return false; 7040 return false;
7032 7041
7033 CSSPropertyID property = cssPropertyID(currentValue->string); 7042 CSSPropertyID property = cssPropertyID(currentValue->string);
7034 if (property && RuntimeCSSEnabled::isCSSPropertyEnabled(property)) { 7043 if (property && RuntimeCSSEnabled::isCSSPropertyEnabled(property)) {
7035 if (property == CSSPropertyWillChange) 7044 // Now "all" is used by both CSSValue and CSSPropertyValue.
7045 // 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.
7046 if (property == CSSPropertyWillChange || property == CSSPropertyAll)
7036 return false; 7047 return false;
7037 values->append(cssValuePool().createIdentifierValue(property)); 7048 values->append(cssValuePool().createIdentifierValue(property));
7038 } else { 7049 } else {
7039 switch (currentValue->id) { 7050 switch (currentValue->id) {
7040 case CSSValueNone: 7051 case CSSValueNone:
7041 case CSSValueAll: 7052 case CSSValueAll:
7042 case CSSValueAuto: 7053 case CSSValueAuto:
7043 case CSSValueDefault: 7054 case CSSValueDefault:
7044 case CSSValueInitial: 7055 case CSSValueInitial:
7045 case CSSValueInherit: 7056 case CSSValueInherit:
(...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after
8240 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8251 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8241 if (!seenStroke) 8252 if (!seenStroke)
8242 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8253 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8243 if (!seenMarkers) 8254 if (!seenMarkers)
8244 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8255 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8245 8256
8246 return parsedValues.release(); 8257 return parsedValues.release();
8247 } 8258 }
8248 8259
8249 } // namespace WebCore 8260 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698