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

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: Fixed a typo in static function compileUnderlineOffset signature / Rebase 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 CSSPropertySpeak, 183 CSSPropertySpeak,
184 CSSPropertyTableLayout, 184 CSSPropertyTableLayout,
185 CSSPropertyTabSize, 185 CSSPropertyTabSize,
186 CSSPropertyTextAlign, 186 CSSPropertyTextAlign,
187 CSSPropertyTextAlignLast, 187 CSSPropertyTextAlignLast,
188 CSSPropertyTextDecoration, 188 CSSPropertyTextDecoration,
189 CSSPropertyTextDecorationLine, 189 CSSPropertyTextDecorationLine,
190 CSSPropertyTextDecorationStyle, 190 CSSPropertyTextDecorationStyle,
191 CSSPropertyTextDecorationColor, 191 CSSPropertyTextDecorationColor,
192 CSSPropertyTextJustify, 192 CSSPropertyTextJustify,
193 #if ENABLE(CSS3_TEXT) 193 CSSPropertyTextUnderlinePosition,
194 CSSPropertyWebkitTextUnderlinePosition,
195 #endif // CSS3_TEXT
196 CSSPropertyTextIndent, 194 CSSPropertyTextIndent,
197 CSSPropertyTextRendering, 195 CSSPropertyTextRendering,
198 CSSPropertyTextShadow, 196 CSSPropertyTextShadow,
199 CSSPropertyTextOverflow, 197 CSSPropertyTextOverflow,
200 CSSPropertyTextTransform, 198 CSSPropertyTextTransform,
201 CSSPropertyTop, 199 CSSPropertyTop,
202 CSSPropertyTouchAction, 200 CSSPropertyTouchAction,
203 CSSPropertyTouchActionDelay, 201 CSSPropertyTouchActionDelay,
204 CSSPropertyTransitionDelay, 202 CSSPropertyTransitionDelay,
205 CSSPropertyTransitionDuration, 203 CSSPropertyTransitionDuration,
(...skipping 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after
2250 case CSSPropertyTextDecoration: 2248 case CSSPropertyTextDecoration:
2251 return valuesForShorthandProperty(textDecorationShorthand()); 2249 return valuesForShorthandProperty(textDecorationShorthand());
2252 case CSSPropertyTextDecorationLine: 2250 case CSSPropertyTextDecorationLine:
2253 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2251 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2254 case CSSPropertyTextDecorationStyle: 2252 case CSSPropertyTextDecorationStyle:
2255 return valueForTextDecorationStyle(style->textDecorationStyle()); 2253 return valueForTextDecorationStyle(style->textDecorationStyle());
2256 case CSSPropertyTextDecorationColor: 2254 case CSSPropertyTextDecorationColor:
2257 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2255 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2258 case CSSPropertyTextJustify: 2256 case CSSPropertyTextJustify:
2259 return cssValuePool().createValue(style->textJustify()); 2257 return cssValuePool().createValue(style->textJustify());
2260 #if ENABLE(CSS3_TEXT) 2258 case CSSPropertyTextUnderlinePosition:
2261 case CSSPropertyWebkitTextUnderlinePosition:
2262 return cssValuePool().createValue(style->textUnderlinePosition()); 2259 return cssValuePool().createValue(style->textUnderlinePosition());
2263 #endif // CSS3_TEXT
2264 case CSSPropertyWebkitTextDecorationsInEffect: 2260 case CSSPropertyWebkitTextDecorationsInEffect:
2265 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2261 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2266 case CSSPropertyWebkitTextFillColor: 2262 case CSSPropertyWebkitTextFillColor:
2267 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2263 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2268 case CSSPropertyWebkitTextEmphasisColor: 2264 case CSSPropertyWebkitTextEmphasisColor:
2269 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2265 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
2270 case CSSPropertyWebkitTextEmphasisPosition: 2266 case CSSPropertyWebkitTextEmphasisPosition:
2271 return cssValuePool().createValue(style->textEmphasisPosition()); 2267 return cssValuePool().createValue(style->textEmphasisPosition());
2272 case CSSPropertyWebkitTextEmphasisStyle: 2268 case CSSPropertyWebkitTextEmphasisStyle:
2273 switch (style->textEmphasisMark()) { 2269 switch (style->textEmphasisMark()) {
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
3230 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3226 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3231 CSSPropertyB ackgroundClip }; 3227 CSSPropertyB ackgroundClip };
3232 3228
3233 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3229 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3234 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3230 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3235 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3231 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3236 return list.release(); 3232 return list.release();
3237 } 3233 }
3238 3234
3239 } // namespace WebCore 3235 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698