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

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

Issue 282303007: Don't pretend that text-decoration is a shorthand in computed style. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Same as Patch Set 3, with --no-find-copies Created 6 years, 7 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
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 2180 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 return cssValuePool().createValue(style->rubyPosition()); 2191 return cssValuePool().createValue(style->rubyPosition());
2192 case CSSPropertyScrollBehavior: 2192 case CSSPropertyScrollBehavior:
2193 return cssValuePool().createValue(style->scrollBehavior()); 2193 return cssValuePool().createValue(style->scrollBehavior());
2194 case CSSPropertyTableLayout: 2194 case CSSPropertyTableLayout:
2195 return cssValuePool().createValue(style->tableLayout()); 2195 return cssValuePool().createValue(style->tableLayout());
2196 case CSSPropertyTextAlign: 2196 case CSSPropertyTextAlign:
2197 return cssValuePool().createValue(style->textAlign()); 2197 return cssValuePool().createValue(style->textAlign());
2198 case CSSPropertyTextAlignLast: 2198 case CSSPropertyTextAlignLast:
2199 return cssValuePool().createValue(style->textAlignLast()); 2199 return cssValuePool().createValue(style->textAlignLast());
2200 case CSSPropertyTextDecoration: 2200 case CSSPropertyTextDecoration:
2201 return valuesForShorthandProperty(textDecorationShorthand()); 2201 if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
2202 return valuesForShorthandProperty(textDecorationShorthand());
2203 // Fall through.
2202 case CSSPropertyTextDecorationLine: 2204 case CSSPropertyTextDecorationLine:
2203 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2205 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2204 case CSSPropertyTextDecorationStyle: 2206 case CSSPropertyTextDecorationStyle:
2205 return valueForTextDecorationStyle(style->textDecorationStyle()); 2207 return valueForTextDecorationStyle(style->textDecorationStyle());
2206 case CSSPropertyTextDecorationColor: 2208 case CSSPropertyTextDecorationColor:
2207 return currentColorOrValidColor(*style, style->textDecorationColor() ); 2209 return currentColorOrValidColor(*style, style->textDecorationColor() );
2208 case CSSPropertyTextJustify: 2210 case CSSPropertyTextJustify:
2209 return cssValuePool().createValue(style->textJustify()); 2211 return cssValuePool().createValue(style->textJustify());
2210 case CSSPropertyTextUnderlinePosition: 2212 case CSSPropertyTextUnderlinePosition:
2211 return cssValuePool().createValue(style->textUnderlinePosition()); 2213 return cssValuePool().createValue(style->textUnderlinePosition());
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
3055 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3057 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3056 CSSPropertyB ackgroundClip }; 3058 CSSPropertyB ackgroundClip };
3057 3059
3058 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3060 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3059 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3061 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3060 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3062 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3061 return list.release(); 3063 return list.release();
3062 } 3064 }
3063 3065
3064 } // namespace WebCore 3066 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698