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

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: rebased and applied suggested changes. 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 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 return valueForGridPosition(style->gridRowStart()); 1947 return valueForGridPosition(style->gridRowStart());
1948 case CSSPropertyGridRowEnd: 1948 case CSSPropertyGridRowEnd:
1949 return valueForGridPosition(style->gridRowEnd()); 1949 return valueForGridPosition(style->gridRowEnd());
1950 case CSSPropertyGridColumn: 1950 case CSSPropertyGridColumn:
1951 return valuesForGridShorthand(gridColumnShorthand()); 1951 return valuesForGridShorthand(gridColumnShorthand());
1952 case CSSPropertyGridRow: 1952 case CSSPropertyGridRow:
1953 return valuesForGridShorthand(gridRowShorthand()); 1953 return valuesForGridShorthand(gridRowShorthand());
1954 case CSSPropertyGridArea: 1954 case CSSPropertyGridArea:
1955 return valuesForGridShorthand(gridAreaShorthand()); 1955 return valuesForGridShorthand(gridAreaShorthand());
1956 1956
1957 case CSSPropertyGridTemplate:
1958 return valuesForGridShorthand(gridTemplateShorthand());
1959
1957 case CSSPropertyGridTemplateAreas: 1960 case CSSPropertyGridTemplateAreas:
1958 if (!style->namedGridAreaRowCount()) { 1961 if (!style->namedGridAreaRowCount()) {
1959 ASSERT(!style->namedGridAreaColumnCount()); 1962 ASSERT(!style->namedGridAreaColumnCount());
1960 return cssValuePool().createIdentifierValue(CSSValueNone); 1963 return cssValuePool().createIdentifierValue(CSSValueNone);
1961 } 1964 }
1962 1965
1963 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 1966 return CSSGridTemplateAreasValue::create(style->namedGridArea(), sty le->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
1964 1967
1965 case CSSPropertyHeight: 1968 case CSSPropertyHeight:
1966 if (renderer) { 1969 if (renderer) {
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
3034 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3037 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3035 CSSPropertyB ackgroundClip }; 3038 CSSPropertyB ackgroundClip };
3036 3039
3037 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3040 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3038 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3041 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3042 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3040 return list.release(); 3043 return list.release();
3041 } 3044 }
3042 3045
3043 } // namespace WebCore 3046 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698