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

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

Issue 1117123005: [CSS Grid Layout] grid-template-areas should accept none value (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-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 3697 matching lines...) Expand 10 before | Expand all | Expand 10 after
3708 } 3708 }
3709 currentCol = lookAheadCol; 3709 currentCol = lookAheadCol;
3710 } 3710 }
3711 3711
3712 m_valueList->next(); 3712 m_valueList->next();
3713 return true; 3713 return true;
3714 } 3714 }
3715 3715
3716 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateAreas() 3716 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateAreas()
3717 { 3717 {
3718 if (m_valueList->current() && m_valueList->current()->id == CSSValueNone) {
3719 m_valueList->next();
3720 return cssValuePool().createIdentifierValue(CSSValueNone);
3721 }
3722
3718 NamedGridAreaMap gridAreaMap; 3723 NamedGridAreaMap gridAreaMap;
3719 size_t rowCount = 0; 3724 size_t rowCount = 0;
3720 size_t columnCount = 0; 3725 size_t columnCount = 0;
3721 3726
3722 while (m_valueList->current()) { 3727 while (m_valueList->current()) {
3723 if (!parseGridTemplateAreasRow(gridAreaMap, rowCount, columnCount)) 3728 if (!parseGridTemplateAreasRow(gridAreaMap, rowCount, columnCount))
3724 return nullptr; 3729 return nullptr;
3725 ++rowCount; 3730 ++rowCount;
3726 } 3731 }
3727 3732
(...skipping 4677 matching lines...) Expand 10 before | Expand all | Expand 10 after
8405 } 8410 }
8406 } 8411 }
8407 8412
8408 if (!list->length()) 8413 if (!list->length())
8409 return nullptr; 8414 return nullptr;
8410 8415
8411 return list.release(); 8416 return list.release();
8412 } 8417 }
8413 8418
8414 } // namespace blink 8419 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698