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

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

Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 CSSPropertyPageBreakBefore, 163 CSSPropertyPageBreakBefore,
164 CSSPropertyPageBreakInside, 164 CSSPropertyPageBreakInside,
165 CSSPropertyPointerEvents, 165 CSSPropertyPointerEvents,
166 CSSPropertyPosition, 166 CSSPropertyPosition,
167 CSSPropertyResize, 167 CSSPropertyResize,
168 CSSPropertyRight, 168 CSSPropertyRight,
169 CSSPropertySpeak, 169 CSSPropertySpeak,
170 CSSPropertyTableLayout, 170 CSSPropertyTableLayout,
171 CSSPropertyTabSize, 171 CSSPropertyTabSize,
172 CSSPropertyTextAlign, 172 CSSPropertyTextAlign,
173 CSSPropertyTextAlignLast,
173 CSSPropertyTextDecoration, 174 CSSPropertyTextDecoration,
174 CSSPropertyTextDecorationLine, 175 CSSPropertyTextDecorationLine,
175 CSSPropertyTextDecorationStyle, 176 CSSPropertyTextDecorationStyle,
176 CSSPropertyTextDecorationColor, 177 CSSPropertyTextDecorationColor,
177 #if ENABLE(CSS3_TEXT) 178 #if ENABLE(CSS3_TEXT)
178 CSSPropertyWebkitTextAlignLast,
179 CSSPropertyWebkitTextUnderlinePosition, 179 CSSPropertyWebkitTextUnderlinePosition,
180 #endif // CSS3_TEXT 180 #endif // CSS3_TEXT
181 CSSPropertyTextIndent, 181 CSSPropertyTextIndent,
182 CSSPropertyTextRendering, 182 CSSPropertyTextRendering,
183 CSSPropertyTextShadow, 183 CSSPropertyTextShadow,
184 CSSPropertyTextOverflow, 184 CSSPropertyTextOverflow,
185 CSSPropertyTextTransform, 185 CSSPropertyTextTransform,
186 CSSPropertyTop, 186 CSSPropertyTop,
187 CSSPropertyTouchAction, 187 CSSPropertyTouchAction,
188 CSSPropertyTransitionDelay, 188 CSSPropertyTransitionDelay,
(...skipping 1964 matching lines...) Expand 10 before | Expand all | Expand 10 after
2153 case CSSPropertyPosition: 2153 case CSSPropertyPosition:
2154 return cssValuePool().createValue(style->position()); 2154 return cssValuePool().createValue(style->position());
2155 case CSSPropertyRight: 2155 case CSSPropertyRight:
2156 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView()); 2156 return getPositionOffsetValue(style.get(), CSSPropertyRight, rendere r, m_node->document()->renderView());
2157 case CSSPropertyWebkitRubyPosition: 2157 case CSSPropertyWebkitRubyPosition:
2158 return cssValuePool().createValue(style->rubyPosition()); 2158 return cssValuePool().createValue(style->rubyPosition());
2159 case CSSPropertyTableLayout: 2159 case CSSPropertyTableLayout:
2160 return cssValuePool().createValue(style->tableLayout()); 2160 return cssValuePool().createValue(style->tableLayout());
2161 case CSSPropertyTextAlign: 2161 case CSSPropertyTextAlign:
2162 return cssValuePool().createValue(style->textAlign()); 2162 return cssValuePool().createValue(style->textAlign());
2163 case CSSPropertyTextAlignLast:
2164 return cssValuePool().createValue(style->textAlignLast());
2163 case CSSPropertyTextDecoration: 2165 case CSSPropertyTextDecoration:
2164 case CSSPropertyTextDecorationLine: 2166 case CSSPropertyTextDecorationLine:
2165 return renderTextDecorationFlagsToCSSValue(style->textDecoration()); 2167 return renderTextDecorationFlagsToCSSValue(style->textDecoration());
2166 case CSSPropertyTextDecorationStyle: 2168 case CSSPropertyTextDecorationStyle:
2167 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle()); 2169 return renderTextDecorationStyleFlagsToCSSValue(style->textDecoratio nStyle());
2168 case CSSPropertyTextDecorationColor: 2170 case CSSPropertyTextDecorationColor:
2169 return currentColorOrValidColor(style.get(), style->textDecorationCo lor()); 2171 return currentColorOrValidColor(style.get(), style->textDecorationCo lor());
2170 #if ENABLE(CSS3_TEXT) 2172 #if ENABLE(CSS3_TEXT)
2171 case CSSPropertyWebkitTextAlignLast:
2172 return cssValuePool().createValue(style->textAlignLast());
2173 case CSSPropertyWebkitTextUnderlinePosition: 2173 case CSSPropertyWebkitTextUnderlinePosition:
2174 return cssValuePool().createValue(style->textUnderlinePosition()); 2174 return cssValuePool().createValue(style->textUnderlinePosition());
2175 #endif // CSS3_TEXT 2175 #endif // CSS3_TEXT
2176 case CSSPropertyWebkitTextDecorationsInEffect: 2176 case CSSPropertyWebkitTextDecorationsInEffect:
2177 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect()); 2177 return renderTextDecorationFlagsToCSSValue(style->textDecorationsInE ffect());
2178 case CSSPropertyWebkitTextFillColor: 2178 case CSSPropertyWebkitTextFillColor:
2179 return currentColorOrValidColor(style.get(), style->textFillColor()) ; 2179 return currentColorOrValidColor(style.get(), style->textFillColor()) ;
2180 case CSSPropertyWebkitTextEmphasisColor: 2180 case CSSPropertyWebkitTextEmphasisColor:
2181 return currentColorOrValidColor(style.get(), style->textEmphasisColo r()); 2181 return currentColorOrValidColor(style.get(), style->textEmphasisColo r());
2182 case CSSPropertyWebkitTextEmphasisPosition: 2182 case CSSPropertyWebkitTextEmphasisPosition:
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
3017 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3017 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3018 CSSPropertyB ackgroundClip }; 3018 CSSPropertyB ackgroundClip };
3019 3019
3020 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3020 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3021 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3021 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3022 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3022 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3023 return list.release(); 3023 return list.release();
3024 } 3024 }
3025 3025
3026 } // namespace WebCore 3026 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698