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

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

Issue 186403002: Make font-related CSS properties less custom. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 2186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpac eSeparated(); 2197 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpac eSeparated();
2198 list->append(textIndent.release()); 2198 list->append(textIndent.release());
2199 list->append(cssValuePool().createIdentifierValue(CSSValueEachLi ne)); 2199 list->append(cssValuePool().createIdentifierValue(CSSValueEachLi ne));
2200 return list.release(); 2200 return list.release();
2201 } 2201 }
2202 return textIndent.release(); 2202 return textIndent.release();
2203 } 2203 }
2204 case CSSPropertyTextShadow: 2204 case CSSPropertyTextShadow:
2205 return valueForShadowList(style->textShadow(), *style, false); 2205 return valueForShadowList(style->textShadow(), *style, false);
2206 case CSSPropertyTextRendering: 2206 case CSSPropertyTextRendering:
2207 return cssValuePool().createValue(style->fontDescription().textRende ringMode()); 2207 return cssValuePool().createValue(style->fontDescription().textRende ring());
2208 case CSSPropertyTextOverflow: 2208 case CSSPropertyTextOverflow:
2209 if (style->textOverflow()) 2209 if (style->textOverflow())
2210 return cssValuePool().createIdentifierValue(CSSValueEllipsis); 2210 return cssValuePool().createIdentifierValue(CSSValueEllipsis);
2211 return cssValuePool().createIdentifierValue(CSSValueClip); 2211 return cssValuePool().createIdentifierValue(CSSValueClip);
2212 case CSSPropertyWebkitTextSecurity: 2212 case CSSPropertyWebkitTextSecurity:
2213 return cssValuePool().createValue(style->textSecurity()); 2213 return cssValuePool().createValue(style->textSecurity());
2214 case CSSPropertyWebkitTextStrokeColor: 2214 case CSSPropertyWebkitTextStrokeColor:
2215 return currentColorOrValidColor(*style, style->textStrokeColor()); 2215 return currentColorOrValidColor(*style, style->textStrokeColor());
2216 case CSSPropertyWebkitTextStrokeWidth: 2216 case CSSPropertyWebkitTextStrokeWidth:
2217 return zoomAdjustedPixelValue(style->textStrokeWidth(), *style); 2217 return zoomAdjustedPixelValue(style->textStrokeWidth(), *style);
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
3034 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3034 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3035 CSSPropertyB ackgroundClip }; 3035 CSSPropertyB ackgroundClip };
3036 3036
3037 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3037 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3038 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3038 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3040 return list.release(); 3040 return list.release();
3041 } 3041 }
3042 3042
3043 } // namespace WebCore 3043 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698