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

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: Patch rebased and adapted to the new parsing approach. Created 6 years, 9 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 1963 matching lines...) Expand 10 before | Expand all | Expand 10 after
1974 return valueForGridPosition(style->gridRowStart()); 1974 return valueForGridPosition(style->gridRowStart());
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 1983
1984 case CSSPropertyGridTemplate:
1985 return valuesForGridShorthand(gridTemplateShorthand());
1986
1984 case CSSPropertyGridTemplateAreas: 1987 case CSSPropertyGridTemplateAreas:
1985 if (!style->namedGridAreaRowCount()) { 1988 if (!style->namedGridAreaRowCount()) {
1986 ASSERT(!style->namedGridAreaColumnCount()); 1989 ASSERT(!style->namedGridAreaColumnCount());
1987 return cssValuePool().createIdentifierValue(CSSValueNone); 1990 return cssValuePool().createIdentifierValue(CSSValueNone);
1988 } 1991 }
1989 1992
1990 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1993 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1991 1994
1992 case CSSPropertyHeight: 1995 case CSSPropertyHeight:
1993 if (renderer) { 1996 if (renderer) {
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3045 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3043 CSSPropertyB ackgroundClip }; 3046 CSSPropertyB ackgroundClip };
3044 3047
3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3048 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3049 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3050 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3048 return list.release(); 3051 return list.release();
3049 } 3052 }
3050 3053
3051 } // namespace WebCore 3054 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698