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

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: 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 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1900 case CSSPropertyColor: 1900 case CSSPropertyColor:
1901 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); 1901 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb());
1902 case CSSPropertyWebkitPrintColorAdjust: 1902 case CSSPropertyWebkitPrintColorAdjust:
1903 return cssValuePool().createValue(style->printColorAdjust()); 1903 return cssValuePool().createValue(style->printColorAdjust());
1904 case CSSPropertyWebkitColumnAxis: 1904 case CSSPropertyWebkitColumnAxis:
1905 return cssValuePool().createValue(style->columnAxis()); 1905 return cssValuePool().createValue(style->columnAxis());
1906 case CSSPropertyWebkitColumnCount: 1906 case CSSPropertyWebkitColumnCount:
1907 if (style->hasAutoColumnCount()) 1907 if (style->hasAutoColumnCount())
1908 return cssValuePool().createIdentifierValue(CSSValueAuto); 1908 return cssValuePool().createIdentifierValue(CSSValueAuto);
1909 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER); 1909 return cssValuePool().createValue(style->columnCount(), CSSPrimitive Value::CSS_NUMBER);
1910 case CSSPropertyWebkitColumnFill:
1911 return cssValuePool().createValue(style->columnFill());
1910 case CSSPropertyWebkitColumnGap: 1912 case CSSPropertyWebkitColumnGap:
1911 if (style->hasNormalColumnGap()) 1913 if (style->hasNormalColumnGap())
1912 return cssValuePool().createIdentifierValue(CSSValueNormal); 1914 return cssValuePool().createIdentifierValue(CSSValueNormal);
1913 return zoomAdjustedPixelValue(style->columnGap(), style.get()); 1915 return zoomAdjustedPixelValue(style->columnGap(), style.get());
1914 case CSSPropertyWebkitColumnProgression: 1916 case CSSPropertyWebkitColumnProgression:
1915 return cssValuePool().createValue(style->columnProgression()); 1917 return cssValuePool().createValue(style->columnProgression());
1916 case CSSPropertyWebkitColumnRuleColor: 1918 case CSSPropertyWebkitColumnRuleColor:
1917 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (style.get(), style->columnRuleColor()); 1919 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor (style.get(), style->columnRuleColor());
1918 case CSSPropertyWebkitColumnRuleStyle: 1920 case CSSPropertyWebkitColumnRuleStyle:
1919 return cssValuePool().createValue(style->columnRuleStyle()); 1921 return cssValuePool().createValue(style->columnRuleStyle());
(...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after
3229 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3231 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3230 CSSPropertyB ackgroundClip }; 3232 CSSPropertyB ackgroundClip };
3231 3233
3232 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3234 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3233 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3235 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3234 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3236 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3235 return list.release(); 3237 return list.release();
3236 } 3238 }
3237 3239
3238 } // namespace WebCore 3240 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698