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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 7 years, 2 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 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1902 case CSSPropertyColor: 1902 case CSSPropertyColor:
1903 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); 1903 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb());
1904 case CSSPropertyWebkitPrintColorAdjust: 1904 case CSSPropertyWebkitPrintColorAdjust:
1905 return cssValuePool().createValue(style->printColorAdjust()); 1905 return cssValuePool().createValue(style->printColorAdjust());
1906 case CSSPropertyWebkitColumnAxis: 1906 case CSSPropertyWebkitColumnAxis:
1907 return cssValuePool().createValue(style->columnAxis()); 1907 return cssValuePool().createValue(style->columnAxis());
1908 case CSSPropertyWebkitColumnCount: 1908 case CSSPropertyWebkitColumnCount:
1909 if (style->hasAutoColumnCount()) 1909 if (style->hasAutoColumnCount())
1910 return cssValuePool().createIdentifierValue(CSSValueAuto); 1910 return cssValuePool().createIdentifierValue(CSSValueAuto);
1911 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER); 1911 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER);
1912 case CSSPropertyColumnFill:
1913 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled())
1914 return cssValuePool().createValue(style->columnFill());
1915 return 0;
1912 case CSSPropertyWebkitColumnGap: 1916 case CSSPropertyWebkitColumnGap:
1913 if (style->hasNormalColumnGap()) 1917 if (style->hasNormalColumnGap())
1914 return cssValuePool().createIdentifierValue(CSSValueNormal); 1918 return cssValuePool().createIdentifierValue(CSSValueNormal);
1915 return zoomAdjustedPixelValue(style->columnGap(), style.get()); 1919 return zoomAdjustedPixelValue(style->columnGap(), style.get());
1916 case CSSPropertyWebkitColumnProgression: 1920 case CSSPropertyWebkitColumnProgression:
1917 return cssValuePool().createValue(style->columnProgression()); 1921 return cssValuePool().createValue(style->columnProgression());
1918 case CSSPropertyWebkitColumnRuleColor: 1922 case CSSPropertyWebkitColumnRuleColor:
1919 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (style.get(), style->columnRuleColor()); 1923 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (style.get(), style->columnRuleColor());
1920 case CSSPropertyWebkitColumnRuleStyle: 1924 case CSSPropertyWebkitColumnRuleStyle:
1921 return cssValuePool().createValue(style->columnRuleStyle()); 1925 return cssValuePool().createValue(style->columnRuleStyle());
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after
3233 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3237 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3234 CSSPropertyB ackgroundClip }; 3238 CSSPropertyB ackgroundClip };
3235 3239
3236 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3240 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3237 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3241 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3242 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3239 return list.release(); 3243 return list.release();
3240 } 3244 }
3241 3245
3242 } // namespace WebCore 3246 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698