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

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 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) 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 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
2072 valueList->append(cssValuePool().createIdentifierValue(discretionary LigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretion aryLigatures : CSSValueDiscretionaryLigatures)); 2072 valueList->append(cssValuePool().createIdentifierValue(discretionary LigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretion aryLigatures : CSSValueDiscretionaryLigatures));
2073 if (historicalLigaturesState != FontDescription::NormalLigaturesState) 2073 if (historicalLigaturesState != FontDescription::NormalLigaturesState)
2074 valueList->append(cssValuePool().createIdentifierValue(historicalLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLig atures : CSSValueHistoricalLigatures)); 2074 valueList->append(cssValuePool().createIdentifierValue(historicalLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLig atures : CSSValueHistoricalLigatures));
2075 if (contextualLigaturesState != FontDescription::NormalLigaturesState) 2075 if (contextualLigaturesState != FontDescription::NormalLigaturesState)
2076 valueList->append(cssValuePool().createIdentifierValue(contextualLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoContextual : CSSValueContextual)); 2076 valueList->append(cssValuePool().createIdentifierValue(contextualLig aturesState == FontDescription::DisabledLigaturesState ? CSSValueNoContextual : CSSValueContextual));
2077 return valueList; 2077 return valueList;
2078 } 2078 }
2079 case CSSPropertyZIndex: 2079 case CSSPropertyZIndex:
2080 if (style.hasAutoZIndex()) 2080 if (style.hasAutoZIndex())
2081 return cssValuePool().createIdentifierValue(CSSValueAuto); 2081 return cssValuePool().createIdentifierValue(CSSValueAuto);
2082 return cssValuePool().createValue(style.zIndex(), CSSPrimitiveValue::CSS _NUMBER); 2082 return cssValuePool().createValue(style.zIndex(), CSSPrimitiveValue::CSS _INTEGER);
2083 case CSSPropertyZoom: 2083 case CSSPropertyZoom:
2084 return cssValuePool().createValue(style.zoom(), CSSPrimitiveValue::CSS_N UMBER); 2084 return cssValuePool().createValue(style.zoom(), CSSPrimitiveValue::CSS_N UMBER);
2085 case CSSPropertyBoxSizing: 2085 case CSSPropertyBoxSizing:
2086 if (style.boxSizing() == CONTENT_BOX) 2086 if (style.boxSizing() == CONTENT_BOX)
2087 return cssValuePool().createIdentifierValue(CSSValueContentBox); 2087 return cssValuePool().createIdentifierValue(CSSValueContentBox);
2088 return cssValuePool().createIdentifierValue(CSSValueBorderBox); 2088 return cssValuePool().createIdentifierValue(CSSValueBorderBox);
2089 case CSSPropertyWebkitAppRegion: 2089 case CSSPropertyWebkitAppRegion:
2090 return cssValuePool().createIdentifierValue(style.getDraggableRegionMode () == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag); 2090 return cssValuePool().createIdentifierValue(style.getDraggableRegionMode () == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag);
2091 case CSSPropertyAnimationDelay: 2091 case CSSPropertyAnimationDelay:
2092 return valueForAnimationDelay(style.animations()); 2092 return valueForAnimationDelay(style.animations());
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2691 case CSSPropertyAll: 2691 case CSSPropertyAll:
2692 return nullptr; 2692 return nullptr;
2693 default: 2693 default:
2694 break; 2694 break;
2695 } 2695 }
2696 ASSERT_NOT_REACHED(); 2696 ASSERT_NOT_REACHED();
2697 return nullptr; 2697 return nullptr;
2698 } 2698 }
2699 2699
2700 } 2700 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698