OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 CSSPropertySpeak, | 169 CSSPropertySpeak, |
170 CSSPropertyTableLayout, | 170 CSSPropertyTableLayout, |
171 CSSPropertyTabSize, | 171 CSSPropertyTabSize, |
172 CSSPropertyTextAlign, | 172 CSSPropertyTextAlign, |
173 CSSPropertyTextDecoration, | 173 CSSPropertyTextDecoration, |
174 CSSPropertyTextDecorationLine, | 174 CSSPropertyTextDecorationLine, |
175 CSSPropertyTextDecorationStyle, | 175 CSSPropertyTextDecorationStyle, |
176 CSSPropertyTextDecorationColor, | 176 CSSPropertyTextDecorationColor, |
177 #if ENABLE(CSS3_TEXT) | 177 #if ENABLE(CSS3_TEXT) |
178 CSSPropertyWebkitTextAlignLast, | 178 CSSPropertyWebkitTextAlignLast, |
| 179 CSSPropertyWebkitTextJustify, |
179 CSSPropertyWebkitTextUnderlinePosition, | 180 CSSPropertyWebkitTextUnderlinePosition, |
180 #endif // CSS3_TEXT | 181 #endif // CSS3_TEXT |
181 CSSPropertyTextIndent, | 182 CSSPropertyTextIndent, |
182 CSSPropertyTextRendering, | 183 CSSPropertyTextRendering, |
183 CSSPropertyTextShadow, | 184 CSSPropertyTextShadow, |
184 CSSPropertyTextOverflow, | 185 CSSPropertyTextOverflow, |
185 CSSPropertyTextTransform, | 186 CSSPropertyTextTransform, |
186 CSSPropertyTop, | 187 CSSPropertyTop, |
187 CSSPropertyTouchAction, | 188 CSSPropertyTouchAction, |
188 CSSPropertyTransitionDelay, | 189 CSSPropertyTransitionDelay, |
(...skipping 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2131 case CSSPropertyTextDecoration: | 2132 case CSSPropertyTextDecoration: |
2132 case CSSPropertyTextDecorationLine: | 2133 case CSSPropertyTextDecorationLine: |
2133 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); | 2134 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); |
2134 case CSSPropertyTextDecorationStyle: | 2135 case CSSPropertyTextDecorationStyle: |
2135 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio
nStyle()); | 2136 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio
nStyle()); |
2136 case CSSPropertyTextDecorationColor: | 2137 case CSSPropertyTextDecorationColor: |
2137 return currentColorOrValidColor(style.get(), style->textDecorationCo
lor()); | 2138 return currentColorOrValidColor(style.get(), style->textDecorationCo
lor()); |
2138 #if ENABLE(CSS3_TEXT) | 2139 #if ENABLE(CSS3_TEXT) |
2139 case CSSPropertyWebkitTextAlignLast: | 2140 case CSSPropertyWebkitTextAlignLast: |
2140 return cssValuePool().createValue(style->textAlignLast()); | 2141 return cssValuePool().createValue(style->textAlignLast()); |
| 2142 case CSSPropertyWebkitTextJustify: |
| 2143 return cssValuePool().createValue(style->textJustify()); |
2141 case CSSPropertyWebkitTextUnderlinePosition: | 2144 case CSSPropertyWebkitTextUnderlinePosition: |
2142 return cssValuePool().createValue(style->textUnderlinePosition()); | 2145 return cssValuePool().createValue(style->textUnderlinePosition()); |
2143 #endif // CSS3_TEXT | 2146 #endif // CSS3_TEXT |
2144 case CSSPropertyWebkitTextDecorationsInEffect: | 2147 case CSSPropertyWebkitTextDecorationsInEffect: |
2145 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE
ffect()); | 2148 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE
ffect()); |
2146 case CSSPropertyWebkitTextFillColor: | 2149 case CSSPropertyWebkitTextFillColor: |
2147 return currentColorOrValidColor(style.get(), style->textFillColor())
; | 2150 return currentColorOrValidColor(style.get(), style->textFillColor())
; |
2148 case CSSPropertyWebkitTextEmphasisColor: | 2151 case CSSPropertyWebkitTextEmphasisColor: |
2149 return currentColorOrValidColor(style.get(), style->textEmphasisColo
r()); | 2152 return currentColorOrValidColor(style.get(), style->textEmphasisColo
r()); |
2150 case CSSPropertyWebkitTextEmphasisPosition: | 2153 case CSSPropertyWebkitTextEmphasisPosition: |
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2987 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, | 2990 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, |
2988 CSSPropertyB
ackgroundClip }; | 2991 CSSPropertyB
ackgroundClip }; |
2989 | 2992 |
2990 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); | 2993 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); |
2991 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha
nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope
rtiesBeforeSlashSeperator)))); | 2994 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha
nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope
rtiesBeforeSlashSeperator)))); |
2992 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha
nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper
tiesAfterSlashSeperator)))); | 2995 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha
nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper
tiesAfterSlashSeperator)))); |
2993 return list.release(); | 2996 return list.release(); |
2994 } | 2997 } |
2995 | 2998 |
2996 } // namespace WebCore | 2999 } // namespace WebCore |
OLD | NEW |