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

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: The grid shorthand property should not be exposed. 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 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 case CSSPropertyGridRowEnd: 1978 case CSSPropertyGridRowEnd:
1979 return valueForGridPosition(style->gridRowEnd()); 1979 return valueForGridPosition(style->gridRowEnd());
1980 case CSSPropertyGridColumn: 1980 case CSSPropertyGridColumn:
1981 return valuesForGridShorthand(gridColumnShorthand()); 1981 return valuesForGridShorthand(gridColumnShorthand());
1982 case CSSPropertyGridRow: 1982 case CSSPropertyGridRow:
1983 return valuesForGridShorthand(gridRowShorthand()); 1983 return valuesForGridShorthand(gridRowShorthand());
1984 case CSSPropertyGridArea: 1984 case CSSPropertyGridArea:
1985 return valuesForGridShorthand(gridAreaShorthand()); 1985 return valuesForGridShorthand(gridAreaShorthand());
1986 case CSSPropertyGridTemplate: 1986 case CSSPropertyGridTemplate:
1987 return valuesForGridShorthand(gridTemplateShorthand()); 1987 return valuesForGridShorthand(gridTemplateShorthand());
1988 case CSSPropertyGrid:
1989 return valuesForGridShorthand(gridShorthand());
1988 case CSSPropertyGridTemplateAreas: 1990 case CSSPropertyGridTemplateAreas:
1989 if (!style->namedGridAreaRowCount()) { 1991 if (!style->namedGridAreaRowCount()) {
1990 ASSERT(!style->namedGridAreaColumnCount()); 1992 ASSERT(!style->namedGridAreaColumnCount());
1991 return cssValuePool().createIdentifierValue(CSSValueNone); 1993 return cssValuePool().createIdentifierValue(CSSValueNone);
1992 } 1994 }
1993 1995
1994 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1996 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1995 1997
1996 case CSSPropertyHeight: 1998 case CSSPropertyHeight:
1997 if (renderer) { 1999 if (renderer) {
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
3050 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3052 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3051 CSSPropertyB ackgroundClip }; 3053 CSSPropertyB ackgroundClip };
3052 3054
3053 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3055 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3054 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3056 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3055 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3057 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3056 return list.release(); 3058 return list.release();
3057 } 3059 }
3058 3060
3059 } // namespace WebCore 3061 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698