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

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

Issue 20262002: [css3-text] Implement text-decoration property shorthand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: OK, so trybots are not fond of binary files - removing Mac expectation for repaint-text-decoration-… 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 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after
2173 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2173 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2174 case CSSPropertyWebkitRubyPosition: 2174 case CSSPropertyWebkitRubyPosition:
2175 return cssValuePool().createValue(style->rubyPosition()); 2175 return cssValuePool().createValue(style->rubyPosition());
2176 case CSSPropertyTableLayout: 2176 case CSSPropertyTableLayout:
2177 return cssValuePool().createValue(style->tableLayout()); 2177 return cssValuePool().createValue(style->tableLayout());
2178 case CSSPropertyTextAlign: 2178 case CSSPropertyTextAlign:
2179 return cssValuePool().createValue(style->textAlign()); 2179 return cssValuePool().createValue(style->textAlign());
2180 case CSSPropertyTextAlignLast: 2180 case CSSPropertyTextAlignLast:
2181 return cssValuePool().createValue(style->textAlignLast()); 2181 return cssValuePool().createValue(style->textAlignLast());
2182 case CSSPropertyTextDecoration: 2182 case CSSPropertyTextDecoration:
2183 return getTextDecorationShorthandValue();
2183 case CSSPropertyTextDecorationLine: 2184 case CSSPropertyTextDecorationLine:
2184 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2185 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2185 case CSSPropertyTextDecorationStyle: 2186 case CSSPropertyTextDecorationStyle:
2186 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2187 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2187 case CSSPropertyTextDecorationColor: 2188 case CSSPropertyTextDecorationColor:
2188 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2189 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2189 #if ENABLE(CSS3_TEXT) 2190 #if ENABLE(CSS3_TEXT)
2190 case CSSPropertyWebkitTextUnderlinePosition: 2191 case CSSPropertyWebkitTextUnderlinePosition:
2191 return cssValuePool().createValue(style->textUnderlinePosition()); 2192 return cssValuePool().createValue(style->textUnderlinePosition());
2192 #endif // CSS3_TEXT 2193 #endif // CSS3_TEXT
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
3078 CSSProperty BackgroundPosition }; 3079 CSSProperty BackgroundPosition };
3079 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3080 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3080 CSSPropertyB ackgroundClip }; 3081 CSSPropertyB ackgroundClip };
3081 3082
3082 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3083 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3083 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3084 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3084 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3085 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3085 return list.release(); 3086 return list.release();
3086 } 3087 }
3087 3088
3089 PassRefPtr<CSSValueList> CSSComputedStyleDeclaration::getTextDecorationShorthand Value() const
3090 {
3091 static const CSSPropertyID properties[3] = { CSSPropertyTextDecorationLine, CSSPropertyTextDecorationStyle, CSSPropertyTextDecorationColor };
3092
3093 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
3094 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyTextDecoration, properties, WTF_ARRAY_LENGTH(properties))));
3095 return list.release();
3096 }
3097
3088 } // namespace WebCore 3098 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698