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

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: Cleaned up code changes in EditingStyle 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 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after
2163 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2163 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2164 case CSSPropertyWebkitRubyPosition: 2164 case CSSPropertyWebkitRubyPosition:
2165 return cssValuePool().createValue(style->rubyPosition()); 2165 return cssValuePool().createValue(style->rubyPosition());
2166 case CSSPropertyTableLayout: 2166 case CSSPropertyTableLayout:
2167 return cssValuePool().createValue(style->tableLayout()); 2167 return cssValuePool().createValue(style->tableLayout());
2168 case CSSPropertyTextAlign: 2168 case CSSPropertyTextAlign:
2169 return cssValuePool().createValue(style->textAlign()); 2169 return cssValuePool().createValue(style->textAlign());
2170 case CSSPropertyTextAlignLast: 2170 case CSSPropertyTextAlignLast:
2171 return cssValuePool().createValue(style->textAlignLast()); 2171 return cssValuePool().createValue(style->textAlignLast());
2172 case CSSPropertyTextDecoration: 2172 case CSSPropertyTextDecoration:
2173 return getCSSPropertyValuesForShorthandProperties(textDecorationShor thand());
2173 case CSSPropertyTextDecorationLine: 2174 case CSSPropertyTextDecorationLine:
2174 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2175 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2175 case CSSPropertyTextDecorationStyle: 2176 case CSSPropertyTextDecorationStyle:
2176 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2177 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2177 case CSSPropertyTextDecorationColor: 2178 case CSSPropertyTextDecorationColor:
2178 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2179 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2179 #if ENABLE(CSS3_TEXT) 2180 #if ENABLE(CSS3_TEXT)
2180 case CSSPropertyWebkitTextUnderlinePosition: 2181 case CSSPropertyWebkitTextUnderlinePosition:
2181 return cssValuePool().createValue(style->textUnderlinePosition()); 2182 return cssValuePool().createValue(style->textUnderlinePosition());
2182 #endif // CSS3_TEXT 2183 #endif // CSS3_TEXT
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
3068 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3069 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3069 CSSPropertyB ackgroundClip }; 3070 CSSPropertyB ackgroundClip };
3070 3071
3071 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3072 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3072 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3073 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3073 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3074 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3074 return list.release(); 3075 return list.release();
3075 } 3076 }
3076 3077
3077 } // namespace WebCore 3078 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698