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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1956373002: Remove ColumnFill runtime setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1718 return cssValuePool().createValue(style.clear()); 1718 return cssValuePool().createValue(style.clear());
1719 case CSSPropertyColor: 1719 case CSSPropertyColor:
1720 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb()); 1720 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb());
1721 case CSSPropertyWebkitPrintColorAdjust: 1721 case CSSPropertyWebkitPrintColorAdjust:
1722 return cssValuePool().createValue(style.getPrintColorAdjust()); 1722 return cssValuePool().createValue(style.getPrintColorAdjust());
1723 case CSSPropertyColumnCount: 1723 case CSSPropertyColumnCount:
1724 if (style.hasAutoColumnCount()) 1724 if (style.hasAutoColumnCount())
1725 return cssValuePool().createIdentifierValue(CSSValueAuto); 1725 return cssValuePool().createIdentifierValue(CSSValueAuto);
1726 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::UnitType::Number); 1726 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::UnitType::Number);
1727 case CSSPropertyColumnFill: 1727 case CSSPropertyColumnFill:
1728 ASSERT(RuntimeEnabledFeatures::columnFillEnabled());
1729 return cssValuePool().createValue(style.getColumnFill()); 1728 return cssValuePool().createValue(style.getColumnFill());
1730 case CSSPropertyColumnGap: 1729 case CSSPropertyColumnGap:
1731 if (style.hasNormalColumnGap()) 1730 if (style.hasNormalColumnGap())
1732 return cssValuePool().createIdentifierValue(CSSValueNormal); 1731 return cssValuePool().createIdentifierValue(CSSValueNormal);
1733 return zoomAdjustedPixelValue(style.columnGap(), style); 1732 return zoomAdjustedPixelValue(style.columnGap(), style);
1734 case CSSPropertyColumnRuleColor: 1733 case CSSPropertyColumnRuleColor:
1735 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor()); 1734 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor());
1736 case CSSPropertyColumnRuleStyle: 1735 case CSSPropertyColumnRuleStyle:
1737 return cssValuePool().createValue(style.columnRuleStyle()); 1736 return cssValuePool().createValue(style.columnRuleStyle());
1738 case CSSPropertyColumnRuleWidth: 1737 case CSSPropertyColumnRuleWidth:
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2911 case CSSPropertyAll: 2910 case CSSPropertyAll:
2912 return nullptr; 2911 return nullptr;
2913 default: 2912 default:
2914 break; 2913 break;
2915 } 2914 }
2916 ASSERT_NOT_REACHED(); 2915 ASSERT_NOT_REACHED();
2917 return nullptr; 2916 return nullptr;
2918 } 2917 }
2919 2918
2920 } // namespace blink 2919 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.in ('k') | third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698