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

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

Issue 149373004: [CSS Grid Layout] Implementation of the grid-template shorthand. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@grid-template-working
Patch Set: Created 6 years, 10 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 | « no previous file | Source/core/css/CSSProperty.cpp » ('j') | Source/core/css/parser/BisonCSSParser.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1961 return valueForGridPosition(style->gridRowStart()); 1961 return valueForGridPosition(style->gridRowStart());
1962 case CSSPropertyGridRowEnd: 1962 case CSSPropertyGridRowEnd:
1963 return valueForGridPosition(style->gridRowEnd()); 1963 return valueForGridPosition(style->gridRowEnd());
1964 case CSSPropertyGridColumn: 1964 case CSSPropertyGridColumn:
1965 return valuesForGridShorthand(gridColumnShorthand()); 1965 return valuesForGridShorthand(gridColumnShorthand());
1966 case CSSPropertyGridRow: 1966 case CSSPropertyGridRow:
1967 return valuesForGridShorthand(gridRowShorthand()); 1967 return valuesForGridShorthand(gridRowShorthand());
1968 case CSSPropertyGridArea: 1968 case CSSPropertyGridArea:
1969 return valuesForGridShorthand(gridAreaShorthand()); 1969 return valuesForGridShorthand(gridAreaShorthand());
1970 1970
1971 case CSSPropertyGridTemplate:
1972 return valuesForGridShorthand(gridTemplateShorthand());
1973
1971 case CSSPropertyGridTemplateAreas: 1974 case CSSPropertyGridTemplateAreas:
1972 if (!style->namedGridAreaRowCount()) { 1975 if (!style->namedGridAreaRowCount()) {
1973 ASSERT(!style->namedGridAreaColumnCount()); 1976 ASSERT(!style->namedGridAreaColumnCount());
1974 return cssValuePool().createIdentifierValue(CSSValueNone); 1977 return cssValuePool().createIdentifierValue(CSSValueNone);
1975 } 1978 }
1976 1979
1977 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1980 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1978 1981
1979 case CSSPropertyHeight: 1982 case CSSPropertyHeight:
1980 if (renderer) { 1983 if (renderer) {
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
3146 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3149 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3147 CSSPropertyB ackgroundClip }; 3150 CSSPropertyB ackgroundClip };
3148 3151
3149 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3152 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3150 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3153 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3151 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3154 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3152 return list.release(); 3155 return list.release();
3153 } 3156 }
3154 3157
3155 } // namespace WebCore 3158 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSProperty.cpp » ('j') | Source/core/css/parser/BisonCSSParser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698