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

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

Issue 17601010: [CSS Grid Layout] Rename grid placement properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: missing webposed/ changes Created 7 years, 5 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 CSSPropertyFlexShrink, 252 CSSPropertyFlexShrink,
253 CSSPropertyFlexDirection, 253 CSSPropertyFlexDirection,
254 CSSPropertyFlexWrap, 254 CSSPropertyFlexWrap,
255 CSSPropertyJustifyContent, 255 CSSPropertyJustifyContent,
256 CSSPropertyWebkitFontKerning, 256 CSSPropertyWebkitFontKerning,
257 CSSPropertyWebkitFontSmoothing, 257 CSSPropertyWebkitFontSmoothing,
258 CSSPropertyWebkitFontVariantLigatures, 258 CSSPropertyWebkitFontVariantLigatures,
259 CSSPropertyGridAutoColumns, 259 CSSPropertyGridAutoColumns,
260 CSSPropertyGridAutoFlow, 260 CSSPropertyGridAutoFlow,
261 CSSPropertyGridAutoRows, 261 CSSPropertyGridAutoRows,
262 CSSPropertyGridColumnEnd,
263 CSSPropertyGridColumnStart,
262 CSSPropertyGridDefinitionColumns, 264 CSSPropertyGridDefinitionColumns,
263 CSSPropertyGridDefinitionRows, 265 CSSPropertyGridDefinitionRows,
264 CSSPropertyGridStart, 266 CSSPropertyGridRowEnd,
265 CSSPropertyGridEnd, 267 CSSPropertyGridRowStart,
266 CSSPropertyGridBefore,
267 CSSPropertyGridAfter,
268 CSSPropertyWebkitHighlight, 268 CSSPropertyWebkitHighlight,
269 CSSPropertyWebkitHyphenateCharacter, 269 CSSPropertyWebkitHyphenateCharacter,
270 CSSPropertyWebkitHyphenateLimitAfter, 270 CSSPropertyWebkitHyphenateLimitAfter,
271 CSSPropertyWebkitHyphenateLimitBefore, 271 CSSPropertyWebkitHyphenateLimitBefore,
272 CSSPropertyWebkitHyphenateLimitLines, 272 CSSPropertyWebkitHyphenateLimitLines,
273 CSSPropertyWebkitHyphens, 273 CSSPropertyWebkitHyphens,
274 CSSPropertyWebkitLineAlign, 274 CSSPropertyWebkitLineAlign,
275 CSSPropertyWebkitLineBoxContain, 275 CSSPropertyWebkitLineBoxContain,
276 CSSPropertyWebkitLineBreak, 276 CSSPropertyWebkitLineBreak,
277 CSSPropertyWebkitLineClamp, 277 CSSPropertyWebkitLineClamp,
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1940 return valueForGridTrackSize(style->gridAutoColumns(), style.get(), m_node->document()->renderView()); 1940 return valueForGridTrackSize(style->gridAutoColumns(), style.get(), m_node->document()->renderView());
1941 case CSSPropertyGridAutoFlow: 1941 case CSSPropertyGridAutoFlow:
1942 return cssValuePool().createValue(style->gridAutoFlow()); 1942 return cssValuePool().createValue(style->gridAutoFlow());
1943 case CSSPropertyGridAutoRows: 1943 case CSSPropertyGridAutoRows:
1944 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView()); 1944 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView());
1945 case CSSPropertyGridDefinitionColumns: 1945 case CSSPropertyGridDefinitionColumns:
1946 return valueForGridTrackList(style->gridDefinitionColumns(), style-> namedGridColumnLines(), style.get(), m_node->document()->renderView()); 1946 return valueForGridTrackList(style->gridDefinitionColumns(), style-> namedGridColumnLines(), style.get(), m_node->document()->renderView());
1947 case CSSPropertyGridDefinitionRows: 1947 case CSSPropertyGridDefinitionRows:
1948 return valueForGridTrackList(style->gridDefinitionRows(), style->nam edGridRowLines(), style.get(), m_node->document()->renderView()); 1948 return valueForGridTrackList(style->gridDefinitionRows(), style->nam edGridRowLines(), style.get(), m_node->document()->renderView());
1949 1949
1950 case CSSPropertyGridStart: 1950 case CSSPropertyGridColumnStart:
1951 return valueForGridPosition(style->gridStart()); 1951 return valueForGridPosition(style->gridColumnStart());
1952 case CSSPropertyGridEnd: 1952 case CSSPropertyGridColumnEnd:
1953 return valueForGridPosition(style->gridEnd()); 1953 return valueForGridPosition(style->gridColumnEnd());
1954 case CSSPropertyGridBefore: 1954 case CSSPropertyGridRowStart:
1955 return valueForGridPosition(style->gridBefore()); 1955 return valueForGridPosition(style->gridRowStart());
1956 case CSSPropertyGridAfter: 1956 case CSSPropertyGridRowEnd:
1957 return valueForGridPosition(style->gridAfter()); 1957 return valueForGridPosition(style->gridRowEnd());
1958 case CSSPropertyGridColumn: 1958 case CSSPropertyGridColumn:
1959 return getCSSPropertyValuesForGridShorthand(gridColumnShorthand()); 1959 return getCSSPropertyValuesForGridShorthand(gridColumnShorthand());
1960 case CSSPropertyGridRow: 1960 case CSSPropertyGridRow:
1961 return getCSSPropertyValuesForGridShorthand(gridRowShorthand()); 1961 return getCSSPropertyValuesForGridShorthand(gridRowShorthand());
1962 case CSSPropertyGridArea: 1962 case CSSPropertyGridArea:
1963 return getCSSPropertyValuesForGridShorthand(gridAreaShorthand()); 1963 return getCSSPropertyValuesForGridShorthand(gridAreaShorthand());
1964 1964
1965 case CSSPropertyHeight: 1965 case CSSPropertyHeight:
1966 if (renderer) { 1966 if (renderer) {
1967 // According to http://www.w3.org/TR/CSS2/visudet.html#the-heigh t-property, 1967 // According to http://www.w3.org/TR/CSS2/visudet.html#the-heigh t-property,
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
3015 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3015 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3016 CSSPropertyB ackgroundClip }; 3016 CSSPropertyB ackgroundClip };
3017 3017
3018 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3018 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3019 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3019 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3020 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3020 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3021 return list.release(); 3021 return list.release();
3022 } 3022 }
3023 3023
3024 } // namespace WebCore 3024 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698