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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1430013002: Parse webkit-text-stroke shorthand in CSSPropertyParser with CSSParserTokens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 validPrimitive = true; 418 validPrimitive = true;
419 } 419 }
420 break; 420 break;
421 421
422 case CSSPropertyBackgroundColor: // <color> | inherit 422 case CSSPropertyBackgroundColor: // <color> | inherit
423 case CSSPropertyBorderTopColor: // <color> | inherit 423 case CSSPropertyBorderTopColor: // <color> | inherit
424 case CSSPropertyBorderRightColor: 424 case CSSPropertyBorderRightColor:
425 case CSSPropertyBorderBottomColor: 425 case CSSPropertyBorderBottomColor:
426 case CSSPropertyBorderLeftColor: 426 case CSSPropertyBorderLeftColor:
427 case CSSPropertyWebkitColumnRuleColor: 427 case CSSPropertyWebkitColumnRuleColor:
428 case CSSPropertyWebkitTextStrokeColor:
429 parsedValue = parseColor(m_valueList->current(), acceptQuirkyColors(prop Id)); 428 parsedValue = parseColor(m_valueList->current(), acceptQuirkyColors(prop Id));
430 if (parsedValue) 429 if (parsedValue)
431 m_valueList->next(); 430 m_valueList->next();
432 break; 431 break;
433 432
434 case CSSPropertyCursor: { 433 case CSSPropertyCursor: {
435 // Grammar defined by CSS3 UI and modified by CSS4 images: 434 // Grammar defined by CSS3 UI and modified by CSS4 images:
436 // [ [<image> [<x> <y>]?,]* 435 // [ [<image> [<x> <y>]?,]*
437 // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize | 436 // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize |
438 // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize | 437 // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 } 586 }
588 break; 587 break;
589 588
590 case CSSPropertyBorderTopWidth: //// <border-width> | inherit 589 case CSSPropertyBorderTopWidth: //// <border-width> | inherit
591 case CSSPropertyBorderRightWidth: // Which is defined as 590 case CSSPropertyBorderRightWidth: // Which is defined as
592 case CSSPropertyBorderBottomWidth: // thin | medium | thick | <length> 591 case CSSPropertyBorderBottomWidth: // thin | medium | thick | <length>
593 case CSSPropertyBorderLeftWidth: 592 case CSSPropertyBorderLeftWidth:
594 if (!inShorthand() || m_currentShorthand == CSSPropertyBorderWidth) 593 if (!inShorthand() || m_currentShorthand == CSSPropertyBorderWidth)
595 unitless = FUnitlessQuirk; 594 unitless = FUnitlessQuirk;
596 // fall through 595 // fall through
597 case CSSPropertyWebkitTextStrokeWidth:
598 case CSSPropertyWebkitColumnRuleWidth: 596 case CSSPropertyWebkitColumnRuleWidth:
599 if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick) 597 if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
600 validPrimitive = true; 598 validPrimitive = true;
601 else 599 else
602 validPrimitive = validUnit(value, FLength | FNonNeg | unitless); 600 validPrimitive = validUnit(value, FLength | FNonNeg | unitless);
603 break; 601 break;
604 602
605 case CSSPropertyPaddingTop: //// <padding-width> | inherit 603 case CSSPropertyPaddingTop: //// <padding-width> | inherit
606 case CSSPropertyPaddingRight: // Which is defined as 604 case CSSPropertyPaddingRight: // Which is defined as
607 case CSSPropertyPaddingBottom: // <length> | <percentage> 605 case CSSPropertyPaddingBottom: // <length> | <percentage>
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 return parse4Values(propId, marginShorthand().properties(), important); 1005 return parse4Values(propId, marginShorthand().properties(), important);
1008 case CSSPropertyPadding: 1006 case CSSPropertyPadding:
1009 // <padding-width>{1,4} | inherit 1007 // <padding-width>{1,4} | inherit
1010 return parse4Values(propId, paddingShorthand().properties(), important); 1008 return parse4Values(propId, paddingShorthand().properties(), important);
1011 case CSSPropertyFlexFlow: 1009 case CSSPropertyFlexFlow:
1012 return parseShorthand(propId, flexFlowShorthand(), important); 1010 return parseShorthand(propId, flexFlowShorthand(), important);
1013 case CSSPropertyListStyle: 1011 case CSSPropertyListStyle:
1014 return parseShorthand(propId, listStyleShorthand(), important); 1012 return parseShorthand(propId, listStyleShorthand(), important);
1015 case CSSPropertyWebkitColumnRule: 1013 case CSSPropertyWebkitColumnRule:
1016 return parseShorthand(propId, webkitColumnRuleShorthand(), important); 1014 return parseShorthand(propId, webkitColumnRuleShorthand(), important);
1017 case CSSPropertyWebkitTextStroke:
1018 return parseShorthand(propId, webkitTextStrokeShorthand(), important);
1019 case CSSPropertyInvalid: 1015 case CSSPropertyInvalid:
1020 return false; 1016 return false;
1021 // CSS Text Layout Module Level 3: Vertical writing support 1017 // CSS Text Layout Module Level 3: Vertical writing support
1022 case CSSPropertyWebkitTextOrientation: 1018 case CSSPropertyWebkitTextOrientation:
1023 // FIXME: For now just support sideways, sideways-right, upright and ver tical-right. 1019 // FIXME: For now just support sideways, sideways-right, upright and ver tical-right.
1024 if (id == CSSValueSideways || id == CSSValueSidewaysRight || id == CSSVa lueVerticalRight || id == CSSValueUpright) 1020 if (id == CSSValueSideways || id == CSSValueSidewaysRight || id == CSSVa lueVerticalRight || id == CSSValueUpright)
1025 validPrimitive = true; 1021 validPrimitive = true;
1026 break; 1022 break;
1027 1023
1028 case CSSPropertyWebkitClipPath: 1024 case CSSPropertyWebkitClipPath:
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 case CSSPropertyWebkitBorderBeforeColor: 1162 case CSSPropertyWebkitBorderBeforeColor:
1167 case CSSPropertyWebkitBorderAfterColor: 1163 case CSSPropertyWebkitBorderAfterColor:
1168 case CSSPropertyWebkitBorderStartWidth: 1164 case CSSPropertyWebkitBorderStartWidth:
1169 case CSSPropertyWebkitBorderEndWidth: 1165 case CSSPropertyWebkitBorderEndWidth:
1170 case CSSPropertyWebkitBorderBeforeWidth: 1166 case CSSPropertyWebkitBorderBeforeWidth:
1171 case CSSPropertyWebkitBorderAfterWidth: 1167 case CSSPropertyWebkitBorderAfterWidth:
1172 case CSSPropertyWebkitBorderStart: 1168 case CSSPropertyWebkitBorderStart:
1173 case CSSPropertyWebkitBorderEnd: 1169 case CSSPropertyWebkitBorderEnd:
1174 case CSSPropertyWebkitBorderBefore: 1170 case CSSPropertyWebkitBorderBefore:
1175 case CSSPropertyWebkitBorderAfter: 1171 case CSSPropertyWebkitBorderAfter:
1172 case CSSPropertyWebkitTextStroke:
1173 case CSSPropertyWebkitTextStrokeColor:
1174 case CSSPropertyWebkitTextStrokeWidth:
1176 validPrimitive = false; 1175 validPrimitive = false;
1177 break; 1176 break;
1178 1177
1179 case CSSPropertyScrollSnapPointsX: 1178 case CSSPropertyScrollSnapPointsX:
1180 case CSSPropertyScrollSnapPointsY: 1179 case CSSPropertyScrollSnapPointsY:
1181 parsedValue = parseScrollSnapPoints(); 1180 parsedValue = parseScrollSnapPoints();
1182 break; 1181 break;
1183 case CSSPropertyScrollSnapCoordinate: 1182 case CSSPropertyScrollSnapCoordinate:
1184 parsedValue = parseScrollSnapCoordinate(); 1183 parsedValue = parseScrollSnapCoordinate();
1185 break; 1184 break;
(...skipping 4692 matching lines...) Expand 10 before | Expand all | Expand 10 after
5878 return nullptr; 5877 return nullptr;
5879 a = args->next(); 5878 a = args->next();
5880 5879
5881 argNumber++; 5880 argNumber++;
5882 } 5881 }
5883 5882
5884 return transformValue.release(); 5883 return transformValue.release();
5885 } 5884 }
5886 5885
5887 } // namespace blink 5886 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698