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

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

Issue 176853007: [CSS Grid Layout] Implementation of the grid shorthand. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed compilation error in debug. 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 1964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1975 case CSSPropertyGridRowEnd: 1975 case CSSPropertyGridRowEnd:
1976 return valueForGridPosition(style->gridRowEnd()); 1976 return valueForGridPosition(style->gridRowEnd());
1977 case CSSPropertyGridColumn: 1977 case CSSPropertyGridColumn:
1978 return valuesForGridShorthand(gridColumnShorthand()); 1978 return valuesForGridShorthand(gridColumnShorthand());
1979 case CSSPropertyGridRow: 1979 case CSSPropertyGridRow:
1980 return valuesForGridShorthand(gridRowShorthand()); 1980 return valuesForGridShorthand(gridRowShorthand());
1981 case CSSPropertyGridArea: 1981 case CSSPropertyGridArea:
1982 return valuesForGridShorthand(gridAreaShorthand()); 1982 return valuesForGridShorthand(gridAreaShorthand());
1983 case CSSPropertyGridTemplate: 1983 case CSSPropertyGridTemplate:
1984 return valuesForGridShorthand(gridTemplateShorthand()); 1984 return valuesForGridShorthand(gridTemplateShorthand());
1985 case CSSPropertyGrid:
1986 return valuesForGridShorthand(gridShorthand());
1985 case CSSPropertyGridTemplateAreas: 1987 case CSSPropertyGridTemplateAreas:
1986 if (!style->namedGridAreaRowCount()) { 1988 if (!style->namedGridAreaRowCount()) {
1987 ASSERT(!style->namedGridAreaColumnCount()); 1989 ASSERT(!style->namedGridAreaColumnCount());
1988 return cssValuePool().createIdentifierValue(CSSValueNone); 1990 return cssValuePool().createIdentifierValue(CSSValueNone);
1989 } 1991 }
1990 1992
1991 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1993 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1992 1994
1993 case CSSPropertyHeight: 1995 case CSSPropertyHeight:
1994 if (renderer) { 1996 if (renderer) {
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
3045 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3047 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3046 CSSPropertyB ackgroundClip }; 3048 CSSPropertyB ackgroundClip };
3047 3049
3048 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3050 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3049 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))));
3050 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))));
3051 return list.release(); 3053 return list.release();
3052 } 3054 }
3053 3055
3054 } // namespace WebCore 3056 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698