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

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

Issue 23111004: Re-land "[css3-text] Implement text-decoration property shorthand" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased after Alexis' function name changes in CSSComputedStyleDeclaration.cpp Created 7 years, 4 months 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 2194 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 return valueForPositionOffset(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2205 return valueForPositionOffset(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2206 case CSSPropertyWebkitRubyPosition: 2206 case CSSPropertyWebkitRubyPosition:
2207 return cssValuePool().createValue(style->rubyPosition()); 2207 return cssValuePool().createValue(style->rubyPosition());
2208 case CSSPropertyTableLayout: 2208 case CSSPropertyTableLayout:
2209 return cssValuePool().createValue(style->tableLayout()); 2209 return cssValuePool().createValue(style->tableLayout());
2210 case CSSPropertyTextAlign: 2210 case CSSPropertyTextAlign:
2211 return cssValuePool().createValue(style->textAlign()); 2211 return cssValuePool().createValue(style->textAlign());
2212 case CSSPropertyTextAlignLast: 2212 case CSSPropertyTextAlignLast:
2213 return cssValuePool().createValue(style->textAlignLast()); 2213 return cssValuePool().createValue(style->textAlignLast());
2214 case CSSPropertyTextDecoration: 2214 case CSSPropertyTextDecoration:
2215 return valuesForShorthandProperty(textDecorationShorthand());
2215 case CSSPropertyTextDecorationLine: 2216 case CSSPropertyTextDecorationLine:
2216 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2217 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2217 case CSSPropertyTextDecorationStyle: 2218 case CSSPropertyTextDecorationStyle:
2218 return valueForTextDecorationStyle(style->textDecorationStyle()); 2219 return valueForTextDecorationStyle(style->textDecorationStyle());
2219 case CSSPropertyTextDecorationColor: 2220 case CSSPropertyTextDecorationColor:
2220 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2221 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2221 #if ENABLE(CSS3_TEXT) 2222 #if ENABLE(CSS3_TEXT)
2222 case CSSPropertyWebkitTextUnderlinePosition: 2223 case CSSPropertyWebkitTextUnderlinePosition:
2223 return cssValuePool().createValue(style->textUnderlinePosition()); 2224 return cssValuePool().createValue(style->textUnderlinePosition());
2224 #endif // CSS3_TEXT 2225 #endif // CSS3_TEXT
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
3161 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3162 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3162 CSSPropertyB ackgroundClip }; 3163 CSSPropertyB ackgroundClip };
3163 3164
3164 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3165 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3165 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3166 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3166 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3167 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3167 return list.release(); 3168 return list.release();
3168 } 3169 }
3169 3170
3170 } // namespace WebCore 3171 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/svg/css/getComputedStyle-basic-expected.txt ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698