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

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: Rebaselined patch for try job / landing 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
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/StyleResolver.cpp » ('j') | 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 4616 matching lines...) Expand 10 before | Expand all | Expand 10 after
4627 CSSParserValue* value = m_valueList->current(); 4627 CSSParserValue* value = m_valueList->current();
4628 if (value->id == CSSValueNone) { 4628 if (value->id == CSSValueNone) {
4629 if (m_valueList->next()) 4629 if (m_valueList->next())
4630 return false; 4630 return false;
4631 4631
4632 addProperty(propId, cssValuePool().createIdentifierValue(value->id), imp ortant); 4632 addProperty(propId, cssValuePool().createIdentifierValue(value->id), imp ortant);
4633 return true; 4633 return true;
4634 } 4634 }
4635 4635
4636 RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated(); 4636 RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
4637 size_t currentLineNumber = 0;
4637 while (m_valueList->current()) { 4638 while (m_valueList->current()) {
4639 while (m_valueList->current() && m_valueList->current()->unit == CSSPrim itiveValue::CSS_STRING) {
4640 RefPtr<CSSPrimitiveValue> name = createPrimitiveStringValue(m_valueL ist->current());
4641 values->append(name);
4642 m_valueList->next();
4643 }
4644
4645 // This allows trailing <string>* per the specification.
4646 if (!m_valueList->current())
4647 break;
4648
4638 RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize(); 4649 RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize();
4639 if (!primitiveValue) 4650 if (!primitiveValue)
4640 return false; 4651 return false;
4641 4652
4642 values->append(primitiveValue.release()); 4653 values->append(primitiveValue.release());
4643 } 4654 }
4644 addProperty(propId, values.release(), important); 4655 addProperty(propId, values.release(), important);
4645 return true; 4656 return true;
4646 } 4657 }
4647 4658
(...skipping 7039 matching lines...) Expand 10 before | Expand all | Expand 10 after
11687 { 11698 {
11688 // The tokenizer checks for the construct of an+b. 11699 // The tokenizer checks for the construct of an+b.
11689 // However, since the {ident} rule precedes the {nth} rule, some of those 11700 // However, since the {ident} rule precedes the {nth} rule, some of those
11690 // tokens are identified as string literal. Furthermore we need to accept 11701 // tokens are identified as string literal. Furthermore we need to accept
11691 // "odd" and "even" which does not match to an+b. 11702 // "odd" and "even" which does not match to an+b.
11692 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11703 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11693 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11704 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11694 } 11705 }
11695 11706
11696 } 11707 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698