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

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

Issue 15748002: Initial support for experimental touch-action CSS feature (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unnecessary CSSParserContext change Created 7 years, 7 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
« no previous file with comments | « Source/WebKit/chromium/src/WebRuntimeFeatures.cpp ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 CSSPropertyWebkitTextDecorationColor, 177 CSSPropertyWebkitTextDecorationColor,
178 CSSPropertyWebkitTextAlignLast, 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 CSSPropertyTransitionDelay, 188 CSSPropertyTransitionDelay,
188 CSSPropertyTransitionDuration, 189 CSSPropertyTransitionDuration,
189 CSSPropertyTransitionProperty, 190 CSSPropertyTransitionProperty,
190 CSSPropertyTransitionTimingFunction, 191 CSSPropertyTransitionTimingFunction,
191 CSSPropertyUnicodeBidi, 192 CSSPropertyUnicodeBidi,
192 CSSPropertyVerticalAlign, 193 CSSPropertyVerticalAlign,
193 CSSPropertyVisibility, 194 CSSPropertyVisibility,
194 CSSPropertyWhiteSpace, 195 CSSPropertyWhiteSpace,
195 CSSPropertyWidows, 196 CSSPropertyWidows,
196 CSSPropertyWidth, 197 CSSPropertyWidth,
(...skipping 1998 matching lines...) Expand 10 before | Expand all | Expand 10 after
2195 case CSSPropertyWebkitTextSecurity: 2196 case CSSPropertyWebkitTextSecurity:
2196 return cssValuePool().createValue(style->textSecurity()); 2197 return cssValuePool().createValue(style->textSecurity());
2197 case CSSPropertyWebkitTextStrokeColor: 2198 case CSSPropertyWebkitTextStrokeColor:
2198 return currentColorOrValidColor(style.get(), style->textStrokeColor( )); 2199 return currentColorOrValidColor(style.get(), style->textStrokeColor( ));
2199 case CSSPropertyWebkitTextStrokeWidth: 2200 case CSSPropertyWebkitTextStrokeWidth:
2200 return zoomAdjustedPixelValue(style->textStrokeWidth(), style.get()) ; 2201 return zoomAdjustedPixelValue(style->textStrokeWidth(), style.get()) ;
2201 case CSSPropertyTextTransform: 2202 case CSSPropertyTextTransform:
2202 return cssValuePool().createValue(style->textTransform()); 2203 return cssValuePool().createValue(style->textTransform());
2203 case CSSPropertyTop: 2204 case CSSPropertyTop:
2204 return getPositionOffsetValue(style.get(), CSSPropertyTop, renderer, m_node->document()->renderView()); 2205 return getPositionOffsetValue(style.get(), CSSPropertyTop, renderer, m_node->document()->renderView());
2206 case CSSPropertyTouchAction:
2207 return cssValuePool().createValue(style->touchAction());
2205 case CSSPropertyUnicodeBidi: 2208 case CSSPropertyUnicodeBidi:
2206 return cssValuePool().createValue(style->unicodeBidi()); 2209 return cssValuePool().createValue(style->unicodeBidi());
2207 case CSSPropertyVerticalAlign: 2210 case CSSPropertyVerticalAlign:
2208 switch (style->verticalAlign()) { 2211 switch (style->verticalAlign()) {
2209 case BASELINE: 2212 case BASELINE:
2210 return cssValuePool().createIdentifierValue(CSSValueBaseline ); 2213 return cssValuePool().createIdentifierValue(CSSValueBaseline );
2211 case MIDDLE: 2214 case MIDDLE:
2212 return cssValuePool().createIdentifierValue(CSSValueMiddle); 2215 return cssValuePool().createIdentifierValue(CSSValueMiddle);
2213 case SUB: 2216 case SUB:
2214 return cssValuePool().createIdentifierValue(CSSValueSub); 2217 return cssValuePool().createIdentifierValue(CSSValueSub);
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
2986 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2989 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2987 CSSPropertyB ackgroundClip }; 2990 CSSPropertyB ackgroundClip };
2988 2991
2989 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2992 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2990 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2993 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2991 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2994 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2992 return list.release(); 2995 return list.release();
2993 } 2996 }
2994 2997
2995 } // namespace WebCore 2998 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebRuntimeFeatures.cpp ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698