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

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 regression and add test Created 5 years, 6 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 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 853
854 case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility) 854 case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility)
855 case CSSPropertyWidows: // <integer> | inherit | auto (Ditto) 855 case CSSPropertyWidows: // <integer> | inherit | auto (Ditto)
856 if (id == CSSValueAuto) 856 if (id == CSSValueAuto)
857 validPrimitive = true; 857 validPrimitive = true;
858 else 858 else
859 validPrimitive = validUnit(value, FPositiveInteger); 859 validPrimitive = validUnit(value, FPositiveInteger);
860 break; 860 break;
861 861
862 case CSSPropertyZIndex: // auto | <integer> | inherit 862 case CSSPropertyZIndex: // auto | <integer> | inherit
863 if (id == CSSValueAuto) 863 if (id == CSSValueAuto) {
864 validPrimitive = true; 864 validPrimitive = true;
865 else 865 } else if (validUnit(value, FInteger)) {
866 validPrimitive = validUnit(value, FInteger); 866 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::CSS_INTEGER), important);
867 return true;
868 }
867 break; 869 break;
868 870
869 case CSSPropertyLineHeight: 871 case CSSPropertyLineHeight:
870 parsedValue = parseLineHeight(); 872 parsedValue = parseLineHeight();
871 break; 873 break;
872 case CSSPropertyCounterIncrement: 874 case CSSPropertyCounterIncrement:
873 if (id == CSSValueNone) 875 if (id == CSSValueNone)
874 validPrimitive = true; 876 validPrimitive = true;
875 else 877 else
876 parsedValue = parseCounter(1); 878 parsedValue = parseCounter(1);
(...skipping 7369 matching lines...) Expand 10 before | Expand all | Expand 10 after
8246 } 8248 }
8247 } 8249 }
8248 8250
8249 if (!list->length()) 8251 if (!list->length())
8250 return nullptr; 8252 return nullptr;
8251 8253
8252 return list.release(); 8254 return list.release();
8253 } 8255 }
8254 8256
8255 } // namespace blink 8257 } // namespace blink
OLDNEW
« Source/core/css/CSSCalculationValue.cpp ('K') | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698