| 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 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1706 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 1706 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 1707 if (Pair* pairValue = primitiveValue->getPairValue()) { | 1707 if (Pair* pairValue = primitiveValue->getPairValue()) { |
| 1708 state.style()->setJustifySelf(*pairValue->first()); | 1708 state.style()->setJustifySelf(*pairValue->first()); |
| 1709 state.style()->setJustifySelfOverflowAlignment(*pairValue->second())
; | 1709 state.style()->setJustifySelfOverflowAlignment(*pairValue->second())
; |
| 1710 } else { | 1710 } else { |
| 1711 state.style()->setJustifySelf(*primitiveValue); | 1711 state.style()->setJustifySelf(*primitiveValue); |
| 1712 } | 1712 } |
| 1713 return; | 1713 return; |
| 1714 } | 1714 } |
| 1715 | 1715 |
| 1716 case CSSPropertyAlignSelf: { |
| 1717 HANDLE_INHERIT_AND_INITIAL(alignSelf, AlignSelf); |
| 1718 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 1719 if (Pair* pairValue = primitiveValue->getPairValue()) { |
| 1720 state.style()->setAlignSelf(*pairValue->first()); |
| 1721 state.style()->setAlignSelfOverflowAlignment(*pairValue->second()); |
| 1722 } else { |
| 1723 state.style()->setAlignSelf(*primitiveValue); |
| 1724 } |
| 1725 return; |
| 1726 } |
| 1727 |
| 1728 case CSSPropertyAlignItems: { |
| 1729 HANDLE_INHERIT_AND_INITIAL(alignItems, AlignItems); |
| 1730 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 1731 if (Pair* pairValue = primitiveValue->getPairValue()) { |
| 1732 state.style()->setAlignItems(*pairValue->first()); |
| 1733 state.style()->setAlignItemsOverflowAlignment(*pairValue->second()); |
| 1734 } else { |
| 1735 state.style()->setAlignItems(*primitiveValue); |
| 1736 } |
| 1737 return; |
| 1738 } |
| 1739 |
| 1716 // These properties are aliased and we already applied the property on the p
refixed version. | 1740 // These properties are aliased and we already applied the property on the p
refixed version. |
| 1717 case CSSPropertyAnimationDelay: | 1741 case CSSPropertyAnimationDelay: |
| 1718 case CSSPropertyAnimationDirection: | 1742 case CSSPropertyAnimationDirection: |
| 1719 case CSSPropertyAnimationDuration: | 1743 case CSSPropertyAnimationDuration: |
| 1720 case CSSPropertyAnimationFillMode: | 1744 case CSSPropertyAnimationFillMode: |
| 1721 case CSSPropertyAnimationIterationCount: | 1745 case CSSPropertyAnimationIterationCount: |
| 1722 case CSSPropertyAnimationName: | 1746 case CSSPropertyAnimationName: |
| 1723 case CSSPropertyAnimationPlayState: | 1747 case CSSPropertyAnimationPlayState: |
| 1724 case CSSPropertyAnimationTimingFunction: | 1748 case CSSPropertyAnimationTimingFunction: |
| 1725 case CSSPropertyTransitionDelay: | 1749 case CSSPropertyTransitionDelay: |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 case CSSPropertyWebkitColumnCount: | 1902 case CSSPropertyWebkitColumnCount: |
| 1879 case CSSPropertyColumnFill: | 1903 case CSSPropertyColumnFill: |
| 1880 case CSSPropertyWebkitColumnGap: | 1904 case CSSPropertyWebkitColumnGap: |
| 1881 case CSSPropertyWebkitColumnProgression: | 1905 case CSSPropertyWebkitColumnProgression: |
| 1882 case CSSPropertyWebkitColumnRuleColor: | 1906 case CSSPropertyWebkitColumnRuleColor: |
| 1883 case CSSPropertyWebkitColumnRuleStyle: | 1907 case CSSPropertyWebkitColumnRuleStyle: |
| 1884 case CSSPropertyWebkitColumnRuleWidth: | 1908 case CSSPropertyWebkitColumnRuleWidth: |
| 1885 case CSSPropertyWebkitColumnSpan: | 1909 case CSSPropertyWebkitColumnSpan: |
| 1886 case CSSPropertyWebkitColumnWidth: | 1910 case CSSPropertyWebkitColumnWidth: |
| 1887 case CSSPropertyAlignContent: | 1911 case CSSPropertyAlignContent: |
| 1888 case CSSPropertyAlignItems: | |
| 1889 case CSSPropertyAlignSelf: | |
| 1890 case CSSPropertyFlexBasis: | 1912 case CSSPropertyFlexBasis: |
| 1891 case CSSPropertyFlexDirection: | 1913 case CSSPropertyFlexDirection: |
| 1892 case CSSPropertyFlexGrow: | 1914 case CSSPropertyFlexGrow: |
| 1893 case CSSPropertyFlexShrink: | 1915 case CSSPropertyFlexShrink: |
| 1894 case CSSPropertyFlexWrap: | 1916 case CSSPropertyFlexWrap: |
| 1895 case CSSPropertyJustifyContent: | 1917 case CSSPropertyJustifyContent: |
| 1896 case CSSPropertyOrder: | 1918 case CSSPropertyOrder: |
| 1897 case CSSPropertyWebkitFlowFrom: | 1919 case CSSPropertyWebkitFlowFrom: |
| 1898 case CSSPropertyWebkitFlowInto: | 1920 case CSSPropertyWebkitFlowInto: |
| 1899 case CSSPropertyWebkitFontSmoothing: | 1921 case CSSPropertyWebkitFontSmoothing: |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2154 break; | 2176 break; |
| 2155 } | 2177 } |
| 2156 case CSSPropertyEnableBackground: | 2178 case CSSPropertyEnableBackground: |
| 2157 // Silently ignoring this property for now | 2179 // Silently ignoring this property for now |
| 2158 // http://bugs.webkit.org/show_bug.cgi?id=6022 | 2180 // http://bugs.webkit.org/show_bug.cgi?id=6022 |
| 2159 break; | 2181 break; |
| 2160 } | 2182 } |
| 2161 } | 2183 } |
| 2162 | 2184 |
| 2163 } // namespace WebCore | 2185 } // namespace WebCore |
| OLD | NEW |