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

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

Issue 17101024: Add support for CSS3 "text-decoration" shorthand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added missing code pointed out by Alexis Created 7 years, 6 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
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2110 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 return cssValuePool().createValue(style->position()); 2121 return cssValuePool().createValue(style->position());
2122 case CSSPropertyRight: 2122 case CSSPropertyRight:
2123 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2123 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2124 case CSSPropertyWebkitRubyPosition: 2124 case CSSPropertyWebkitRubyPosition:
2125 return cssValuePool().createValue(style->rubyPosition()); 2125 return cssValuePool().createValue(style->rubyPosition());
2126 case CSSPropertyTableLayout: 2126 case CSSPropertyTableLayout:
2127 return cssValuePool().createValue(style->tableLayout()); 2127 return cssValuePool().createValue(style->tableLayout());
2128 case CSSPropertyTextAlign: 2128 case CSSPropertyTextAlign:
2129 return cssValuePool().createValue(style->textAlign()); 2129 return cssValuePool().createValue(style->textAlign());
2130 case CSSPropertyTextDecoration: 2130 case CSSPropertyTextDecoration:
2131 return getTextDecorationShorthandValue();
2131 case CSSPropertyTextDecorationLine: 2132 case CSSPropertyTextDecorationLine:
2132 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2133 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2133 case CSSPropertyTextDecorationStyle: 2134 case CSSPropertyTextDecorationStyle:
2134 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2135 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2135 case CSSPropertyTextDecorationColor: 2136 case CSSPropertyTextDecorationColor:
2136 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2137 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2137 #if ENABLE(CSS3_TEXT) 2138 #if ENABLE(CSS3_TEXT)
2138 case CSSPropertyWebkitTextAlignLast: 2139 case CSSPropertyWebkitTextAlignLast:
2139 return cssValuePool().createValue(style->textAlignLast()); 2140 return cssValuePool().createValue(style->textAlignLast());
2140 case CSSPropertyWebkitTextUnderlinePosition: 2141 case CSSPropertyWebkitTextUnderlinePosition:
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
2983 CSSProperty BackgroundPosition }; 2984 CSSProperty BackgroundPosition };
2984 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2985 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2985 CSSPropertyB ackgroundClip }; 2986 CSSPropertyB ackgroundClip };
2986 2987
2987 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2988 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2988 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 2990 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
2990 return list.release(); 2991 return list.release();
2991 } 2992 }
2992 2993
2994 PassRefPtr<CSSValueList> CSSComputedStyleDeclaration::getTextDecorationShorthand Value() const
2995 {
2996 static const CSSPropertyID properties[3] = { CSSPropertyTextDecorationLine, CSSPropertyTextDecorationStyle, CSSPropertyTextDecorationColor };
2997
2998 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
2999 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyTextDecoration, properties, WTF_ARRAY_LENGTH(properties))));
3000 return list.release();
3001 }
3002
2993 } // namespace WebCore 3003 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698