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

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

Issue 226373002: [CSS Shapes] shape-margin in percentage units always computes to 0px (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove webkit prefixes Created 6 years, 8 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) 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 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { 1512 } else if (value->unit == CSSPrimitiveValue::CSS_URI) {
1513 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV alue::CSS_URI); 1513 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV alue::CSS_URI);
1514 addProperty(propId, parsedValue.release(), important); 1514 addProperty(propId, parsedValue.release(), important);
1515 return true; 1515 return true;
1516 } 1516 }
1517 break; 1517 break;
1518 case CSSPropertyShapeOutside: 1518 case CSSPropertyShapeOutside:
1519 parsedValue = parseShapeProperty(propId); 1519 parsedValue = parseShapeProperty(propId);
1520 break; 1520 break;
1521 case CSSPropertyShapeMargin: 1521 case CSSPropertyShapeMargin:
1522 validPrimitive = (RuntimeEnabledFeatures::cssShapesEnabled() && !id && v alidUnit(value, FLength | FNonNeg)); 1522 validPrimitive = (RuntimeEnabledFeatures::cssShapesEnabled() && !id && v alidUnit(value, FLength | FPercent | FNonNeg));
1523 break; 1523 break;
1524 case CSSPropertyShapeImageThreshold: 1524 case CSSPropertyShapeImageThreshold:
1525 validPrimitive = (RuntimeEnabledFeatures::cssShapesEnabled() && !id && v alidUnit(value, FNumber)); 1525 validPrimitive = (RuntimeEnabledFeatures::cssShapesEnabled() && !id && v alidUnit(value, FNumber));
1526 break; 1526 break;
1527 1527
1528 case CSSPropertyTouchAction: 1528 case CSSPropertyTouchAction:
1529 // auto | none | [pan-x || pan-y] | manipulation 1529 // auto | none | [pan-x || pan-y] | manipulation
1530 return parseTouchAction(important); 1530 return parseTouchAction(important);
1531 1531
1532 case CSSPropertyAlignSelf: 1532 case CSSPropertyAlignSelf:
(...skipping 6990 matching lines...) Expand 10 before | Expand all | Expand 10 after
8523 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8523 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8524 if (!seenStroke) 8524 if (!seenStroke)
8525 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8525 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8526 if (!seenMarkers) 8526 if (!seenMarkers)
8527 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8527 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8528 8528
8529 return parsedValues.release(); 8529 return parsedValues.release();
8530 } 8530 }
8531 8531
8532 } // namespace WebCore 8532 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698