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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 345903005: calc expressions should support time, angle and frequency values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix build warrning. Created 6 years, 5 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
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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 b = true; 211 b = true;
212 if (b && mustBeNonNegative && m_parsedCalculation->isNegative()) 212 if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
213 b = false; 213 b = false;
214 break; 214 break;
215 case CalcPercentLength: 215 case CalcPercentLength:
216 b = (unitflags & FPercent) && (unitflags & FLength); 216 b = (unitflags & FPercent) && (unitflags & FLength);
217 break; 217 break;
218 case CalcPercentNumber: 218 case CalcPercentNumber:
219 b = (unitflags & FPercent) && (unitflags & FNumber); 219 b = (unitflags & FPercent) && (unitflags & FNumber);
220 break; 220 break;
221 case CalcAngle:
222 b = (unitflags & FAngle);
223 break;
224 case CalcTime:
225 b = (unitflags & FTime);
226 break;
227 case CalcFrequency:
228 b = (unitflags & FFrequency);
229 break;
221 case CalcOther: 230 case CalcOther:
222 break; 231 break;
223 } 232 }
224 if (!b || releaseCalc == ReleaseParsedCalcValue) 233 if (!b || releaseCalc == ReleaseParsedCalcValue)
225 m_parsedCalculation.release(); 234 m_parsedCalculation.release();
226 return b; 235 return b;
227 } 236 }
228 237
229 inline bool CSSPropertyParser::shouldAcceptUnitLessValues(CSSParserValue* value, Units unitflags, CSSParserMode cssParserMode) 238 inline bool CSSPropertyParser::shouldAcceptUnitLessValues(CSSParserValue* value, Units unitflags, CSSParserMode cssParserMode)
230 { 239 {
(...skipping 8283 matching lines...) Expand 10 before | Expand all | Expand 10 after
8514 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8523 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8515 if (!seenStroke) 8524 if (!seenStroke)
8516 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8525 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8517 if (!seenMarkers) 8526 if (!seenMarkers)
8518 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8527 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8519 8528
8520 return parsedValues.release(); 8529 return parsedValues.release();
8521 } 8530 }
8522 8531
8523 } // namespace WebCore 8532 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698