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

Side by Side Diff: Source/core/css/resolver/StyleResolver.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: rebased 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
« no previous file with comments | « Source/core/css/CSSPropertyNames.in ('k') | Source/core/page/RuntimeCSSEnabled.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 2919 matching lines...) Expand 10 before | Expand all | Expand 10 after
2930 return; 2930 return;
2931 } 2931 }
2932 case CSSPropertyGridAutoRows: { 2932 case CSSPropertyGridAutoRows: {
2933 HANDLE_INHERIT_AND_INITIAL(gridAutoRows, GridAutoRows); 2933 HANDLE_INHERIT_AND_INITIAL(gridAutoRows, GridAutoRows);
2934 GridTrackSize trackSize; 2934 GridTrackSize trackSize;
2935 if (!createGridTrackSize(value, trackSize, state)) 2935 if (!createGridTrackSize(value, trackSize, state))
2936 return; 2936 return;
2937 state.style()->setGridAutoRows(trackSize); 2937 state.style()->setGridAutoRows(trackSize);
2938 return; 2938 return;
2939 } 2939 }
2940 case CSSPropertyGridColumns: { 2940 case CSSPropertyGridDefinitionColumns: {
2941 if (isInherit) { 2941 if (isInherit) {
2942 m_state.style()->setGridColumns(m_state.parentStyle()->gridColumns() ); 2942 m_state.style()->setGridDefinitionColumns(m_state.parentStyle()->gri dDefinitionColumns());
2943 m_state.style()->setNamedGridColumnLines(m_state.parentStyle()->name dGridColumnLines()); 2943 m_state.style()->setNamedGridColumnLines(m_state.parentStyle()->name dGridColumnLines());
2944 return; 2944 return;
2945 } 2945 }
2946 if (isInitial) { 2946 if (isInitial) {
2947 m_state.style()->setGridColumns(RenderStyle::initialGridColumns()); 2947 m_state.style()->setGridDefinitionColumns(RenderStyle::initialGridDe finitionColumns());
2948 m_state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGr idColumnLines()); 2948 m_state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGr idColumnLines());
2949 return; 2949 return;
2950 } 2950 }
2951 2951
2952 Vector<GridTrackSize> trackSizes; 2952 Vector<GridTrackSize> trackSizes;
2953 NamedGridLinesMap namedGridLines; 2953 NamedGridLinesMap namedGridLines;
2954 if (!createGridTrackList(value, trackSizes, namedGridLines, state)) 2954 if (!createGridTrackList(value, trackSizes, namedGridLines, state))
2955 return; 2955 return;
2956 state.style()->setGridColumns(trackSizes); 2956 state.style()->setGridDefinitionColumns(trackSizes);
2957 state.style()->setNamedGridColumnLines(namedGridLines); 2957 state.style()->setNamedGridColumnLines(namedGridLines);
2958 return; 2958 return;
2959 } 2959 }
2960 case CSSPropertyGridRows: { 2960 case CSSPropertyGridDefinitionRows: {
2961 if (isInherit) { 2961 if (isInherit) {
2962 m_state.style()->setGridRows(m_state.parentStyle()->gridRows()); 2962 m_state.style()->setGridDefinitionRows(m_state.parentStyle()->gridDe finitionRows());
2963 m_state.style()->setNamedGridRowLines(m_state.parentStyle()->namedGr idRowLines()); 2963 m_state.style()->setNamedGridRowLines(m_state.parentStyle()->namedGr idRowLines());
2964 return; 2964 return;
2965 } 2965 }
2966 if (isInitial) { 2966 if (isInitial) {
2967 m_state.style()->setGridRows(RenderStyle::initialGridRows()); 2967 m_state.style()->setGridDefinitionRows(RenderStyle::initialGridDefin itionRows());
2968 m_state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridR owLines()); 2968 m_state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridR owLines());
2969 return; 2969 return;
2970 } 2970 }
2971 2971
2972 Vector<GridTrackSize> trackSizes; 2972 Vector<GridTrackSize> trackSizes;
2973 NamedGridLinesMap namedGridLines; 2973 NamedGridLinesMap namedGridLines;
2974 if (!createGridTrackList(value, trackSizes, namedGridLines, state)) 2974 if (!createGridTrackList(value, trackSizes, namedGridLines, state))
2975 return; 2975 return;
2976 state.style()->setGridRows(trackSizes); 2976 state.style()->setGridDefinitionRows(trackSizes);
2977 state.style()->setNamedGridRowLines(namedGridLines); 2977 state.style()->setNamedGridRowLines(namedGridLines);
2978 return; 2978 return;
2979 } 2979 }
2980 2980
2981 case CSSPropertyGridStart: { 2981 case CSSPropertyGridStart: {
2982 HANDLE_INHERIT_AND_INITIAL(gridStart, GridStart); 2982 HANDLE_INHERIT_AND_INITIAL(gridStart, GridStart);
2983 GridPosition startPosition; 2983 GridPosition startPosition;
2984 if (!createGridPosition(value, startPosition)) 2984 if (!createGridPosition(value, startPosition))
2985 return; 2985 return;
2986 state.style()->setGridStart(startPosition); 2986 state.style()->setGridStart(startPosition);
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 info.addMember(m_state, "state"); 3690 info.addMember(m_state, "state");
3691 3691
3692 // FIXME: move this to a place where it would be called only once? 3692 // FIXME: move this to a place where it would be called only once?
3693 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3693 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3694 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3694 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3695 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3695 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3696 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3696 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3697 } 3697 }
3698 3698
3699 } // namespace WebCore 3699 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPropertyNames.in ('k') | Source/core/page/RuntimeCSSEnabled.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698