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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 CSSPropertyWebkitBoxLines, 238 CSSPropertyWebkitBoxLines,
239 CSSPropertyWebkitBoxOrdinalGroup, 239 CSSPropertyWebkitBoxOrdinalGroup,
240 CSSPropertyWebkitBoxOrient, 240 CSSPropertyWebkitBoxOrient,
241 CSSPropertyWebkitBoxPack, 241 CSSPropertyWebkitBoxPack,
242 CSSPropertyWebkitBoxReflect, 242 CSSPropertyWebkitBoxReflect,
243 CSSPropertyWebkitBoxShadow, 243 CSSPropertyWebkitBoxShadow,
244 CSSPropertyWebkitClipPath, 244 CSSPropertyWebkitClipPath,
245 CSSPropertyWebkitColumnBreakAfter, 245 CSSPropertyWebkitColumnBreakAfter,
246 CSSPropertyWebkitColumnBreakBefore, 246 CSSPropertyWebkitColumnBreakBefore,
247 CSSPropertyWebkitColumnBreakInside, 247 CSSPropertyWebkitColumnBreakInside,
248 CSSPropertyWebkitColumnAxis,
249 CSSPropertyWebkitColumnCount, 248 CSSPropertyWebkitColumnCount,
250 CSSPropertyWebkitColumnGap, 249 CSSPropertyWebkitColumnGap,
251 CSSPropertyWebkitColumnProgression,
252 CSSPropertyWebkitColumnRuleColor, 250 CSSPropertyWebkitColumnRuleColor,
253 CSSPropertyWebkitColumnRuleStyle, 251 CSSPropertyWebkitColumnRuleStyle,
254 CSSPropertyWebkitColumnRuleWidth, 252 CSSPropertyWebkitColumnRuleWidth,
255 CSSPropertyWebkitColumnSpan, 253 CSSPropertyWebkitColumnSpan,
256 CSSPropertyWebkitColumnWidth, 254 CSSPropertyWebkitColumnWidth,
257 CSSPropertyWebkitFilter, 255 CSSPropertyWebkitFilter,
258 CSSPropertyAlignContent, 256 CSSPropertyAlignContent,
259 CSSPropertyAlignItems, 257 CSSPropertyAlignItems,
260 CSSPropertyAlignSelf, 258 CSSPropertyAlignSelf,
261 CSSPropertyFlexBasis, 259 CSSPropertyFlexBasis,
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 case CSSPropertyWebkitBoxShadow: 1806 case CSSPropertyWebkitBoxShadow:
1809 return valueForShadowList(style->boxShadow(), *style, true); 1807 return valueForShadowList(style->boxShadow(), *style, true);
1810 case CSSPropertyCaptionSide: 1808 case CSSPropertyCaptionSide:
1811 return cssValuePool().createValue(style->captionSide()); 1809 return cssValuePool().createValue(style->captionSide());
1812 case CSSPropertyClear: 1810 case CSSPropertyClear:
1813 return cssValuePool().createValue(style->clear()); 1811 return cssValuePool().createValue(style->clear());
1814 case CSSPropertyColor: 1812 case CSSPropertyColor:
1815 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); 1813 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb());
1816 case CSSPropertyWebkitPrintColorAdjust: 1814 case CSSPropertyWebkitPrintColorAdjust:
1817 return cssValuePool().createValue(style->printColorAdjust()); 1815 return cssValuePool().createValue(style->printColorAdjust());
1818 case CSSPropertyWebkitColumnAxis:
1819 return cssValuePool().createValue(style->columnAxis());
1820 case CSSPropertyWebkitColumnCount: 1816 case CSSPropertyWebkitColumnCount:
1821 if (style->hasAutoColumnCount()) 1817 if (style->hasAutoColumnCount())
1822 return cssValuePool().createIdentifierValue(CSSValueAuto); 1818 return cssValuePool().createIdentifierValue(CSSValueAuto);
1823 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER); 1819 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER);
1824 case CSSPropertyColumnFill: 1820 case CSSPropertyColumnFill:
1825 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled()) 1821 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled())
1826 return cssValuePool().createValue(style->columnFill()); 1822 return cssValuePool().createValue(style->columnFill());
1827 return nullptr; 1823 return nullptr;
1828 case CSSPropertyWebkitColumnGap: 1824 case CSSPropertyWebkitColumnGap:
1829 if (style->hasNormalColumnGap()) 1825 if (style->hasNormalColumnGap())
1830 return cssValuePool().createIdentifierValue(CSSValueNormal); 1826 return cssValuePool().createIdentifierValue(CSSValueNormal);
1831 return zoomAdjustedPixelValue(style->columnGap(), *style); 1827 return zoomAdjustedPixelValue(style->columnGap(), *style);
1832 case CSSPropertyWebkitColumnProgression:
1833 return cssValuePool().createValue(style->columnProgression());
1834 case CSSPropertyWebkitColumnRuleColor: 1828 case CSSPropertyWebkitColumnRuleColor:
1835 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (*style, style->columnRuleColor()); 1829 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (*style, style->columnRuleColor());
1836 case CSSPropertyWebkitColumnRuleStyle: 1830 case CSSPropertyWebkitColumnRuleStyle:
1837 return cssValuePool().createValue(style->columnRuleStyle()); 1831 return cssValuePool().createValue(style->columnRuleStyle());
1838 case CSSPropertyWebkitColumnRuleWidth: 1832 case CSSPropertyWebkitColumnRuleWidth:
1839 return zoomAdjustedPixelValue(style->columnRuleWidth(), *style); 1833 return zoomAdjustedPixelValue(style->columnRuleWidth(), *style);
1840 case CSSPropertyWebkitColumnSpan: 1834 case CSSPropertyWebkitColumnSpan:
1841 return cssValuePool().createIdentifierValue(style->columnSpan() ? CS SValueAll : CSSValueNone); 1835 return cssValuePool().createIdentifierValue(style->columnSpan() ? CS SValueAll : CSSValueNone);
1842 case CSSPropertyWebkitColumnBreakAfter: 1836 case CSSPropertyWebkitColumnBreakAfter:
1843 return cssValuePool().createValue(style->columnBreakAfter()); 1837 return cssValuePool().createValue(style->columnBreakAfter());
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3036 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3043 CSSPropertyB ackgroundClip }; 3037 CSSPropertyB ackgroundClip };
3044 3038
3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3039 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3040 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3041 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3048 return list.release(); 3042 return list.release();
3049 } 3043 }
3050 3044
3051 } // namespace WebCore 3045 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698