| 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 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1388 // was expanded by the parser. | 1388 // was expanded by the parser. |
| 1389 // FIXME: System Font identifiers should not hijack this | 1389 // FIXME: System Font identifiers should not hijack this |
| 1390 // short-hand CSSProperty like this. | 1390 // short-hand CSSProperty like this. |
| 1391 ASSERT(!isInitial); | 1391 ASSERT(!isInitial); |
| 1392 ASSERT(!isInherit); | 1392 ASSERT(!isInherit); |
| 1393 ASSERT(primitiveValue); | 1393 ASSERT(primitiveValue); |
| 1394 state.style()->setLineHeight(RenderStyle::initialLineHeight()); | 1394 state.style()->setLineHeight(RenderStyle::initialLineHeight()); |
| 1395 state.setLineHeightValue(0); | 1395 state.setLineHeightValue(0); |
| 1396 state.fontBuilder().fromSystemFont(primitiveValue->getValueID(), state.s
tyle()->effectiveZoom()); | 1396 state.fontBuilder().fromSystemFont(primitiveValue->getValueID(), state.s
tyle()->effectiveZoom()); |
| 1397 return; | 1397 return; |
| 1398 case CSSPropertyAnimation: |
| 1398 case CSSPropertyBackground: | 1399 case CSSPropertyBackground: |
| 1399 case CSSPropertyBackgroundPosition: | 1400 case CSSPropertyBackgroundPosition: |
| 1400 case CSSPropertyBackgroundRepeat: | 1401 case CSSPropertyBackgroundRepeat: |
| 1401 case CSSPropertyBorder: | 1402 case CSSPropertyBorder: |
| 1402 case CSSPropertyBorderBottom: | 1403 case CSSPropertyBorderBottom: |
| 1403 case CSSPropertyBorderColor: | 1404 case CSSPropertyBorderColor: |
| 1404 case CSSPropertyBorderImage: | 1405 case CSSPropertyBorderImage: |
| 1405 case CSSPropertyBorderLeft: | 1406 case CSSPropertyBorderLeft: |
| 1406 case CSSPropertyBorderRadius: | 1407 case CSSPropertyBorderRadius: |
| 1407 case CSSPropertyBorderRight: | 1408 case CSSPropertyBorderRight: |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1815 } | 1816 } |
| 1816 | 1817 |
| 1817 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value); | 1818 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value); |
| 1818 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap()); | 1819 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap()); |
| 1819 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount()); | 1820 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount()); |
| 1820 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun
t()); | 1821 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun
t()); |
| 1821 return; | 1822 return; |
| 1822 } | 1823 } |
| 1823 | 1824 |
| 1824 // These properties are aliased and we already applied the property on the p
refixed version. | 1825 // These properties are aliased and we already applied the property on the p
refixed version. |
| 1826 case CSSPropertyAnimationDelay: |
| 1827 case CSSPropertyAnimationDirection: |
| 1828 case CSSPropertyAnimationDuration: |
| 1829 case CSSPropertyAnimationFillMode: |
| 1830 case CSSPropertyAnimationIterationCount: |
| 1831 case CSSPropertyAnimationName: |
| 1832 case CSSPropertyAnimationPlayState: |
| 1833 case CSSPropertyAnimationTimingFunction: |
| 1825 case CSSPropertyTransitionDelay: | 1834 case CSSPropertyTransitionDelay: |
| 1826 case CSSPropertyTransitionDuration: | 1835 case CSSPropertyTransitionDuration: |
| 1827 case CSSPropertyTransitionProperty: | 1836 case CSSPropertyTransitionProperty: |
| 1828 case CSSPropertyTransitionTimingFunction: | 1837 case CSSPropertyTransitionTimingFunction: |
| 1829 return; | 1838 return; |
| 1830 // These properties are implemented in StyleBuilder::applyProperty. | 1839 // These properties are implemented in StyleBuilder::applyProperty. |
| 1831 case CSSPropertyBackgroundAttachment: | 1840 case CSSPropertyBackgroundAttachment: |
| 1832 case CSSPropertyBackgroundBlendMode: | 1841 case CSSPropertyBackgroundBlendMode: |
| 1833 case CSSPropertyBackgroundClip: | 1842 case CSSPropertyBackgroundClip: |
| 1834 case CSSPropertyBackgroundColor: | 1843 case CSSPropertyBackgroundColor: |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2329 break; | 2338 break; |
| 2330 } | 2339 } |
| 2331 case CSSPropertyEnableBackground: | 2340 case CSSPropertyEnableBackground: |
| 2332 // Silently ignoring this property for now | 2341 // Silently ignoring this property for now |
| 2333 // http://bugs.webkit.org/show_bug.cgi?id=6022 | 2342 // http://bugs.webkit.org/show_bug.cgi?id=6022 |
| 2334 break; | 2343 break; |
| 2335 } | 2344 } |
| 2336 } | 2345 } |
| 2337 | 2346 |
| 2338 } // namespace WebCore | 2347 } // namespace WebCore |
| OLD | NEW |