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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master (fixed the DOS-style line break issue there) Created 6 years, 9 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/core/css/CSSPropertyNames.in ('k') | Source/core/css/resolver/StyleBuilderCustom.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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 break; 1273 break;
1274 case CSSPropertyWebkitColumnCount: 1274 case CSSPropertyWebkitColumnCount:
1275 parsedValue = parseColumnCount(); 1275 parsedValue = parseColumnCount();
1276 break; 1276 break;
1277 case CSSPropertyWebkitColumnGap: // normal | <length> 1277 case CSSPropertyWebkitColumnGap: // normal | <length>
1278 if (id == CSSValueNormal) 1278 if (id == CSSValueNormal)
1279 validPrimitive = true; 1279 validPrimitive = true;
1280 else 1280 else
1281 validPrimitive = validUnit(value, FLength | FNonNeg); 1281 validPrimitive = validUnit(value, FLength | FNonNeg);
1282 break; 1282 break;
1283 case CSSPropertyWebkitColumnAxis:
1284 if (id == CSSValueHorizontal || id == CSSValueVertical || id == CSSValue Auto)
1285 validPrimitive = true;
1286 break;
1287 case CSSPropertyWebkitColumnProgression:
1288 if (id == CSSValueNormal || id == CSSValueReverse)
1289 validPrimitive = true;
1290 break;
1291 case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property) 1283 case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
1292 if (id == CSSValueAll || id == CSSValueNone) 1284 if (id == CSSValueAll || id == CSSValueNone)
1293 validPrimitive = true; 1285 validPrimitive = true;
1294 else 1286 else
1295 validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValu e == 1; 1287 validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValu e == 1;
1296 break; 1288 break;
1297 case CSSPropertyWebkitColumnWidth: // auto | <length> 1289 case CSSPropertyWebkitColumnWidth: // auto | <length>
1298 parsedValue = parseColumnWidth(); 1290 parsedValue = parseColumnWidth();
1299 break; 1291 break;
1300 case CSSPropertyWillChange: 1292 case CSSPropertyWillChange:
(...skipping 6947 matching lines...) Expand 10 before | Expand all | Expand 10 after
8248 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8240 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8249 if (!seenStroke) 8241 if (!seenStroke)
8250 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8242 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8251 if (!seenMarkers) 8243 if (!seenMarkers)
8252 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8244 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8253 8245
8254 return parsedValues.release(); 8246 return parsedValues.release();
8255 } 8247 }
8256 8248
8257 } // namespace WebCore 8249 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPropertyNames.in ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698