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

Side by Side Diff: Source/core/css/CSSParser.cpp

Issue 16404015: Unprefix -webkit-min-content and -webkit-max-content for grid layout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined change Created 7 years, 6 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 4643 matching lines...) Expand 10 before | Expand all | Expand 10 after
4654 } 4654 }
4655 4655
4656 if (PassRefPtr<CSSPrimitiveValue> trackBreadth = parseGridBreadth(currentVal ue)) 4656 if (PassRefPtr<CSSPrimitiveValue> trackBreadth = parseGridBreadth(currentVal ue))
4657 return trackBreadth; 4657 return trackBreadth;
4658 4658
4659 return 0; 4659 return 0;
4660 } 4660 }
4661 4661
4662 PassRefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue* curren tValue) 4662 PassRefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue* curren tValue)
4663 { 4663 {
4664 if (currentValue->id == CSSValueWebkitMinContent || currentValue->id == CSSV alueWebkitMaxContent) 4664 if (currentValue->id == CSSValueMinContent || currentValue->id == CSSValueMa xContent)
4665 return cssValuePool().createIdentifierValue(currentValue->id); 4665 return cssValuePool().createIdentifierValue(currentValue->id);
4666 4666
4667 if (currentValue->unit == CSSPrimitiveValue::CSS_FR) { 4667 if (currentValue->unit == CSSPrimitiveValue::CSS_FR) {
4668 double flexValue = currentValue->fValue; 4668 double flexValue = currentValue->fValue;
4669 4669
4670 // Fractional unit is a non-negative dimension. 4670 // Fractional unit is a non-negative dimension.
4671 if (flexValue <= 0) 4671 if (flexValue <= 0)
4672 return 0; 4672 return 0;
4673 4673
4674 return cssValuePool().createValue(flexValue, CSSPrimitiveValue::CSS_FR); 4674 return cssValuePool().createValue(flexValue, CSSPrimitiveValue::CSS_FR);
(...skipping 7149 matching lines...) Expand 10 before | Expand all | Expand 10 after
11824 { 11824 {
11825 // The tokenizer checks for the construct of an+b. 11825 // The tokenizer checks for the construct of an+b.
11826 // However, since the {ident} rule precedes the {nth} rule, some of those 11826 // However, since the {ident} rule precedes the {nth} rule, some of those
11827 // tokens are identified as string literal. Furthermore we need to accept 11827 // tokens are identified as string literal. Furthermore we need to accept
11828 // "odd" and "even" which does not match to an+b. 11828 // "odd" and "even" which does not match to an+b.
11829 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11829 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11830 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11830 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11831 } 11831 }
11832 11832
11833 } 11833 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698