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

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

Issue 826893003: [CSS Grid Layout] Remove stack from grid-auto-flow syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@remove-stack
Patch Set: Adding perftests Created 5 years, 11 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 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1943 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSep arated(); 1943 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSep arated();
1944 switch (style->gridAutoFlow()) { 1944 switch (style->gridAutoFlow()) {
1945 case AutoFlowRow: 1945 case AutoFlowRow:
1946 case AutoFlowRowDense: 1946 case AutoFlowRowDense:
1947 list->append(cssValuePool().createIdentifierValue(CSSValueRow)); 1947 list->append(cssValuePool().createIdentifierValue(CSSValueRow));
1948 break; 1948 break;
1949 case AutoFlowColumn: 1949 case AutoFlowColumn:
1950 case AutoFlowColumnDense: 1950 case AutoFlowColumnDense:
1951 list->append(cssValuePool().createIdentifierValue(CSSValueColumn )); 1951 list->append(cssValuePool().createIdentifierValue(CSSValueColumn ));
1952 break; 1952 break;
1953 case AutoFlowStackRow:
1954 case AutoFlowStackColumn:
1955 list->append(cssValuePool().createIdentifierValue(CSSValueStack) );
1956 break;
1957 default: 1953 default:
1958 ASSERT_NOT_REACHED(); 1954 ASSERT_NOT_REACHED();
1959 } 1955 }
1960 1956
1961 switch (style->gridAutoFlow()) { 1957 switch (style->gridAutoFlow()) {
1962 case AutoFlowRowDense: 1958 case AutoFlowRowDense:
1963 case AutoFlowColumnDense: 1959 case AutoFlowColumnDense:
1964 list->append(cssValuePool().createIdentifierValue(CSSValueDense) ); 1960 list->append(cssValuePool().createIdentifierValue(CSSValueDense) );
1965 break; 1961 break;
1966 case AutoFlowStackRow:
1967 list->append(cssValuePool().createIdentifierValue(CSSValueRow));
1968 break;
1969 case AutoFlowStackColumn:
1970 list->append(cssValuePool().createIdentifierValue(CSSValueColumn ));
1971 break;
1972 default: 1962 default:
1973 // Do nothing. 1963 // Do nothing.
1974 break; 1964 break;
1975 } 1965 }
1976 1966
1977 return list.release(); 1967 return list.release();
1978 } 1968 }
1979 // Specs mention that getComputedStyle() should return the used value of the property instead of the computed 1969 // Specs mention that getComputedStyle() should return the used value of the property instead of the computed
1980 // one for grid-definition-{rows|columns} but not for the grid-auto-{row s|columns} as things like 1970 // one for grid-definition-{rows|columns} but not for the grid-auto-{row s|columns} as things like
1981 // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as th e '2fr' means very different things 1971 // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as th e '2fr' means very different things
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
3063 return list.release(); 3053 return list.release();
3064 } 3054 }
3065 3055
3066 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 3056 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
3067 { 3057 {
3068 visitor->trace(m_node); 3058 visitor->trace(m_node);
3069 CSSStyleDeclaration::trace(visitor); 3059 CSSStyleDeclaration::trace(visitor);
3070 } 3060 }
3071 3061
3072 } // namespace blink 3062 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698