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

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: Added the new property to the ones runtime enabled only. Created 6 years, 8 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) 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 1959 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 case CSSPropertyGridRowStart: 1970 case CSSPropertyGridRowStart:
1971 return valueForGridPosition(style->gridRowStart()); 1971 return valueForGridPosition(style->gridRowStart());
1972 case CSSPropertyGridRowEnd: 1972 case CSSPropertyGridRowEnd:
1973 return valueForGridPosition(style->gridRowEnd()); 1973 return valueForGridPosition(style->gridRowEnd());
1974 case CSSPropertyGridColumn: 1974 case CSSPropertyGridColumn:
1975 return valuesForGridShorthand(gridColumnShorthand()); 1975 return valuesForGridShorthand(gridColumnShorthand());
1976 case CSSPropertyGridRow: 1976 case CSSPropertyGridRow:
1977 return valuesForGridShorthand(gridRowShorthand()); 1977 return valuesForGridShorthand(gridRowShorthand());
1978 case CSSPropertyGridArea: 1978 case CSSPropertyGridArea:
1979 return valuesForGridShorthand(gridAreaShorthand()); 1979 return valuesForGridShorthand(gridAreaShorthand());
1980 1980 case CSSPropertyGridTemplate:
1981 return valuesForGridShorthand(gridTemplateShorthand());
1981 case CSSPropertyGridTemplateAreas: 1982 case CSSPropertyGridTemplateAreas:
1982 if (!style->namedGridAreaRowCount()) { 1983 if (!style->namedGridAreaRowCount()) {
1983 ASSERT(!style->namedGridAreaColumnCount()); 1984 ASSERT(!style->namedGridAreaColumnCount());
1984 return cssValuePool().createIdentifierValue(CSSValueNone); 1985 return cssValuePool().createIdentifierValue(CSSValueNone);
1985 } 1986 }
1986 1987
1987 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1988 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1988 1989
1989 case CSSPropertyHeight: 1990 case CSSPropertyHeight:
1990 if (renderer) { 1991 if (renderer) {
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after
3046 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3047 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3047 CSSPropertyB ackgroundClip }; 3048 CSSPropertyB ackgroundClip };
3048 3049
3049 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3050 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3050 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3051 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3051 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3052 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3052 return list.release(); 3053 return list.release();
3053 } 3054 }
3054 3055
3055 } // namespace WebCore 3056 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParserValues.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698