| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| (...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 case CSSPropertyGridAutoColumns: { | 1618 case CSSPropertyGridAutoColumns: { |
| 1619 HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns); | 1619 HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns); |
| 1620 state.style()->setGridAutoColumns(createGridTrackSize(value, state)); | 1620 state.style()->setGridAutoColumns(createGridTrackSize(value, state)); |
| 1621 return; | 1621 return; |
| 1622 } | 1622 } |
| 1623 case CSSPropertyGridAutoRows: { | 1623 case CSSPropertyGridAutoRows: { |
| 1624 HANDLE_INHERIT_AND_INITIAL(gridAutoRows, GridAutoRows); | 1624 HANDLE_INHERIT_AND_INITIAL(gridAutoRows, GridAutoRows); |
| 1625 state.style()->setGridAutoRows(createGridTrackSize(value, state)); | 1625 state.style()->setGridAutoRows(createGridTrackSize(value, state)); |
| 1626 return; | 1626 return; |
| 1627 } | 1627 } |
| 1628 case CSSPropertyGridDefinitionColumns: { | 1628 case CSSPropertyGridTemplateColumns: { |
| 1629 if (isInherit) { | 1629 if (isInherit) { |
| 1630 state.style()->setGridDefinitionColumns(state.parentStyle()->gridDef
initionColumns()); | 1630 state.style()->setGridTemplateColumns(state.parentStyle()->gridTempl
ateColumns()); |
| 1631 state.style()->setNamedGridColumnLines(state.parentStyle()->namedGri
dColumnLines()); | 1631 state.style()->setNamedGridColumnLines(state.parentStyle()->namedGri
dColumnLines()); |
| 1632 state.style()->setOrderedNamedGridColumnLines(state.parentStyle()->o
rderedNamedGridColumnLines()); | 1632 state.style()->setOrderedNamedGridColumnLines(state.parentStyle()->o
rderedNamedGridColumnLines()); |
| 1633 return; | 1633 return; |
| 1634 } | 1634 } |
| 1635 if (isInitial) { | 1635 if (isInitial) { |
| 1636 state.style()->setGridDefinitionColumns(RenderStyle::initialGridDefi
nitionColumns()); | 1636 state.style()->setGridTemplateColumns(RenderStyle::initialGridTempla
teColumns()); |
| 1637 state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGrid
ColumnLines()); | 1637 state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGrid
ColumnLines()); |
| 1638 state.style()->setOrderedNamedGridColumnLines(RenderStyle::initialOr
deredNamedGridColumnLines()); | 1638 state.style()->setOrderedNamedGridColumnLines(RenderStyle::initialOr
deredNamedGridColumnLines()); |
| 1639 return; | 1639 return; |
| 1640 } | 1640 } |
| 1641 | 1641 |
| 1642 Vector<GridTrackSize> trackSizes; | 1642 Vector<GridTrackSize> trackSizes; |
| 1643 NamedGridLinesMap namedGridLines; | 1643 NamedGridLinesMap namedGridLines; |
| 1644 OrderedNamedGridLines orderedNamedGridLines; | 1644 OrderedNamedGridLines orderedNamedGridLines; |
| 1645 if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamed
GridLines, state)) | 1645 if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamed
GridLines, state)) |
| 1646 return; | 1646 return; |
| 1647 state.style()->setGridDefinitionColumns(trackSizes); | 1647 state.style()->setGridTemplateColumns(trackSizes); |
| 1648 state.style()->setNamedGridColumnLines(namedGridLines); | 1648 state.style()->setNamedGridColumnLines(namedGridLines); |
| 1649 state.style()->setOrderedNamedGridColumnLines(orderedNamedGridLines); | 1649 state.style()->setOrderedNamedGridColumnLines(orderedNamedGridLines); |
| 1650 return; | 1650 return; |
| 1651 } | 1651 } |
| 1652 case CSSPropertyGridDefinitionRows: { | 1652 case CSSPropertyGridTemplateRows: { |
| 1653 if (isInherit) { | 1653 if (isInherit) { |
| 1654 state.style()->setGridDefinitionRows(state.parentStyle()->gridDefini
tionRows()); | 1654 state.style()->setGridTemplateRows(state.parentStyle()->gridTemplate
Rows()); |
| 1655 state.style()->setNamedGridRowLines(state.parentStyle()->namedGridRo
wLines()); | 1655 state.style()->setNamedGridRowLines(state.parentStyle()->namedGridRo
wLines()); |
| 1656 state.style()->setOrderedNamedGridRowLines(state.parentStyle()->orde
redNamedGridRowLines()); | 1656 state.style()->setOrderedNamedGridRowLines(state.parentStyle()->orde
redNamedGridRowLines()); |
| 1657 return; | 1657 return; |
| 1658 } | 1658 } |
| 1659 if (isInitial) { | 1659 if (isInitial) { |
| 1660 state.style()->setGridDefinitionRows(RenderStyle::initialGridDefinit
ionRows()); | 1660 state.style()->setGridTemplateRows(RenderStyle::initialGridTemplateR
ows()); |
| 1661 state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRow
Lines()); | 1661 state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRow
Lines()); |
| 1662 state.style()->setOrderedNamedGridRowLines(RenderStyle::initialOrder
edNamedGridRowLines()); | 1662 state.style()->setOrderedNamedGridRowLines(RenderStyle::initialOrder
edNamedGridRowLines()); |
| 1663 return; | 1663 return; |
| 1664 } | 1664 } |
| 1665 | 1665 |
| 1666 Vector<GridTrackSize> trackSizes; | 1666 Vector<GridTrackSize> trackSizes; |
| 1667 NamedGridLinesMap namedGridLines; | 1667 NamedGridLinesMap namedGridLines; |
| 1668 OrderedNamedGridLines orderedNamedGridLines; | 1668 OrderedNamedGridLines orderedNamedGridLines; |
| 1669 if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamed
GridLines, state)) | 1669 if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamed
GridLines, state)) |
| 1670 return; | 1670 return; |
| 1671 state.style()->setGridDefinitionRows(trackSizes); | 1671 state.style()->setGridTemplateRows(trackSizes); |
| 1672 state.style()->setNamedGridRowLines(namedGridLines); | 1672 state.style()->setNamedGridRowLines(namedGridLines); |
| 1673 state.style()->setOrderedNamedGridRowLines(orderedNamedGridLines); | 1673 state.style()->setOrderedNamedGridRowLines(orderedNamedGridLines); |
| 1674 return; | 1674 return; |
| 1675 } | 1675 } |
| 1676 | 1676 |
| 1677 case CSSPropertyGridColumnStart: { | 1677 case CSSPropertyGridColumnStart: { |
| 1678 HANDLE_INHERIT_AND_INITIAL(gridColumnStart, GridColumnStart); | 1678 HANDLE_INHERIT_AND_INITIAL(gridColumnStart, GridColumnStart); |
| 1679 GridPosition startPosition; | 1679 GridPosition startPosition; |
| 1680 if (!createGridPosition(value, startPosition)) | 1680 if (!createGridPosition(value, startPosition)) |
| 1681 return; | 1681 return; |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2210 break; | 2210 break; |
| 2211 } | 2211 } |
| 2212 case CSSPropertyEnableBackground: | 2212 case CSSPropertyEnableBackground: |
| 2213 // Silently ignoring this property for now | 2213 // Silently ignoring this property for now |
| 2214 // http://bugs.webkit.org/show_bug.cgi?id=6022 | 2214 // http://bugs.webkit.org/show_bug.cgi?id=6022 |
| 2215 break; | 2215 break; |
| 2216 } | 2216 } |
| 2217 } | 2217 } |
| 2218 | 2218 |
| 2219 } // namespace WebCore | 2219 } // namespace WebCore |
| OLD | NEW |