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

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: Rebase master (fixed the DOS-style line break issue there) 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 CSSPropertyWebkitBoxLines, 239 CSSPropertyWebkitBoxLines,
240 CSSPropertyWebkitBoxOrdinalGroup, 240 CSSPropertyWebkitBoxOrdinalGroup,
241 CSSPropertyWebkitBoxOrient, 241 CSSPropertyWebkitBoxOrient,
242 CSSPropertyWebkitBoxPack, 242 CSSPropertyWebkitBoxPack,
243 CSSPropertyWebkitBoxReflect, 243 CSSPropertyWebkitBoxReflect,
244 CSSPropertyWebkitBoxShadow, 244 CSSPropertyWebkitBoxShadow,
245 CSSPropertyWebkitClipPath, 245 CSSPropertyWebkitClipPath,
246 CSSPropertyWebkitColumnBreakAfter, 246 CSSPropertyWebkitColumnBreakAfter,
247 CSSPropertyWebkitColumnBreakBefore, 247 CSSPropertyWebkitColumnBreakBefore,
248 CSSPropertyWebkitColumnBreakInside, 248 CSSPropertyWebkitColumnBreakInside,
249 CSSPropertyWebkitColumnAxis,
250 CSSPropertyWebkitColumnCount, 249 CSSPropertyWebkitColumnCount,
251 CSSPropertyWebkitColumnGap, 250 CSSPropertyWebkitColumnGap,
252 CSSPropertyWebkitColumnProgression,
253 CSSPropertyWebkitColumnRuleColor, 251 CSSPropertyWebkitColumnRuleColor,
254 CSSPropertyWebkitColumnRuleStyle, 252 CSSPropertyWebkitColumnRuleStyle,
255 CSSPropertyWebkitColumnRuleWidth, 253 CSSPropertyWebkitColumnRuleWidth,
256 CSSPropertyWebkitColumnSpan, 254 CSSPropertyWebkitColumnSpan,
257 CSSPropertyWebkitColumnWidth, 255 CSSPropertyWebkitColumnWidth,
258 CSSPropertyWebkitFilter, 256 CSSPropertyWebkitFilter,
259 CSSPropertyAlignContent, 257 CSSPropertyAlignContent,
260 CSSPropertyAlignItems, 258 CSSPropertyAlignItems,
261 CSSPropertyAlignSelf, 259 CSSPropertyAlignSelf,
262 CSSPropertyFlexBasis, 260 CSSPropertyFlexBasis,
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 case CSSPropertyWebkitBoxShadow: 1808 case CSSPropertyWebkitBoxShadow:
1811 return valueForShadowList(style->boxShadow(), *style, true); 1809 return valueForShadowList(style->boxShadow(), *style, true);
1812 case CSSPropertyCaptionSide: 1810 case CSSPropertyCaptionSide:
1813 return cssValuePool().createValue(style->captionSide()); 1811 return cssValuePool().createValue(style->captionSide());
1814 case CSSPropertyClear: 1812 case CSSPropertyClear:
1815 return cssValuePool().createValue(style->clear()); 1813 return cssValuePool().createValue(style->clear());
1816 case CSSPropertyColor: 1814 case CSSPropertyColor:
1817 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); 1815 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb());
1818 case CSSPropertyWebkitPrintColorAdjust: 1816 case CSSPropertyWebkitPrintColorAdjust:
1819 return cssValuePool().createValue(style->printColorAdjust()); 1817 return cssValuePool().createValue(style->printColorAdjust());
1820 case CSSPropertyWebkitColumnAxis:
1821 return cssValuePool().createValue(style->columnAxis());
1822 case CSSPropertyWebkitColumnCount: 1818 case CSSPropertyWebkitColumnCount:
1823 if (style->hasAutoColumnCount()) 1819 if (style->hasAutoColumnCount())
1824 return cssValuePool().createIdentifierValue(CSSValueAuto); 1820 return cssValuePool().createIdentifierValue(CSSValueAuto);
1825 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER); 1821 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER);
1826 case CSSPropertyColumnFill: 1822 case CSSPropertyColumnFill:
1827 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled()) 1823 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled())
1828 return cssValuePool().createValue(style->columnFill()); 1824 return cssValuePool().createValue(style->columnFill());
1829 return nullptr; 1825 return nullptr;
1830 case CSSPropertyWebkitColumnGap: 1826 case CSSPropertyWebkitColumnGap:
1831 if (style->hasNormalColumnGap()) 1827 if (style->hasNormalColumnGap())
1832 return cssValuePool().createIdentifierValue(CSSValueNormal); 1828 return cssValuePool().createIdentifierValue(CSSValueNormal);
1833 return zoomAdjustedPixelValue(style->columnGap(), *style); 1829 return zoomAdjustedPixelValue(style->columnGap(), *style);
1834 case CSSPropertyWebkitColumnProgression:
1835 return cssValuePool().createValue(style->columnProgression());
1836 case CSSPropertyWebkitColumnRuleColor: 1830 case CSSPropertyWebkitColumnRuleColor:
1837 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (*style, style->columnRuleColor()); 1831 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (*style, style->columnRuleColor());
1838 case CSSPropertyWebkitColumnRuleStyle: 1832 case CSSPropertyWebkitColumnRuleStyle:
1839 return cssValuePool().createValue(style->columnRuleStyle()); 1833 return cssValuePool().createValue(style->columnRuleStyle());
1840 case CSSPropertyWebkitColumnRuleWidth: 1834 case CSSPropertyWebkitColumnRuleWidth:
1841 return zoomAdjustedPixelValue(style->columnRuleWidth(), *style); 1835 return zoomAdjustedPixelValue(style->columnRuleWidth(), *style);
1842 case CSSPropertyWebkitColumnSpan: 1836 case CSSPropertyWebkitColumnSpan:
1843 return cssValuePool().createIdentifierValue(style->columnSpan() ? CS SValueAll : CSSValueNone); 1837 return cssValuePool().createIdentifierValue(style->columnSpan() ? CS SValueAll : CSSValueNone);
1844 case CSSPropertyWebkitColumnBreakAfter: 1838 case CSSPropertyWebkitColumnBreakAfter:
1845 return cssValuePool().createValue(style->columnBreakAfter()); 1839 return cssValuePool().createValue(style->columnBreakAfter());
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
3053 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3047 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3054 CSSPropertyB ackgroundClip }; 3048 CSSPropertyB ackgroundClip };
3055 3049
3056 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3050 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3057 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3051 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3058 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3052 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3059 return list.release(); 3053 return list.release();
3060 } 3054 }
3061 3055
3062 } // namespace WebCore 3056 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698