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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 16917013: [CSS Grid Layout] CSSParser should reject <track-list> without a <track-size> (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/css/CSSParser.cpp ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 2285 matching lines...) Expand 10 before | Expand all | Expand 10 after
2296 } 2296 }
2297 2297
2298 ++currentNamedGridLine; 2298 ++currentNamedGridLine;
2299 GridTrackSize trackSize; 2299 GridTrackSize trackSize;
2300 if (!createGridTrackSize(currValue, trackSize, state)) 2300 if (!createGridTrackSize(currValue, trackSize, state))
2301 return false; 2301 return false;
2302 2302
2303 trackSizes.append(trackSize); 2303 trackSizes.append(trackSize);
2304 } 2304 }
2305 2305
2306 if (trackSizes.isEmpty()) 2306 // The parser should have rejected any <track-list> without any <track-size> as
2307 return false; 2307 // this is not conformant to the syntax.
2308 2308 ASSERT(!trackSizes.isEmpty());
2309 return true; 2309 return true;
2310 } 2310 }
2311 2311
2312 2312
2313 static bool createGridPosition(CSSValue* value, GridPosition& position) 2313 static bool createGridPosition(CSSValue* value, GridPosition& position)
2314 { 2314 {
2315 // For now, we only accept: 'auto' | [ <integer> || <string> ] | span && <in teger>? 2315 // For now, we only accept: 'auto' | [ <integer> || <string> ] | span && <in teger>?
2316 2316
2317 if (value->isPrimitiveValue()) { 2317 if (value->isPrimitiveValue()) {
2318 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 2318 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
3712 info.addMember(m_state, "state"); 3712 info.addMember(m_state, "state");
3713 3713
3714 // FIXME: move this to a place where it would be called only once? 3714 // FIXME: move this to a place where it would be called only once?
3715 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3715 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3716 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3716 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3717 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3717 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3718 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3718 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3719 } 3719 }
3720 3720
3721 } // namespace WebCore 3721 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698