Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 40733004: Replace compile flag with runtime check for text-underline-position (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Julien's review Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 CSSPropertySpeak, 182 CSSPropertySpeak,
183 CSSPropertyTableLayout, 183 CSSPropertyTableLayout,
184 CSSPropertyTabSize, 184 CSSPropertyTabSize,
185 CSSPropertyTextAlign, 185 CSSPropertyTextAlign,
186 CSSPropertyTextAlignLast, 186 CSSPropertyTextAlignLast,
187 CSSPropertyTextDecoration, 187 CSSPropertyTextDecoration,
188 CSSPropertyTextDecorationLine, 188 CSSPropertyTextDecorationLine,
189 CSSPropertyTextDecorationStyle, 189 CSSPropertyTextDecorationStyle,
190 CSSPropertyTextDecorationColor, 190 CSSPropertyTextDecorationColor,
191 CSSPropertyTextJustify, 191 CSSPropertyTextJustify,
192 #if ENABLE(CSS3_TEXT) 192 CSSPropertyTextUnderlinePosition,
193 CSSPropertyWebkitTextUnderlinePosition,
194 #endif // CSS3_TEXT
195 CSSPropertyTextIndent, 193 CSSPropertyTextIndent,
196 CSSPropertyTextRendering, 194 CSSPropertyTextRendering,
197 CSSPropertyTextShadow, 195 CSSPropertyTextShadow,
198 CSSPropertyTextOverflow, 196 CSSPropertyTextOverflow,
199 CSSPropertyTextTransform, 197 CSSPropertyTextTransform,
200 CSSPropertyTop, 198 CSSPropertyTop,
201 CSSPropertyTouchAction, 199 CSSPropertyTouchAction,
202 CSSPropertyTouchActionDelay, 200 CSSPropertyTouchActionDelay,
203 CSSPropertyTransitionDelay, 201 CSSPropertyTransitionDelay,
204 CSSPropertyTransitionDuration, 202 CSSPropertyTransitionDuration,
(...skipping 2039 matching lines...) Expand 10 before | Expand all | Expand 10 after
2244 case CSSPropertyTextDecoration: 2242 case CSSPropertyTextDecoration:
2245 return valuesForShorthandProperty(textDecorationShorthand()); 2243 return valuesForShorthandProperty(textDecorationShorthand());
2246 case CSSPropertyTextDecorationLine: 2244 case CSSPropertyTextDecorationLine:
2247 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2245 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2248 case CSSPropertyTextDecorationStyle: 2246 case CSSPropertyTextDecorationStyle:
2249 return valueForTextDecorationStyle(style->textDecorationStyle()); 2247 return valueForTextDecorationStyle(style->textDecorationStyle());
2250 case CSSPropertyTextDecorationColor: 2248 case CSSPropertyTextDecorationColor:
2251 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2249 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2252 case CSSPropertyTextJustify: 2250 case CSSPropertyTextJustify:
2253 return cssValuePool().createValue(style->textJustify()); 2251 return cssValuePool().createValue(style->textJustify());
2254 #if ENABLE(CSS3_TEXT) 2252 case CSSPropertyTextUnderlinePosition:
2255 case CSSPropertyWebkitTextUnderlinePosition:
2256 return cssValuePool().createValue(style->textUnderlinePosition()); 2253 return cssValuePool().createValue(style->textUnderlinePosition());
2257 #endif // CSS3_TEXT
2258 case CSSPropertyWebkitTextDecorationsInEffect: 2254 case CSSPropertyWebkitTextDecorationsInEffect:
2259 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2255 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2260 case CSSPropertyWebkitTextFillColor: 2256 case CSSPropertyWebkitTextFillColor:
2261 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2257 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2262 case CSSPropertyWebkitTextEmphasisColor: 2258 case CSSPropertyWebkitTextEmphasisColor:
2263 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2259 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
2264 case CSSPropertyWebkitTextEmphasisPosition: 2260 case CSSPropertyWebkitTextEmphasisPosition:
2265 return cssValuePool().createValue(style->textEmphasisPosition()); 2261 return cssValuePool().createValue(style->textEmphasisPosition());
2266 case CSSPropertyWebkitTextEmphasisStyle: 2262 case CSSPropertyWebkitTextEmphasisStyle:
2267 switch (style->textEmphasisMark()) { 2263 switch (style->textEmphasisMark()) {
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
3224 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3220 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3225 CSSPropertyB ackgroundClip }; 3221 CSSPropertyB ackgroundClip };
3226 3222
3227 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3223 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3228 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3224 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3229 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3225 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3230 return list.release(); 3226 return list.release();
3231 } 3227 }
3232 3228
3233 } // namespace WebCore 3229 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698