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

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

Issue 920553002: Combine two validUnit calls (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add test for calc Created 5 years, 10 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
« no previous file with comments | « LayoutTests/css3/calc/calc-numbers-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 if (!validPrimitive) 1009 if (!validPrimitive)
1010 return false; 1010 return false;
1011 parsedValue2 = createPrimitiveNumericValue(value); 1011 parsedValue2 = createPrimitiveNumericValue(value);
1012 } else 1012 } else
1013 parsedValue2 = parsedValue1; 1013 parsedValue2 = parsedValue1;
1014 1014
1015 addProperty(propId, createPrimitiveValuePair(parsedValue1.release(), par sedValue2.release()), important); 1015 addProperty(propId, createPrimitiveValuePair(parsedValue1.release(), par sedValue2.release()), important);
1016 return true; 1016 return true;
1017 } 1017 }
1018 case CSSPropertyTabSize: 1018 case CSSPropertyTabSize:
1019 // May be specified as a unit-less non-negative integer indicating numbe r of space characters... 1019 // May be specified as a unit-less non-negative integer or length indica ting number of space characters.
1020 validPrimitive = validUnit(value, FInteger | FNonNeg); 1020 validPrimitive = validUnit(value, FInteger | FLength | FNonNeg);
1021 // ... or as a Length.
1022 if (!validPrimitive)
1023 validPrimitive = validUnit(value, FLength | FNonNeg);
1024 break; 1021 break;
1025 case CSSPropertyBorderRadius: 1022 case CSSPropertyBorderRadius:
1026 case CSSPropertyWebkitBorderRadius: 1023 case CSSPropertyWebkitBorderRadius:
1027 return parseBorderRadius(propId, important); 1024 return parseBorderRadius(propId, important);
1028 case CSSPropertyOutlineOffset: 1025 case CSSPropertyOutlineOffset:
1029 validPrimitive = validUnit(value, FLength); 1026 validPrimitive = validUnit(value, FLength);
1030 break; 1027 break;
1031 case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS 3, so treat as CSS3 1028 case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS 3, so treat as CSS3
1032 case CSSPropertyBoxShadow: 1029 case CSSPropertyBoxShadow:
1033 case CSSPropertyWebkitBoxShadow: 1030 case CSSPropertyWebkitBoxShadow:
(...skipping 7483 matching lines...) Expand 10 before | Expand all | Expand 10 after
8517 } 8514 }
8518 } 8515 }
8519 8516
8520 if (!list->length()) 8517 if (!list->length())
8521 return nullptr; 8518 return nullptr;
8522 8519
8523 return list.release(); 8520 return list.release();
8524 } 8521 }
8525 8522
8526 } // namespace blink 8523 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/css3/calc/calc-numbers-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698