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

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

Issue 148293008: [CSS Grid Layout] Add support to place items using named grid lines (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Improved readability of adjustNamedGridItemPosition Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 static bool createGridPosition(CSSValue* value, GridPosition& position) 997 static bool createGridPosition(CSSValue* value, GridPosition& position)
998 { 998 {
999 // We accept the specification's grammar: 999 // We accept the specification's grammar:
1000 // 'auto' | [ <integer> || <string> ] | [ span && [ <integer> || string ] ] | <ident> 1000 // 'auto' | [ <integer> || <string> ] | [ span && [ <integer> || string ] ] | <ident>
1001 1001
1002 if (value->isPrimitiveValue()) { 1002 if (value->isPrimitiveValue()) {
1003 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 1003 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
1004 // We translate <ident> to <string> during parsing as it 1004 // We translate <ident> to <string> during parsing as it
1005 // makes handling it more simple. 1005 // makes handling it more simple.
1006 if (primitiveValue->isString()) { 1006 if (primitiveValue->isString()) {
1007 // Note that a <ident> could be either a grid area or a grid line na me. We create them as grid areas but the
1008 // StyleAdjuster will have to check if this is the name of a grid ar ea, the name of a grid line or the
1009 // prefix of a grid line named <ident>-start or <ident>-end.
1007 position.setNamedGridArea(primitiveValue->getStringValue()); 1010 position.setNamedGridArea(primitiveValue->getStringValue());
1008 return true; 1011 return true;
1009 } 1012 }
1010 1013
1011 ASSERT(primitiveValue->getValueID() == CSSValueAuto); 1014 ASSERT(primitiveValue->getValueID() == CSSValueAuto);
1012 return true; 1015 return true;
1013 } 1016 }
1014 1017
1015 CSSValueList* values = toCSSValueList(value); 1018 CSSValueList* values = toCSSValueList(value);
1016 ASSERT(values->length()); 1019 ASSERT(values->length());
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
2171 break; 2174 break;
2172 } 2175 }
2173 case CSSPropertyEnableBackground: 2176 case CSSPropertyEnableBackground:
2174 // Silently ignoring this property for now 2177 // Silently ignoring this property for now
2175 // http://bugs.webkit.org/show_bug.cgi?id=6022 2178 // http://bugs.webkit.org/show_bug.cgi?id=6022
2176 break; 2179 break;
2177 } 2180 }
2178 } 2181 }
2179 2182
2180 } // namespace WebCore 2183 } // namespace WebCore
OLDNEW
« Source/core/css/resolver/StyleAdjuster.cpp ('K') | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698