| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. | 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. |
| 10 * | 10 * |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI
D == CSSValueColumn || valueID == CSSValueColumnReverse; | 518 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI
D == CSSValueColumn || valueID == CSSValueColumnReverse; |
| 519 case CSSPropertyFlexWrap: | 519 case CSSPropertyFlexWrap: |
| 520 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID =
= CSSValueWrapReverse; | 520 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID =
= CSSValueWrapReverse; |
| 521 case CSSPropertyJustifyContent: | 521 case CSSPropertyJustifyContent: |
| 522 // FIXME: Per CSS alignment, this property should accept an optional <ov
erflow-position>. We should share this parsing code with 'justify-self'. | 522 // FIXME: Per CSS alignment, this property should accept an optional <ov
erflow-position>. We should share this parsing code with 'justify-self'. |
| 523 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val
ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue
SpaceAround; | 523 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val
ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue
SpaceAround; |
| 524 case CSSPropertyFontKerning: | 524 case CSSPropertyFontKerning: |
| 525 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID =
= CSSValueNone; | 525 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID =
= CSSValueNone; |
| 526 case CSSPropertyWebkitFontSmoothing: | 526 case CSSPropertyWebkitFontSmoothing: |
| 527 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID ==
CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; | 527 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID ==
CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; |
| 528 case CSSPropertyGridAutoFlow: | |
| 529 return RuntimeEnabledFeatures::cssGridLayoutEnabled() | |
| 530 && (valueID == CSSValueNone || valueID == CSSValueRow || valueID ==
CSSValueColumn); | |
| 531 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w
hite-space | 528 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w
hite-space |
| 532 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID ==
CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa
ce; | 529 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID ==
CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa
ce; |
| 533 case CSSPropertyWebkitMarginAfterCollapse: | 530 case CSSPropertyWebkitMarginAfterCollapse: |
| 534 case CSSPropertyWebkitMarginBeforeCollapse: | 531 case CSSPropertyWebkitMarginBeforeCollapse: |
| 535 case CSSPropertyWebkitMarginBottomCollapse: | 532 case CSSPropertyWebkitMarginBottomCollapse: |
| 536 case CSSPropertyWebkitMarginTopCollapse: | 533 case CSSPropertyWebkitMarginTopCollapse: |
| 537 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val
ueID == CSSValueDiscard; | 534 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val
ueID == CSSValueDiscard; |
| 538 case CSSPropertyInternalMarqueeDirection: | 535 case CSSPropertyInternalMarqueeDirection: |
| 539 return valueID == CSSValueForwards || valueID == CSSValueBackwards || va
lueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft
|| valueID == CSSValueRight || valueID == CSSValueDown | 536 return valueID == CSSValueForwards || valueID == CSSValueBackwards || va
lueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft
|| valueID == CSSValueRight || valueID == CSSValueDown |
| 540 || valueID == CSSValueUp || valueID == CSSValueAuto; | 537 || valueID == CSSValueUp || valueID == CSSValueAuto; |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 case CSSPropertyWebkitColumnBreakBefore: | 646 case CSSPropertyWebkitColumnBreakBefore: |
| 650 case CSSPropertyWebkitColumnBreakInside: | 647 case CSSPropertyWebkitColumnBreakInside: |
| 651 case CSSPropertyColumnFill: | 648 case CSSPropertyColumnFill: |
| 652 case CSSPropertyWebkitColumnRuleStyle: | 649 case CSSPropertyWebkitColumnRuleStyle: |
| 653 case CSSPropertyAlignContent: | 650 case CSSPropertyAlignContent: |
| 654 case CSSPropertyFlexDirection: | 651 case CSSPropertyFlexDirection: |
| 655 case CSSPropertyFlexWrap: | 652 case CSSPropertyFlexWrap: |
| 656 case CSSPropertyJustifyContent: | 653 case CSSPropertyJustifyContent: |
| 657 case CSSPropertyFontKerning: | 654 case CSSPropertyFontKerning: |
| 658 case CSSPropertyWebkitFontSmoothing: | 655 case CSSPropertyWebkitFontSmoothing: |
| 659 case CSSPropertyGridAutoFlow: | |
| 660 case CSSPropertyWebkitLineBreak: | 656 case CSSPropertyWebkitLineBreak: |
| 661 case CSSPropertyWebkitMarginAfterCollapse: | 657 case CSSPropertyWebkitMarginAfterCollapse: |
| 662 case CSSPropertyWebkitMarginBeforeCollapse: | 658 case CSSPropertyWebkitMarginBeforeCollapse: |
| 663 case CSSPropertyWebkitMarginBottomCollapse: | 659 case CSSPropertyWebkitMarginBottomCollapse: |
| 664 case CSSPropertyWebkitMarginTopCollapse: | 660 case CSSPropertyWebkitMarginTopCollapse: |
| 665 case CSSPropertyInternalMarqueeDirection: | 661 case CSSPropertyInternalMarqueeDirection: |
| 666 case CSSPropertyInternalMarqueeStyle: | 662 case CSSPropertyInternalMarqueeStyle: |
| 667 case CSSPropertyWebkitPrintColorAdjust: | 663 case CSSPropertyWebkitPrintColorAdjust: |
| 668 case CSSPropertyWebkitRtlOrdering: | 664 case CSSPropertyWebkitRtlOrdering: |
| 669 case CSSPropertyWebkitRubyPosition: | 665 case CSSPropertyWebkitRubyPosition: |
| (...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2111 rule->setProperties(createStylePropertySet()); | 2107 rule->setProperties(createStylePropertySet()); |
| 2112 clearProperties(); | 2108 clearProperties(); |
| 2113 | 2109 |
| 2114 StyleRuleViewport* result = rule.get(); | 2110 StyleRuleViewport* result = rule.get(); |
| 2115 m_parsedRules.append(rule.release()); | 2111 m_parsedRules.append(rule.release()); |
| 2116 | 2112 |
| 2117 return result; | 2113 return result; |
| 2118 } | 2114 } |
| 2119 | 2115 |
| 2120 } | 2116 } |
| OLD | NEW |