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

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: Created 7 years, 5 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 CSSPropertyRight, 169 CSSPropertyRight,
170 CSSPropertySpeak, 170 CSSPropertySpeak,
171 CSSPropertyTableLayout, 171 CSSPropertyTableLayout,
172 CSSPropertyTabSize, 172 CSSPropertyTabSize,
173 CSSPropertyTextAlign, 173 CSSPropertyTextAlign,
174 CSSPropertyTextAlignLast, 174 CSSPropertyTextAlignLast,
175 CSSPropertyTextDecoration, 175 CSSPropertyTextDecoration,
176 CSSPropertyTextDecorationLine, 176 CSSPropertyTextDecorationLine,
177 CSSPropertyTextDecorationStyle, 177 CSSPropertyTextDecorationStyle,
178 CSSPropertyTextDecorationColor, 178 CSSPropertyTextDecorationColor,
179 CSSPropertyTextJustify,
179 #if ENABLE(CSS3_TEXT) 180 #if ENABLE(CSS3_TEXT)
180 CSSPropertyWebkitTextUnderlinePosition, 181 CSSPropertyWebkitTextUnderlinePosition,
181 #endif // CSS3_TEXT 182 #endif // CSS3_TEXT
182 CSSPropertyTextIndent, 183 CSSPropertyTextIndent,
183 CSSPropertyTextRendering, 184 CSSPropertyTextRendering,
184 CSSPropertyTextShadow, 185 CSSPropertyTextShadow,
185 CSSPropertyTextOverflow, 186 CSSPropertyTextOverflow,
186 CSSPropertyTextTransform, 187 CSSPropertyTextTransform,
187 CSSPropertyTop, 188 CSSPropertyTop,
188 CSSPropertyTouchAction, 189 CSSPropertyTouchAction,
(...skipping 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after
2163 return cssValuePool().createValue(style->textAlign()); 2164 return cssValuePool().createValue(style->textAlign());
2164 case CSSPropertyTextAlignLast: 2165 case CSSPropertyTextAlignLast:
2165 return cssValuePool().createValue(style->textAlignLast()); 2166 return cssValuePool().createValue(style->textAlignLast());
2166 case CSSPropertyTextDecoration: 2167 case CSSPropertyTextDecoration:
2167 case CSSPropertyTextDecorationLine: 2168 case CSSPropertyTextDecorationLine:
2168 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2169 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2169 case CSSPropertyTextDecorationStyle: 2170 case CSSPropertyTextDecorationStyle:
2170 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2171 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2171 case CSSPropertyTextDecorationColor: 2172 case CSSPropertyTextDecorationColor:
2172 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2173 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2174 case CSSPropertyTextJustify:
2175 return cssValuePool().createValue(style->textJustify());
2173 #if ENABLE(CSS3_TEXT) 2176 #if ENABLE(CSS3_TEXT)
2174 case CSSPropertyWebkitTextUnderlinePosition: 2177 case CSSPropertyWebkitTextUnderlinePosition:
2175 return cssValuePool().createValue(style->textUnderlinePosition()); 2178 return cssValuePool().createValue(style->textUnderlinePosition());
2176 #endif // CSS3_TEXT 2179 #endif // CSS3_TEXT
2177 case CSSPropertyWebkitTextDecorationsInEffect: 2180 case CSSPropertyWebkitTextDecorationsInEffect:
2178 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2181 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2179 case CSSPropertyWebkitTextFillColor: 2182 case CSSPropertyWebkitTextFillColor:
2180 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2183 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2181 case CSSPropertyWebkitTextEmphasisColor: 2184 case CSSPropertyWebkitTextEmphasisColor:
2182 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2185 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
3018 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3021 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3019 CSSPropertyB ackgroundClip }; 3022 CSSPropertyB ackgroundClip };
3020 3023
3021 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3024 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3022 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3025 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3023 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3026 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3024 return list.release(); 3027 return list.release();
3025 } 3028 }
3026 3029
3027 } // namespace WebCore 3030 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698