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

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

Issue 1193753002: Serialize zIndex as an integer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix CSSCalculationValue.cpp Created 5 years, 5 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 | « Source/core/css/ComputedStyleCSSValueMapping.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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 825
826 case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility) 826 case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility)
827 case CSSPropertyWidows: // <integer> | inherit | auto (Ditto) 827 case CSSPropertyWidows: // <integer> | inherit | auto (Ditto)
828 if (id == CSSValueAuto) 828 if (id == CSSValueAuto)
829 validPrimitive = true; 829 validPrimitive = true;
830 else 830 else
831 validPrimitive = validUnit(value, FPositiveInteger); 831 validPrimitive = validUnit(value, FPositiveInteger);
832 break; 832 break;
833 833
834 case CSSPropertyZIndex: // auto | <integer> | inherit 834 case CSSPropertyZIndex: // auto | <integer> | inherit
835 if (id == CSSValueAuto) 835 if (id == CSSValueAuto) {
836 validPrimitive = true; 836 validPrimitive = true;
837 else 837 } else if (validUnit(value, FInteger)) {
838 validPrimitive = validUnit(value, FInteger); 838 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::CSS_INTEGER), important);
839 return true;
840 }
839 break; 841 break;
840 842
841 case CSSPropertyLineHeight: 843 case CSSPropertyLineHeight:
842 parsedValue = parseLineHeight(); 844 parsedValue = parseLineHeight();
843 break; 845 break;
844 case CSSPropertyCounterIncrement: 846 case CSSPropertyCounterIncrement:
845 if (id == CSSValueNone) 847 if (id == CSSValueNone)
846 validPrimitive = true; 848 validPrimitive = true;
847 else 849 else
848 parsedValue = parseCounter(1); 850 parsedValue = parseCounter(1);
(...skipping 7432 matching lines...) Expand 10 before | Expand all | Expand 10 after
8281 } 8283 }
8282 } 8284 }
8283 8285
8284 if (!list->length()) 8286 if (!list->length())
8285 return nullptr; 8287 return nullptr;
8286 8288
8287 return list.release(); 8289 return list.release();
8288 } 8290 }
8289 8291
8290 } // namespace blink 8292 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698