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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 22215002: Allow grid positions to be named grid areas (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 // Those are the trailing <string>* allowed in the syntax. 1065 // Those are the trailing <string>* allowed in the syntax.
1066 addValuesForNamedGridLinesAtIndex(namedGridLines, trackSizes.size(), *list); 1066 addValuesForNamedGridLinesAtIndex(namedGridLines, trackSizes.size(), *list);
1067 return list.release(); 1067 return list.release();
1068 } 1068 }
1069 1069
1070 static PassRefPtr<CSSValue> valueForGridPosition(const GridPosition& position) 1070 static PassRefPtr<CSSValue> valueForGridPosition(const GridPosition& position)
1071 { 1071 {
1072 if (position.isAuto()) 1072 if (position.isAuto())
1073 return cssValuePool().createIdentifierValue(CSSValueAuto); 1073 return cssValuePool().createIdentifierValue(CSSValueAuto);
1074 1074
1075 if (position.isNamedGridArea())
1076 return cssValuePool().createValue(position.namedGridLine(), CSSPrimitive Value::CSS_STRING);
1077
1075 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 1078 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
1076 if (position.isSpan()) { 1079 if (position.isSpan()) {
1077 list->append(cssValuePool().createIdentifierValue(CSSValueSpan)); 1080 list->append(cssValuePool().createIdentifierValue(CSSValueSpan));
1078 list->append(cssValuePool().createValue(position.spanPosition(), CSSPrim itiveValue::CSS_NUMBER)); 1081 list->append(cssValuePool().createValue(position.spanPosition(), CSSPrim itiveValue::CSS_NUMBER));
1079 } else 1082 } else
1080 list->append(cssValuePool().createValue(position.integerPosition(), CSSP rimitiveValue::CSS_NUMBER)); 1083 list->append(cssValuePool().createValue(position.integerPosition(), CSSP rimitiveValue::CSS_NUMBER));
1081 1084
1082 if (!position.namedGridLine().isNull()) 1085 if (!position.namedGridLine().isNull())
1083 list->append(cssValuePool().createValue(position.namedGridLine(), CSSPri mitiveValue::CSS_STRING)); 1086 list->append(cssValuePool().createValue(position.namedGridLine(), CSSPri mitiveValue::CSS_STRING));
1084 return list; 1087 return list;
(...skipping 1984 matching lines...) Expand 10 before | Expand all | Expand 10 after
3069 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3072 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3070 CSSPropertyB ackgroundClip }; 3073 CSSPropertyB ackgroundClip };
3071 3074
3072 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3075 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3073 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3076 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3074 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3077 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3075 return list.release(); 3078 return list.release();
3076 } 3079 }
3077 3080
3078 } // namespace WebCore 3081 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698