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

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

Issue 17155007: [CSS3] Parsing the property, text-justify. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parsingTextJustify
Patch Set: Modify the test case Created 7 years, 2 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 CSSPropertyRight, 181 CSSPropertyRight,
182 CSSPropertySpeak, 182 CSSPropertySpeak,
183 CSSPropertyTableLayout, 183 CSSPropertyTableLayout,
184 CSSPropertyTabSize, 184 CSSPropertyTabSize,
185 CSSPropertyTextAlign, 185 CSSPropertyTextAlign,
186 CSSPropertyTextAlignLast, 186 CSSPropertyTextAlignLast,
187 CSSPropertyTextDecoration, 187 CSSPropertyTextDecoration,
188 CSSPropertyTextDecorationLine, 188 CSSPropertyTextDecorationLine,
189 CSSPropertyTextDecorationStyle, 189 CSSPropertyTextDecorationStyle,
190 CSSPropertyTextDecorationColor, 190 CSSPropertyTextDecorationColor,
191 CSSPropertyTextJustify,
191 #if ENABLE(CSS3_TEXT) 192 #if ENABLE(CSS3_TEXT)
192 CSSPropertyWebkitTextUnderlinePosition, 193 CSSPropertyWebkitTextUnderlinePosition,
193 #endif // CSS3_TEXT 194 #endif // CSS3_TEXT
194 CSSPropertyTextIndent, 195 CSSPropertyTextIndent,
195 CSSPropertyTextRendering, 196 CSSPropertyTextRendering,
196 CSSPropertyTextShadow, 197 CSSPropertyTextShadow,
197 CSSPropertyTextOverflow, 198 CSSPropertyTextOverflow,
198 CSSPropertyTextTransform, 199 CSSPropertyTextTransform,
199 CSSPropertyTop, 200 CSSPropertyTop,
200 CSSPropertyTouchAction, 201 CSSPropertyTouchAction,
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after
2260 case CSSPropertyTextAlignLast: 2261 case CSSPropertyTextAlignLast:
2261 return cssValuePool().createValue(style->textAlignLast()); 2262 return cssValuePool().createValue(style->textAlignLast());
2262 case CSSPropertyTextDecoration: 2263 case CSSPropertyTextDecoration:
2263 return valuesForShorthandProperty(textDecorationShorthand()); 2264 return valuesForShorthandProperty(textDecorationShorthand());
2264 case CSSPropertyTextDecorationLine: 2265 case CSSPropertyTextDecorationLine:
2265 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2266 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2266 case CSSPropertyTextDecorationStyle: 2267 case CSSPropertyTextDecorationStyle:
2267 return valueForTextDecorationStyle(style->textDecorationStyle()); 2268 return valueForTextDecorationStyle(style->textDecorationStyle());
2268 case CSSPropertyTextDecorationColor: 2269 case CSSPropertyTextDecorationColor:
2269 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2270 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2271 case CSSPropertyTextJustify:
2272 return cssValuePool().createValue(style->textJustify());
2270 #if ENABLE(CSS3_TEXT) 2273 #if ENABLE(CSS3_TEXT)
2271 case CSSPropertyWebkitTextUnderlinePosition: 2274 case CSSPropertyWebkitTextUnderlinePosition:
2272 return cssValuePool().createValue(style->textUnderlinePosition()); 2275 return cssValuePool().createValue(style->textUnderlinePosition());
2273 #endif // CSS3_TEXT 2276 #endif // CSS3_TEXT
2274 case CSSPropertyWebkitTextDecorationsInEffect: 2277 case CSSPropertyWebkitTextDecorationsInEffect:
2275 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2278 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2276 case CSSPropertyWebkitTextFillColor: 2279 case CSSPropertyWebkitTextFillColor:
2277 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2280 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2278 case CSSPropertyWebkitTextEmphasisColor: 2281 case CSSPropertyWebkitTextEmphasisColor:
2279 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2282 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
3238 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3241 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3239 CSSPropertyB ackgroundClip }; 3242 CSSPropertyB ackgroundClip };
3240 3243
3241 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3244 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3242 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3245 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3243 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3246 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3244 return list.release(); 3247 return list.release();
3245 } 3248 }
3246 3249
3247 } // namespace WebCore 3250 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698