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

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

Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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 CSSPropertyWebkitFlexShrink, 252 CSSPropertyWebkitFlexShrink,
253 CSSPropertyWebkitFlexDirection, 253 CSSPropertyWebkitFlexDirection,
254 CSSPropertyWebkitFlexWrap, 254 CSSPropertyWebkitFlexWrap,
255 CSSPropertyWebkitJustifyContent, 255 CSSPropertyWebkitJustifyContent,
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 CSSPropertyGridColumns, 262 CSSPropertyGridDefinitionColumns,
263 CSSPropertyGridRows, 263 CSSPropertyGridDefinitionRows,
264 CSSPropertyGridStart, 264 CSSPropertyGridStart,
265 CSSPropertyGridEnd, 265 CSSPropertyGridEnd,
266 CSSPropertyGridBefore, 266 CSSPropertyGridBefore,
267 CSSPropertyGridAfter, 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,
(...skipping 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 list->append(featureValue.release()); 1912 list->append(featureValue.release());
1913 } 1913 }
1914 return list.release(); 1914 return list.release();
1915 } 1915 }
1916 case CSSPropertyGridAutoColumns: 1916 case CSSPropertyGridAutoColumns:
1917 return valueForGridTrackSize(style->gridAutoColumns(), style.get(), m_node->document()->renderView()); 1917 return valueForGridTrackSize(style->gridAutoColumns(), style.get(), m_node->document()->renderView());
1918 case CSSPropertyGridAutoFlow: 1918 case CSSPropertyGridAutoFlow:
1919 return cssValuePool().createValue(style->gridAutoFlow()); 1919 return cssValuePool().createValue(style->gridAutoFlow());
1920 case CSSPropertyGridAutoRows: 1920 case CSSPropertyGridAutoRows:
1921 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView()); 1921 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView());
1922 case CSSPropertyGridColumns: 1922 case CSSPropertyGridDefinitionColumns:
1923 return valueForGridTrackList(style->gridColumns(), style->namedGridC olumnLines(), style.get(), m_node->document()->renderView()); 1923 return valueForGridTrackList(style->gridDefinitionColumns(), style-> namedGridColumnLines(), style.get(), m_node->document()->renderView());
1924 case CSSPropertyGridRows: 1924 case CSSPropertyGridDefinitionRows:
1925 return valueForGridTrackList(style->gridRows(), style->namedGridRowL ines(), style.get(), m_node->document()->renderView()); 1925 return valueForGridTrackList(style->gridDefinitionRows(), style->nam edGridRowLines(), style.get(), m_node->document()->renderView());
1926 1926
1927 case CSSPropertyGridStart: 1927 case CSSPropertyGridStart:
1928 return valueForGridPosition(style->gridStart()); 1928 return valueForGridPosition(style->gridStart());
1929 case CSSPropertyGridEnd: 1929 case CSSPropertyGridEnd:
1930 return valueForGridPosition(style->gridEnd()); 1930 return valueForGridPosition(style->gridEnd());
1931 case CSSPropertyGridBefore: 1931 case CSSPropertyGridBefore:
1932 return valueForGridPosition(style->gridBefore()); 1932 return valueForGridPosition(style->gridBefore());
1933 case CSSPropertyGridAfter: 1933 case CSSPropertyGridAfter:
1934 return valueForGridPosition(style->gridAfter()); 1934 return valueForGridPosition(style->gridAfter());
1935 case CSSPropertyGridColumn: 1935 case CSSPropertyGridColumn:
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
2984 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2984 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2985 CSSPropertyB ackgroundClip }; 2985 CSSPropertyB ackgroundClip };
2986 2986
2987 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2987 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2988 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 2988 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
2990 return list.release(); 2990 return list.release();
2991 } 2991 }
2992 2992
2993 } // namespace WebCore 2993 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698