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

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

Issue 22336008: Use the runtime flag and remove '-webkit-' prefix for CSS3 text-indent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch 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
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 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2235 case TextEmphasisMarkTriangle: 2235 case TextEmphasisMarkTriangle:
2236 case TextEmphasisMarkSesame: { 2236 case TextEmphasisMarkSesame: {
2237 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 2237 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
2238 list->append(cssValuePool().createValue(style->textEmphasisFill( ))); 2238 list->append(cssValuePool().createValue(style->textEmphasisFill( )));
2239 list->append(cssValuePool().createValue(style->textEmphasisMark( ))); 2239 list->append(cssValuePool().createValue(style->textEmphasisMark( )));
2240 return list.release(); 2240 return list.release();
2241 } 2241 }
2242 } 2242 }
2243 case CSSPropertyTextIndent: { 2243 case CSSPropertyTextIndent: {
2244 RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style- >textIndent(), style.get()); 2244 RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style- >textIndent(), style.get());
2245 #if ENABLE(CSS3_TEXT) 2245 if (RuntimeEnabledFeatures::css3TextEnabled() && style->textIndentLi ne() == TextIndentEachLine) {
2246 if (style->textIndentLine() == TextIndentEachLine) {
2247 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 2246 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
2248 list->append(textIndent.release()); 2247 list->append(textIndent.release());
2249 list->append(cssValuePool().createIdentifierValue(CSSValueWebkit EachLine)); 2248 list->append(cssValuePool().createIdentifierValue(CSSValueEachLi ne));
2250 return list.release(); 2249 return list.release();
2251 } 2250 }
2252 #endif
2253 return textIndent.release(); 2251 return textIndent.release();
2254 } 2252 }
2255 case CSSPropertyTextShadow: 2253 case CSSPropertyTextShadow:
2256 return valueForShadow(renderer, style->textShadow(), propertyID, sty le.get()); 2254 return valueForShadow(renderer, style->textShadow(), propertyID, sty le.get());
2257 case CSSPropertyTextRendering: 2255 case CSSPropertyTextRendering:
2258 return cssValuePool().createValue(style->fontDescription().textRende ringMode()); 2256 return cssValuePool().createValue(style->fontDescription().textRende ringMode());
2259 case CSSPropertyTextOverflow: 2257 case CSSPropertyTextOverflow:
2260 if (style->textOverflow()) 2258 if (style->textOverflow())
2261 return cssValuePool().createIdentifierValue(CSSValueEllipsis); 2259 return cssValuePool().createIdentifierValue(CSSValueEllipsis);
2262 return cssValuePool().createIdentifierValue(CSSValueClip); 2260 return cssValuePool().createIdentifierValue(CSSValueClip);
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
3151 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3149 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3152 CSSPropertyB ackgroundClip }; 3150 CSSPropertyB ackgroundClip };
3153 3151
3154 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3152 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3155 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3153 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3156 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3154 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3157 return list.release(); 3155 return list.release();
3158 } 3156 }
3159 3157
3160 } // namespace WebCore 3158 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698