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

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

Issue 980233002: [svg2] Make 'cx', 'cy' and 'r' presentation attributes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 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
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 8109 matching lines...) Expand 10 before | Expand all | Expand 10 after
8120 if (id == CSSValueNone) 8120 if (id == CSSValueNone)
8121 validPrimitive = true; 8121 validPrimitive = true;
8122 else 8122 else
8123 parsedValue = parseSVGStrokeDasharray(); 8123 parsedValue = parseSVGStrokeDasharray();
8124 break; 8124 break;
8125 8125
8126 case CSSPropertyMaskType: // luminance | alpha | inherit 8126 case CSSPropertyMaskType: // luminance | alpha | inherit
8127 if (id == CSSValueLuminance || id == CSSValueAlpha) 8127 if (id == CSSValueLuminance || id == CSSValueAlpha)
8128 validPrimitive = true; 8128 validPrimitive = true;
8129 break; 8129 break;
8130 case CSSPropertyCx:
8131 case CSSPropertyCy:
8130 case CSSPropertyX: 8132 case CSSPropertyX:
8131 case CSSPropertyY: 8133 case CSSPropertyY:
8134 case CSSPropertyR:
8132 case CSSPropertyRx: 8135 case CSSPropertyRx:
8133 case CSSPropertyRy: 8136 case CSSPropertyRy:
8134 validPrimitive = (!id && validUnit(value, FLength | FPercent, SVGAttribu teMode)); 8137 validPrimitive = (!id && validUnit(value, FLength | FPercent, SVGAttribu teMode));
8135 break; 8138 break;
8136 8139
8137 /* shorthand properties */ 8140 /* shorthand properties */
8138 case CSSPropertyMarker: { 8141 case CSSPropertyMarker: {
8139 ShorthandScope scope(this, propId); 8142 ShorthandScope scope(this, propId);
8140 CSSPropertyParser::ImplicitScope implicitScope(this); 8143 CSSPropertyParser::ImplicitScope implicitScope(this);
8141 if (!parseValue(CSSPropertyMarkerStart, important)) 8144 if (!parseValue(CSSPropertyMarkerStart, important))
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
8495 } 8498 }
8496 } 8499 }
8497 8500
8498 if (!list->length()) 8501 if (!list->length())
8499 return nullptr; 8502 return nullptr;
8500 8503
8501 return list.release(); 8504 return list.release();
8502 } 8505 }
8503 8506
8504 } // namespace blink 8507 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698