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

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

Issue 22414006: Revert "Revert "[css3-text] Implement text-decoration property shorthand"" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added missing skipped test to TestExpectations 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 2155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2166 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2166 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2167 case CSSPropertyWebkitRubyPosition: 2167 case CSSPropertyWebkitRubyPosition:
2168 return cssValuePool().createValue(style->rubyPosition()); 2168 return cssValuePool().createValue(style->rubyPosition());
2169 case CSSPropertyTableLayout: 2169 case CSSPropertyTableLayout:
2170 return cssValuePool().createValue(style->tableLayout()); 2170 return cssValuePool().createValue(style->tableLayout());
2171 case CSSPropertyTextAlign: 2171 case CSSPropertyTextAlign:
2172 return cssValuePool().createValue(style->textAlign()); 2172 return cssValuePool().createValue(style->textAlign());
2173 case CSSPropertyTextAlignLast: 2173 case CSSPropertyTextAlignLast:
2174 return cssValuePool().createValue(style->textAlignLast()); 2174 return cssValuePool().createValue(style->textAlignLast());
2175 case CSSPropertyTextDecoration: 2175 case CSSPropertyTextDecoration:
2176 return getCSSPropertyValuesForShorthandProperties(textDecorationShor thand());
2176 case CSSPropertyTextDecorationLine: 2177 case CSSPropertyTextDecorationLine:
2177 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2178 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2178 case CSSPropertyTextDecorationStyle: 2179 case CSSPropertyTextDecorationStyle:
2179 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2180 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2180 case CSSPropertyTextDecorationColor: 2181 case CSSPropertyTextDecorationColor:
2181 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2182 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2182 #if ENABLE(CSS3_TEXT) 2183 #if ENABLE(CSS3_TEXT)
2183 case CSSPropertyWebkitTextUnderlinePosition: 2184 case CSSPropertyWebkitTextUnderlinePosition:
2184 return cssValuePool().createValue(style->textUnderlinePosition()); 2185 return cssValuePool().createValue(style->textUnderlinePosition());
2185 #endif // CSS3_TEXT 2186 #endif // CSS3_TEXT
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
3071 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3072 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3072 CSSPropertyB ackgroundClip }; 3073 CSSPropertyB ackgroundClip };
3073 3074
3074 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3075 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3075 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3076 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3076 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3077 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3077 return list.release(); 3078 return list.release();
3078 } 3079 }
3079 3080
3080 } // namespace WebCore 3081 } // 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