OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 2005 Apple Computer, Inc. | 2 Copyright (C) 2005 Apple Computer, Inc. |
3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
4 2004, 2005, 2008 Rob Buis <buis@kde.org> | 4 2004, 2005, 2008 Rob Buis <buis@kde.org> |
5 Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 5 Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
6 | 6 |
7 Based on khtml css code by: | 7 Based on khtml css code by: |
8 Copyright(C) 1999-2003 Lars Knoll(knoll@kde.org) | 8 Copyright(C) 1999-2003 Lars Knoll(knoll@kde.org) |
9 (C) 2003 Apple Computer, Inc. | 9 (C) 2003 Apple Computer, Inc. |
10 (C) 2004 Allan Sandfeld Jensen(kde@carewolf.com) | 10 (C) 2004 Allan Sandfeld Jensen(kde@carewolf.com) |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 126 |
127 svgstyle->setAlignmentBaseline(*primitiveValue); | 127 svgstyle->setAlignmentBaseline(*primitiveValue); |
128 break; | 128 break; |
129 } | 129 } |
130 case CSSPropertyBaselineShift: | 130 case CSSPropertyBaselineShift: |
131 { | 131 { |
132 HANDLE_INHERIT_AND_INITIAL(baselineShift, BaselineShift); | 132 HANDLE_INHERIT_AND_INITIAL(baselineShift, BaselineShift); |
133 if (!primitiveValue) | 133 if (!primitiveValue) |
134 break; | 134 break; |
135 | 135 |
136 if (primitiveValue->getIdent()) { | 136 if (primitiveValue->getValueID()) { |
137 switch (primitiveValue->getIdent()) { | 137 switch (primitiveValue->getValueID()) { |
138 case CSSValueBaseline: | 138 case CSSValueBaseline: |
139 svgstyle->setBaselineShift(BS_BASELINE); | 139 svgstyle->setBaselineShift(BS_BASELINE); |
140 break; | 140 break; |
141 case CSSValueSub: | 141 case CSSValueSub: |
142 svgstyle->setBaselineShift(BS_SUB); | 142 svgstyle->setBaselineShift(BS_SUB); |
143 break; | 143 break; |
144 case CSSValueSuper: | 144 case CSSValueSuper: |
145 svgstyle->setBaselineShift(BS_SUPER); | 145 svgstyle->setBaselineShift(BS_SUPER); |
146 break; | 146 break; |
147 default: | 147 default: |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 { | 528 { |
529 HANDLE_INHERIT_AND_INITIAL(glyphOrientationVertical, GlyphOrientatio
nVertical) | 529 HANDLE_INHERIT_AND_INITIAL(glyphOrientationVertical, GlyphOrientatio
nVertical) |
530 if (!primitiveValue) | 530 if (!primitiveValue) |
531 return; | 531 return; |
532 | 532 |
533 if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_DEG) { | 533 if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_DEG) { |
534 int orientation = angleToGlyphOrientation(primitiveValue->getFlo
atValue()); | 534 int orientation = angleToGlyphOrientation(primitiveValue->getFlo
atValue()); |
535 ASSERT(orientation != -1); | 535 ASSERT(orientation != -1); |
536 | 536 |
537 svgstyle->setGlyphOrientationVertical((EGlyphOrientation) orient
ation); | 537 svgstyle->setGlyphOrientationVertical((EGlyphOrientation) orient
ation); |
538 } else if (primitiveValue->getIdent() == CSSValueAuto) | 538 } else if (primitiveValue->getValueID() == CSSValueAuto) |
539 svgstyle->setGlyphOrientationVertical(GO_AUTO); | 539 svgstyle->setGlyphOrientationVertical(GO_AUTO); |
540 | 540 |
541 break; | 541 break; |
542 } | 542 } |
543 case CSSPropertyEnableBackground: | 543 case CSSPropertyEnableBackground: |
544 // Silently ignoring this property for now | 544 // Silently ignoring this property for now |
545 // http://bugs.webkit.org/show_bug.cgi?id=6022 | 545 // http://bugs.webkit.org/show_bug.cgi?id=6022 |
546 break; | 546 break; |
547 case CSSPropertyWebkitSvgShadow: { | 547 case CSSPropertyWebkitSvgShadow: { |
548 if (isInherit) | 548 if (isInherit) |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 } | 602 } |
603 default: | 603 default: |
604 // If you crash here, it's because you added a css property and are
not handling it | 604 // If you crash here, it's because you added a css property and are
not handling it |
605 // in either this switch statement or the one in StyleResolver::appl
yProperty | 605 // in either this switch statement or the one in StyleResolver::appl
yProperty |
606 ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", id); | 606 ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", id); |
607 return; | 607 return; |
608 } | 608 } |
609 } | 609 } |
610 | 610 |
611 } | 611 } |
OLD | NEW |