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

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

Issue 1409383002: Move widows/orphans property handling into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years, 2 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 | « 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 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 case CSSPropertyWebkitMarginStart: 656 case CSSPropertyWebkitMarginStart:
657 case CSSPropertyWebkitMarginEnd: 657 case CSSPropertyWebkitMarginEnd:
658 case CSSPropertyWebkitMarginBefore: 658 case CSSPropertyWebkitMarginBefore:
659 case CSSPropertyWebkitMarginAfter: 659 case CSSPropertyWebkitMarginAfter:
660 if (id == CSSValueAuto) 660 if (id == CSSValueAuto)
661 validPrimitive = true; 661 validPrimitive = true;
662 else 662 else
663 validPrimitive = validUnit(value, FLength | FPercent | unitless); 663 validPrimitive = validUnit(value, FLength | FPercent | unitless);
664 break; 664 break;
665 665
666 case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility)
667 case CSSPropertyWidows: // <integer> | inherit | auto (Ditto)
668 if (id == CSSValueAuto)
669 validPrimitive = true;
670 else
671 validPrimitive = validUnit(value, FPositiveInteger);
672 break;
673
674 case CSSPropertyZIndex: // auto | <integer> | inherit 666 case CSSPropertyZIndex: // auto | <integer> | inherit
675 if (id == CSSValueAuto) { 667 if (id == CSSValueAuto) {
676 validPrimitive = true; 668 validPrimitive = true;
677 } else if (validUnit(value, FInteger)) { 669 } else if (validUnit(value, FInteger)) {
678 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::UnitType::Integer), important); 670 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::UnitType::Integer), important);
679 return true; 671 return true;
680 } 672 }
681 break; 673 break;
682 674
683 case CSSPropertyTextDecoration: 675 case CSSPropertyTextDecoration:
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 case CSSPropertyAnimationDirection: 1238 case CSSPropertyAnimationDirection:
1247 case CSSPropertyAnimationDuration: 1239 case CSSPropertyAnimationDuration:
1248 case CSSPropertyTransitionDuration: 1240 case CSSPropertyTransitionDuration:
1249 case CSSPropertyAnimationFillMode: 1241 case CSSPropertyAnimationFillMode:
1250 case CSSPropertyAnimationIterationCount: 1242 case CSSPropertyAnimationIterationCount:
1251 case CSSPropertyAnimationName: 1243 case CSSPropertyAnimationName:
1252 case CSSPropertyAnimationPlayState: 1244 case CSSPropertyAnimationPlayState:
1253 case CSSPropertyAnimationTimingFunction: 1245 case CSSPropertyAnimationTimingFunction:
1254 case CSSPropertyTransitionTimingFunction: 1246 case CSSPropertyTransitionTimingFunction:
1255 case CSSPropertyTransitionProperty: 1247 case CSSPropertyTransitionProperty:
1248 case CSSPropertyOrphans:
1249 case CSSPropertyWidows:
1256 validPrimitive = false; 1250 validPrimitive = false;
1257 break; 1251 break;
1258 1252
1259 case CSSPropertyScrollSnapPointsX: 1253 case CSSPropertyScrollSnapPointsX:
1260 case CSSPropertyScrollSnapPointsY: 1254 case CSSPropertyScrollSnapPointsY:
1261 parsedValue = parseScrollSnapPoints(); 1255 parsedValue = parseScrollSnapPoints();
1262 break; 1256 break;
1263 case CSSPropertyScrollSnapCoordinate: 1257 case CSSPropertyScrollSnapCoordinate:
1264 parsedValue = parseScrollSnapCoordinate(); 1258 parsedValue = parseScrollSnapCoordinate();
1265 break; 1259 break;
(...skipping 5416 matching lines...) Expand 10 before | Expand all | Expand 10 after
6682 } 6676 }
6683 } 6677 }
6684 6678
6685 if (!list->length()) 6679 if (!list->length())
6686 return nullptr; 6680 return nullptr;
6687 6681
6688 return list.release(); 6682 return list.release();
6689 } 6683 }
6690 6684
6691 } // namespace blink 6685 } // 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