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

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 #2 (rebased) 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 2034 matching lines...) Expand 10 before | Expand all | Expand 10 after
2239 case CSSPropertyTextDecoration: 2237 case CSSPropertyTextDecoration:
2240 return valuesForShorthandProperty(textDecorationShorthand()); 2238 return valuesForShorthandProperty(textDecorationShorthand());
2241 case CSSPropertyTextDecorationLine: 2239 case CSSPropertyTextDecorationLine:
2242 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2240 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2243 case CSSPropertyTextDecorationStyle: 2241 case CSSPropertyTextDecorationStyle:
2244 return valueForTextDecorationStyle(style->textDecorationStyle()); 2242 return valueForTextDecorationStyle(style->textDecorationStyle());
2245 case CSSPropertyTextDecorationColor: 2243 case CSSPropertyTextDecorationColor:
2246 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2244 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2247 case CSSPropertyTextJustify: 2245 case CSSPropertyTextJustify:
2248 return cssValuePool().createValue(style->textJustify()); 2246 return cssValuePool().createValue(style->textJustify());
2249 #if ENABLE(CSS3_TEXT) 2247 case CSSPropertyTextUnderlinePosition:
2250 case CSSPropertyWebkitTextUnderlinePosition:
2251 return cssValuePool().createValue(style->textUnderlinePosition()); 2248 return cssValuePool().createValue(style->textUnderlinePosition());
2252 #endif // CSS3_TEXT
2253 case CSSPropertyWebkitTextDecorationsInEffect: 2249 case CSSPropertyWebkitTextDecorationsInEffect:
2254 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2250 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2255 case CSSPropertyWebkitTextFillColor: 2251 case CSSPropertyWebkitTextFillColor:
2256 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2252 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2257 case CSSPropertyWebkitTextEmphasisColor: 2253 case CSSPropertyWebkitTextEmphasisColor:
2258 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2254 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
2259 case CSSPropertyWebkitTextEmphasisPosition: 2255 case CSSPropertyWebkitTextEmphasisPosition:
2260 return cssValuePool().createValue(style->textEmphasisPosition()); 2256 return cssValuePool().createValue(style->textEmphasisPosition());
2261 case CSSPropertyWebkitTextEmphasisStyle: 2257 case CSSPropertyWebkitTextEmphasisStyle:
2262 switch (style->textEmphasisMark()) { 2258 switch (style->textEmphasisMark()) {
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3215 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3220 CSSPropertyB ackgroundClip }; 3216 CSSPropertyB ackgroundClip };
3221 3217
3222 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3218 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3223 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3219 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3224 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3220 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3225 return list.release(); 3221 return list.release();
3226 } 3222 }
3227 3223
3228 } // namespace WebCore 3224 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698