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

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

Issue 826893002: [CSS Grid Layout] Remove stack from grid-auto-flow syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased patch 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
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.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) 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 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 1566 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
1567 switch (style.gridAutoFlow()) { 1567 switch (style.gridAutoFlow()) {
1568 case AutoFlowRow: 1568 case AutoFlowRow:
1569 case AutoFlowRowDense: 1569 case AutoFlowRowDense:
1570 list->append(cssValuePool().createIdentifierValue(CSSValueRow)); 1570 list->append(cssValuePool().createIdentifierValue(CSSValueRow));
1571 break; 1571 break;
1572 case AutoFlowColumn: 1572 case AutoFlowColumn:
1573 case AutoFlowColumnDense: 1573 case AutoFlowColumnDense:
1574 list->append(cssValuePool().createIdentifierValue(CSSValueColumn)); 1574 list->append(cssValuePool().createIdentifierValue(CSSValueColumn));
1575 break; 1575 break;
1576 case AutoFlowStackRow:
1577 case AutoFlowStackColumn:
1578 list->append(cssValuePool().createIdentifierValue(CSSValueStack));
1579 break;
1580 default: 1576 default:
1581 ASSERT_NOT_REACHED(); 1577 ASSERT_NOT_REACHED();
1582 } 1578 }
1583 1579
1584 switch (style.gridAutoFlow()) { 1580 switch (style.gridAutoFlow()) {
1585 case AutoFlowRowDense: 1581 case AutoFlowRowDense:
1586 case AutoFlowColumnDense: 1582 case AutoFlowColumnDense:
1587 list->append(cssValuePool().createIdentifierValue(CSSValueDense)); 1583 list->append(cssValuePool().createIdentifierValue(CSSValueDense));
1588 break; 1584 break;
1589 case AutoFlowStackRow:
1590 list->append(cssValuePool().createIdentifierValue(CSSValueRow));
1591 break;
1592 case AutoFlowStackColumn:
1593 list->append(cssValuePool().createIdentifierValue(CSSValueColumn));
1594 break;
1595 default: 1585 default:
1596 // Do nothing. 1586 // Do nothing.
1597 break; 1587 break;
1598 } 1588 }
1599 1589
1600 return list.release(); 1590 return list.release();
1601 } 1591 }
1602 // Specs mention that getComputedStyle() should return the used value of the property instead of the computed 1592 // Specs mention that getComputedStyle() should return the used value of the property instead of the computed
1603 // one for grid-definition-{rows|columns} but not for the grid-auto-{rows|co lumns} as things like 1593 // one for grid-definition-{rows|columns} but not for the grid-auto-{rows|co lumns} as things like
1604 // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as the '2 fr' means very different things 1594 // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as the '2 fr' means very different things
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 return nullptr; 2547 return nullptr;
2558 2548
2559 case CSSPropertyAll: 2549 case CSSPropertyAll:
2560 return nullptr; 2550 return nullptr;
2561 } 2551 }
2562 ASSERT_NOT_REACHED(); 2552 ASSERT_NOT_REACHED();
2563 return nullptr; 2553 return nullptr;
2564 } 2554 }
2565 2555
2566 } 2556 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698