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

Side by Side Diff: Source/core/css/ComputedStyleCSSValueMapping.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/CSSPrimitiveValue.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 valueList->append(cssValuePool().createIdentifierValue(discretionary LigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretion aryLigatures : CSSValueDiscretionaryLigatures)); 2087 valueList->append(cssValuePool().createIdentifierValue(discretionary LigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretion aryLigatures : CSSValueDiscretionaryLigatures));
2088 if (historicalLigaturesState != FontDescription::NormalLigaturesState) 2088 if (historicalLigaturesState != FontDescription::NormalLigaturesState)
2089 valueList->append(cssValuePool().createIdentifierValue(historicalLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLig atures : CSSValueHistoricalLigatures)); 2089 valueList->append(cssValuePool().createIdentifierValue(historicalLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLig atures : CSSValueHistoricalLigatures));
2090 if (contextualLigaturesState != FontDescription::NormalLigaturesState) 2090 if (contextualLigaturesState != FontDescription::NormalLigaturesState)
2091 valueList->append(cssValuePool().createIdentifierValue(contextualLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoContextual : CSSValueContextual)); 2091 valueList->append(cssValuePool().createIdentifierValue(contextualLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoContextual : CSSValueContextual));
2092 return valueList; 2092 return valueList;
2093 } 2093 }
2094 case CSSPropertyZIndex: 2094 case CSSPropertyZIndex:
2095 if (style.hasAutoZIndex()) 2095 if (style.hasAutoZIndex())
2096 return cssValuePool().createIdentifierValue(CSSValueAuto); 2096 return cssValuePool().createIdentifierValue(CSSValueAuto);
2097 return cssValuePool().createValue(style.zIndex(), CSSPrimitiveValue::CSS _NUMBER); 2097 return cssValuePool().createValue(style.zIndex(), CSSPrimitiveValue::CSS _INTEGER);
2098 case CSSPropertyZoom: 2098 case CSSPropertyZoom:
2099 return cssValuePool().createValue(style.zoom(), CSSPrimitiveValue::CSS_N UMBER); 2099 return cssValuePool().createValue(style.zoom(), CSSPrimitiveValue::CSS_N UMBER);
2100 case CSSPropertyBoxSizing: 2100 case CSSPropertyBoxSizing:
2101 if (style.boxSizing() == CONTENT_BOX) 2101 if (style.boxSizing() == CONTENT_BOX)
2102 return cssValuePool().createIdentifierValue(CSSValueContentBox); 2102 return cssValuePool().createIdentifierValue(CSSValueContentBox);
2103 return cssValuePool().createIdentifierValue(CSSValueBorderBox); 2103 return cssValuePool().createIdentifierValue(CSSValueBorderBox);
2104 case CSSPropertyWebkitAppRegion: 2104 case CSSPropertyWebkitAppRegion:
2105 return cssValuePool().createIdentifierValue(style.getDraggableRegionMode () == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag); 2105 return cssValuePool().createIdentifierValue(style.getDraggableRegionMode () == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag);
2106 case CSSPropertyAnimationDelay: 2106 case CSSPropertyAnimationDelay:
2107 return valueForAnimationDelay(style.animations()); 2107 return valueForAnimationDelay(style.animations());
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
2705 case CSSPropertyAll: 2705 case CSSPropertyAll:
2706 return nullptr; 2706 return nullptr;
2707 default: 2707 default:
2708 break; 2708 break;
2709 } 2709 }
2710 ASSERT_NOT_REACHED(); 2710 ASSERT_NOT_REACHED();
2711 return nullptr; 2711 return nullptr;
2712 } 2712 }
2713 2713
2714 } 2714 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698