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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1813053004: Move grid-auto-column/grid-auto-row into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 4 years, 9 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 | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.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) 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 // FIXME: This is to avoid having to pass parsedCalc to all validUnit caller s. 257 // FIXME: This is to avoid having to pass parsedCalc to all validUnit caller s.
258 ASSERT(!m_parsedCalculation); 258 ASSERT(!m_parsedCalculation);
259 259
260 RefPtrWillBeRawPtr<CSSValue> parsedValue = nullptr; 260 RefPtrWillBeRawPtr<CSSValue> parsedValue = nullptr;
261 261
262 switch (propId) { 262 switch (propId) {
263 case CSSPropertyGridAutoFlow: 263 case CSSPropertyGridAutoFlow:
264 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); 264 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
265 parsedValue = parseGridAutoFlow(*m_valueList); 265 parsedValue = parseGridAutoFlow(*m_valueList);
266 break; 266 break;
267 case CSSPropertyGridAutoColumns:
268 case CSSPropertyGridAutoRows:
269 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
270 parsedValue = parseGridTrackSize(*m_valueList);
271 break;
272 267
273 case CSSPropertyGridTemplateColumns: 268 case CSSPropertyGridTemplateColumns:
274 case CSSPropertyGridTemplateRows: 269 case CSSPropertyGridTemplateRows:
275 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); 270 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
276 parsedValue = parseGridTrackList(); 271 parsedValue = parseGridTrackList();
277 break; 272 break;
278 273
279 case CSSPropertyGridTemplateAreas: 274 case CSSPropertyGridTemplateAreas:
280 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); 275 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
281 parsedValue = parseGridTemplateAreas(); 276 parsedValue = parseGridTemplateAreas();
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 ASSERT(!m_parsedCalculation); 906 ASSERT(!m_parsedCalculation);
912 m_parsedCalculation = CSSCalcValue::create(args, range); 907 m_parsedCalculation = CSSCalcValue::create(args, range);
913 908
914 if (!m_parsedCalculation) 909 if (!m_parsedCalculation)
915 return false; 910 return false;
916 911
917 return true; 912 return true;
918 } 913 }
919 914
920 } // namespace blink 915 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698