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

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

Issue 1417463003: Move z-index property handling into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again! 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
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 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 case CSSPropertyWebkitMarginStart: 652 case CSSPropertyWebkitMarginStart:
653 case CSSPropertyWebkitMarginEnd: 653 case CSSPropertyWebkitMarginEnd:
654 case CSSPropertyWebkitMarginBefore: 654 case CSSPropertyWebkitMarginBefore:
655 case CSSPropertyWebkitMarginAfter: 655 case CSSPropertyWebkitMarginAfter:
656 if (id == CSSValueAuto) 656 if (id == CSSValueAuto)
657 validPrimitive = true; 657 validPrimitive = true;
658 else 658 else
659 validPrimitive = validUnit(value, FLength | FPercent | unitless); 659 validPrimitive = validUnit(value, FLength | FPercent | unitless);
660 break; 660 break;
661 661
662 case CSSPropertyZIndex: // auto | <integer> | inherit
663 if (id == CSSValueAuto) {
664 validPrimitive = true;
665 } else if (validUnit(value, FInteger)) {
666 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::UnitType::Integer), important);
667 return true;
668 }
669 break;
670
671 case CSSPropertyTextDecoration: 662 case CSSPropertyTextDecoration:
672 // Fall through 'text-decoration-line' parsing if CSS 3 Text Decoration 663 // Fall through 'text-decoration-line' parsing if CSS 3 Text Decoration
673 // is disabled to match CSS 2.1 rules for parsing 'text-decoration'. 664 // is disabled to match CSS 2.1 rules for parsing 'text-decoration'.
674 if (RuntimeEnabledFeatures::css3TextDecorationsEnabled()) { 665 if (RuntimeEnabledFeatures::css3TextDecorationsEnabled()) {
675 // [ <text-decoration-line> || <text-decoration-style> || <text-deco ration-color> ] | inherit 666 // [ <text-decoration-line> || <text-decoration-style> || <text-deco ration-color> ] | inherit
676 return parseShorthand(CSSPropertyTextDecoration, textDecorationShort hand(), important); 667 return parseShorthand(CSSPropertyTextDecoration, textDecorationShort hand(), important);
677 } 668 }
678 case CSSPropertyWebkitTextDecorationsInEffect: 669 case CSSPropertyWebkitTextDecorationsInEffect:
679 case CSSPropertyTextDecorationLine: 670 case CSSPropertyTextDecorationLine:
680 // none | [ underline || overline || line-through || blink ] | inherit 671 // none | [ underline || overline || line-through || blink ] | inherit
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 case CSSPropertyAnimationName: 1224 case CSSPropertyAnimationName:
1234 case CSSPropertyAnimationPlayState: 1225 case CSSPropertyAnimationPlayState:
1235 case CSSPropertyAnimationTimingFunction: 1226 case CSSPropertyAnimationTimingFunction:
1236 case CSSPropertyTransitionTimingFunction: 1227 case CSSPropertyTransitionTimingFunction:
1237 case CSSPropertyTransitionProperty: 1228 case CSSPropertyTransitionProperty:
1238 case CSSPropertyOrphans: 1229 case CSSPropertyOrphans:
1239 case CSSPropertyWidows: 1230 case CSSPropertyWidows:
1240 case CSSPropertyWebkitTapHighlightColor: 1231 case CSSPropertyWebkitTapHighlightColor:
1241 case CSSPropertyWebkitTextFillColor: 1232 case CSSPropertyWebkitTextFillColor:
1242 case CSSPropertyColor: 1233 case CSSPropertyColor:
1234 case CSSPropertyZIndex:
1243 validPrimitive = false; 1235 validPrimitive = false;
1244 break; 1236 break;
1245 1237
1246 case CSSPropertyScrollSnapPointsX: 1238 case CSSPropertyScrollSnapPointsX:
1247 case CSSPropertyScrollSnapPointsY: 1239 case CSSPropertyScrollSnapPointsY:
1248 parsedValue = parseScrollSnapPoints(); 1240 parsedValue = parseScrollSnapPoints();
1249 break; 1241 break;
1250 case CSSPropertyScrollSnapCoordinate: 1242 case CSSPropertyScrollSnapCoordinate:
1251 parsedValue = parseScrollSnapCoordinate(); 1243 parsedValue = parseScrollSnapCoordinate();
1252 break; 1244 break;
(...skipping 5397 matching lines...) Expand 10 before | Expand all | Expand 10 after
6650 } 6642 }
6651 } 6643 }
6652 6644
6653 if (!list->length()) 6645 if (!list->length())
6654 return nullptr; 6646 return nullptr;
6655 6647
6656 return list.release(); 6648 return list.release();
6657 } 6649 }
6658 6650
6659 } // namespace blink 6651 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698