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

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: 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 2196 matching lines...) Expand 10 before | Expand all | Expand 10 after
2207 case TextEmphasisMarkTriangle: 2207 case TextEmphasisMarkTriangle:
2208 case TextEmphasisMarkSesame: { 2208 case TextEmphasisMarkSesame: {
2209 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 2209 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
2210 list->append(cssValuePool().createValue(style->textEmphasisFill( ))); 2210 list->append(cssValuePool().createValue(style->textEmphasisFill( )));
2211 list->append(cssValuePool().createValue(style->textEmphasisMark( ))); 2211 list->append(cssValuePool().createValue(style->textEmphasisMark( )));
2212 return list.release(); 2212 return list.release();
2213 } 2213 }
2214 } 2214 }
2215 case CSSPropertyTextIndent: { 2215 case CSSPropertyTextIndent: {
2216 RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style- >textIndent(), style.get()); 2216 RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style- >textIndent(), style.get());
2217 #if ENABLE(CSS3_TEXT) 2217 if (RuntimeEnabledFeatures::css3TextEnabled() && style->textIndentLi ne() == TextIndentEachLine) {
2218 if (style->textIndentLine() == TextIndentEachLine) {
2219 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 2218 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
2220 list->append(textIndent.release()); 2219 list->append(textIndent.release());
2221 list->append(cssValuePool().createIdentifierValue(CSSValueWebkit EachLine)); 2220 list->append(cssValuePool().createIdentifierValue(CSSValueEachLi ne));
2222 return list.release(); 2221 return list.release();
2223 } 2222 }
2224 #endif
2225 return textIndent.release(); 2223 return textIndent.release();
2226 } 2224 }
2227 case CSSPropertyTextShadow: 2225 case CSSPropertyTextShadow:
2228 return valueForShadow(renderer, style->textShadow(), propertyID, sty le.get()); 2226 return valueForShadow(renderer, style->textShadow(), propertyID, sty le.get());
2229 case CSSPropertyTextRendering: 2227 case CSSPropertyTextRendering:
2230 return cssValuePool().createValue(style->fontDescription().textRende ringMode()); 2228 return cssValuePool().createValue(style->fontDescription().textRende ringMode());
2231 case CSSPropertyTextOverflow: 2229 case CSSPropertyTextOverflow:
2232 if (style->textOverflow()) 2230 if (style->textOverflow())
2233 return cssValuePool().createIdentifierValue(CSSValueEllipsis); 2231 return cssValuePool().createIdentifierValue(CSSValueEllipsis);
2234 return cssValuePool().createIdentifierValue(CSSValueClip); 2232 return cssValuePool().createIdentifierValue(CSSValueClip);
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
3072 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3070 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3073 CSSPropertyB ackgroundClip }; 3071 CSSPropertyB ackgroundClip };
3074 3072
3075 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3073 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3076 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3074 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3077 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3075 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3078 return list.release(); 3076 return list.release();
3079 } 3077 }
3080 3078
3081 } // namespace WebCore 3079 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698