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

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

Issue 14786002: Allow defining named grid lines on the grid element (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 4654 matching lines...) Expand 10 before | Expand all | Expand 10 after
4665 CSSParserValue* value = m_valueList->current(); 4665 CSSParserValue* value = m_valueList->current();
4666 if (value->id == CSSValueNone) { 4666 if (value->id == CSSValueNone) {
4667 if (m_valueList->next()) 4667 if (m_valueList->next())
4668 return false; 4668 return false;
4669 4669
4670 addProperty(propId, cssValuePool().createIdentifierValue(value->id), imp ortant); 4670 addProperty(propId, cssValuePool().createIdentifierValue(value->id), imp ortant);
4671 return true; 4671 return true;
4672 } 4672 }
4673 4673
4674 RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated(); 4674 RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
4675 size_t currentLineNumber = 0;
4675 while (m_valueList->current()) { 4676 while (m_valueList->current()) {
4677 while (m_valueList->current() && m_valueList->current()->unit == CSSPrim itiveValue::CSS_STRING) {
4678 RefPtr<CSSPrimitiveValue> name = createPrimitiveStringValue(m_valueL ist->current());
4679 values->append(name);
4680 m_valueList->next();
4681 }
4682
4683 // This allows trailing <string>* per the specification.
4684 if (!m_valueList->current())
4685 break;
4686
4676 RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize(); 4687 RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize();
4677 if (!primitiveValue) 4688 if (!primitiveValue)
4678 return false; 4689 return false;
4679 4690
4680 values->append(primitiveValue.release()); 4691 values->append(primitiveValue.release());
4681 } 4692 }
4682 addProperty(propId, values.release(), important); 4693 addProperty(propId, values.release(), important);
4683 return true; 4694 return true;
4684 } 4695 }
4685 4696
(...skipping 7066 matching lines...) Expand 10 before | Expand all | Expand 10 after
11752 { 11763 {
11753 // The tokenizer checks for the construct of an+b. 11764 // The tokenizer checks for the construct of an+b.
11754 // However, since the {ident} rule precedes the {nth} rule, some of those 11765 // However, since the {ident} rule precedes the {nth} rule, some of those
11755 // tokens are identified as string literal. Furthermore we need to accept 11766 // tokens are identified as string literal. Furthermore we need to accept
11756 // "odd" and "even" which does not match to an+b. 11767 // "odd" and "even" which does not match to an+b.
11757 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11768 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11758 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11769 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11759 } 11770 }
11760 11771
11761 } 11772 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698