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

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

Issue 14493016: Fix handling of 'inherit' and 'initial' for grid lines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Take 2: Forgot the code Created 7 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 | Annotate | Revision Log
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 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 case CSSPropertyWebkitGridAutoFlow: 1907 case CSSPropertyWebkitGridAutoFlow:
1908 return cssValuePool().createValue(style->gridAutoFlow()); 1908 return cssValuePool().createValue(style->gridAutoFlow());
1909 case CSSPropertyWebkitGridAutoRows: 1909 case CSSPropertyWebkitGridAutoRows:
1910 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView()); 1910 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_n ode->document()->renderView());
1911 case CSSPropertyWebkitGridColumns: 1911 case CSSPropertyWebkitGridColumns:
1912 return valueForGridTrackList(style->gridColumns(), style.get(), m_no de->document()->renderView()); 1912 return valueForGridTrackList(style->gridColumns(), style.get(), m_no de->document()->renderView());
1913 case CSSPropertyWebkitGridRows: 1913 case CSSPropertyWebkitGridRows:
1914 return valueForGridTrackList(style->gridRows(), style.get(), m_node- >document()->renderView()); 1914 return valueForGridTrackList(style->gridRows(), style.get(), m_node- >document()->renderView());
1915 1915
1916 case CSSPropertyWebkitGridStart: 1916 case CSSPropertyWebkitGridStart:
1917 return valueForGridPosition(style->gridItemStart()); 1917 return valueForGridPosition(style->gridStart());
1918 case CSSPropertyWebkitGridEnd: 1918 case CSSPropertyWebkitGridEnd:
1919 return valueForGridPosition(style->gridItemEnd()); 1919 return valueForGridPosition(style->gridEnd());
1920 case CSSPropertyWebkitGridBefore: 1920 case CSSPropertyWebkitGridBefore:
1921 return valueForGridPosition(style->gridItemBefore()); 1921 return valueForGridPosition(style->gridBefore());
1922 case CSSPropertyWebkitGridAfter: 1922 case CSSPropertyWebkitGridAfter:
1923 return valueForGridPosition(style->gridItemAfter()); 1923 return valueForGridPosition(style->gridAfter());
1924 case CSSPropertyWebkitGridColumn: 1924 case CSSPropertyWebkitGridColumn:
1925 return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthan d()); 1925 return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthan d());
1926 case CSSPropertyWebkitGridRow: 1926 case CSSPropertyWebkitGridRow:
1927 return getCSSPropertyValuesForGridShorthand(webkitGridRowShorthand() ); 1927 return getCSSPropertyValuesForGridShorthand(webkitGridRowShorthand() );
1928 1928
1929 case CSSPropertyHeight: 1929 case CSSPropertyHeight:
1930 if (renderer) { 1930 if (renderer) {
1931 // According to http://www.w3.org/TR/CSS2/visudet.html#the-heigh t-property, 1931 // According to http://www.w3.org/TR/CSS2/visudet.html#the-heigh t-property,
1932 // the "height" property does not apply for non-replaced inline elements. 1932 // the "height" property does not apply for non-replaced inline elements.
1933 if (!renderer->isReplaced() && renderer->isInline()) 1933 if (!renderer->isReplaced() && renderer->isInline())
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after
2989 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2989 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2990 CSSPropertyB ackgroundClip }; 2990 CSSPropertyB ackgroundClip };
2991 2991
2992 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2992 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2993 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2993 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2994 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2994 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2995 return list.release(); 2995 return list.release();
2996 } 2996 }
2997 2997
2998 } // namespace WebCore 2998 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js ('k') | Source/core/css/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698