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

Side by Side Diff: sky/engine/core/css/parser/CSSPropertyParser.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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) 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 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 if (id == CSSValueNone) { 1314 if (id == CSSValueNone) {
1315 validPrimitive = true; 1315 validPrimitive = true;
1316 } else if (value->unit == CSSParserValue::Function) { 1316 } else if (value->unit == CSSParserValue::Function) {
1317 parsedValue = parseBasicShape(); 1317 parsedValue = parseBasicShape();
1318 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { 1318 } else if (value->unit == CSSPrimitiveValue::CSS_URI) {
1319 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV alue::CSS_URI); 1319 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV alue::CSS_URI);
1320 addProperty(propId, parsedValue.release(), important); 1320 addProperty(propId, parsedValue.release(), important);
1321 return true; 1321 return true;
1322 } 1322 }
1323 break; 1323 break;
1324 case CSSPropertyShapeOutside:
1325 parsedValue = parseShapeProperty(propId);
1326 break;
1327 case CSSPropertyShapeMargin:
1328 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg)) ;
1329 break;
1330 case CSSPropertyShapeImageThreshold:
1331 validPrimitive = (!id && validUnit(value, FNumber));
1332 break;
1333
1334 case CSSPropertyTouchAction: 1324 case CSSPropertyTouchAction:
1335 parsedValue = parseTouchAction(); 1325 parsedValue = parseTouchAction();
1336 break; 1326 break;
1337 1327
1338 // Properties below are validated inside parseViewportProperty, because we 1328 // Properties below are validated inside parseViewportProperty, because we
1339 // check for parser state. We need to invalidate if someone adds them outsid e 1329 // check for parser state. We need to invalidate if someone adds them outsid e
1340 // a @viewport rule. 1330 // a @viewport rule.
1341 case CSSPropertyMaxZoom: 1331 case CSSPropertyMaxZoom:
1342 case CSSPropertyMinZoom: 1332 case CSSPropertyMinZoom:
1343 case CSSPropertyOrientation: 1333 case CSSPropertyOrientation:
(...skipping 4985 matching lines...) Expand 10 before | Expand all | Expand 10 after
6329 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6319 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6330 } 6320 }
6331 6321
6332 bool CSSPropertyParser::isSystemColor(int id) 6322 bool CSSPropertyParser::isSystemColor(int id)
6333 { 6323 {
6334 // FIXME(sky): remove 6324 // FIXME(sky): remove
6335 return false; 6325 return false;
6336 } 6326 }
6337 6327
6338 } // namespace blink 6328 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698