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

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

Issue 1145093002: Add a runtime flag for the column-fill property. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Name the runtime flag ColumnFill after all, since that's all it's going to control Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/parser/CSSParserFastPaths.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 return cssValuePool().createValue(style.clear()); 1489 return cssValuePool().createValue(style.clear());
1490 case CSSPropertyColor: 1490 case CSSPropertyColor:
1491 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb()); 1491 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb());
1492 case CSSPropertyWebkitPrintColorAdjust: 1492 case CSSPropertyWebkitPrintColorAdjust:
1493 return cssValuePool().createValue(style.printColorAdjust()); 1493 return cssValuePool().createValue(style.printColorAdjust());
1494 case CSSPropertyWebkitColumnCount: 1494 case CSSPropertyWebkitColumnCount:
1495 if (style.hasAutoColumnCount()) 1495 if (style.hasAutoColumnCount())
1496 return cssValuePool().createIdentifierValue(CSSValueAuto); 1496 return cssValuePool().createIdentifierValue(CSSValueAuto);
1497 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::CSS_NUMBER); 1497 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::CSS_NUMBER);
1498 case CSSPropertyColumnFill: 1498 case CSSPropertyColumnFill:
1499 ASSERT(RuntimeEnabledFeatures::regionBasedColumnsEnabled()); 1499 ASSERT(RuntimeEnabledFeatures::columnFillEnabled());
1500 return cssValuePool().createValue(style.columnFill()); 1500 return cssValuePool().createValue(style.columnFill());
1501 case CSSPropertyWebkitColumnGap: 1501 case CSSPropertyWebkitColumnGap:
1502 if (style.hasNormalColumnGap()) 1502 if (style.hasNormalColumnGap())
1503 return cssValuePool().createIdentifierValue(CSSValueNormal); 1503 return cssValuePool().createIdentifierValue(CSSValueNormal);
1504 return zoomAdjustedPixelValue(style.columnGap(), style); 1504 return zoomAdjustedPixelValue(style.columnGap(), style);
1505 case CSSPropertyWebkitColumnRuleColor: 1505 case CSSPropertyWebkitColumnRuleColor:
1506 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor()); 1506 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor());
1507 case CSSPropertyWebkitColumnRuleStyle: 1507 case CSSPropertyWebkitColumnRuleStyle:
1508 return cssValuePool().createValue(style.columnRuleStyle()); 1508 return cssValuePool().createValue(style.columnRuleStyle());
1509 case CSSPropertyWebkitColumnRuleWidth: 1509 case CSSPropertyWebkitColumnRuleWidth:
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2581 case CSSPropertyAll: 2581 case CSSPropertyAll:
2582 return nullptr; 2582 return nullptr;
2583 default: 2583 default:
2584 break; 2584 break;
2585 } 2585 }
2586 ASSERT_NOT_REACHED(); 2586 ASSERT_NOT_REACHED();
2587 return nullptr; 2587 return nullptr;
2588 } 2588 }
2589 2589
2590 } 2590 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/parser/CSSParserFastPaths.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698