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

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

Issue 1710003002: Unprefix multicol properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase master Created 4 years, 10 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 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 case CSSPropertyBoxShadow: 1549 case CSSPropertyBoxShadow:
1550 return valueForShadowList(style.boxShadow(), style, true); 1550 return valueForShadowList(style.boxShadow(), style, true);
1551 case CSSPropertyCaptionSide: 1551 case CSSPropertyCaptionSide:
1552 return cssValuePool().createValue(style.captionSide()); 1552 return cssValuePool().createValue(style.captionSide());
1553 case CSSPropertyClear: 1553 case CSSPropertyClear:
1554 return cssValuePool().createValue(style.clear()); 1554 return cssValuePool().createValue(style.clear());
1555 case CSSPropertyColor: 1555 case CSSPropertyColor:
1556 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb()); 1556 return cssValuePool().createColorValue(allowVisitedStyle ? style.visited DependentColor(CSSPropertyColor).rgb() : style.color().rgb());
1557 case CSSPropertyWebkitPrintColorAdjust: 1557 case CSSPropertyWebkitPrintColorAdjust:
1558 return cssValuePool().createValue(style.printColorAdjust()); 1558 return cssValuePool().createValue(style.printColorAdjust());
1559 case CSSPropertyWebkitColumnCount: 1559 case CSSPropertyColumnCount:
1560 if (style.hasAutoColumnCount()) 1560 if (style.hasAutoColumnCount())
1561 return cssValuePool().createIdentifierValue(CSSValueAuto); 1561 return cssValuePool().createIdentifierValue(CSSValueAuto);
1562 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::UnitType::Number); 1562 return cssValuePool().createValue(style.columnCount(), CSSPrimitiveValue ::UnitType::Number);
1563 case CSSPropertyColumnFill: 1563 case CSSPropertyColumnFill:
1564 ASSERT(RuntimeEnabledFeatures::columnFillEnabled()); 1564 ASSERT(RuntimeEnabledFeatures::columnFillEnabled());
1565 return cssValuePool().createValue(style.columnFill()); 1565 return cssValuePool().createValue(style.columnFill());
1566 case CSSPropertyWebkitColumnGap: 1566 case CSSPropertyColumnGap:
1567 if (style.hasNormalColumnGap()) 1567 if (style.hasNormalColumnGap())
1568 return cssValuePool().createIdentifierValue(CSSValueNormal); 1568 return cssValuePool().createIdentifierValue(CSSValueNormal);
1569 return zoomAdjustedPixelValue(style.columnGap(), style); 1569 return zoomAdjustedPixelValue(style.columnGap(), style);
1570 case CSSPropertyWebkitColumnRuleColor: 1570 case CSSPropertyColumnRuleColor:
1571 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor()); 1571 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.columnRuleColor());
1572 case CSSPropertyWebkitColumnRuleStyle: 1572 case CSSPropertyColumnRuleStyle:
1573 return cssValuePool().createValue(style.columnRuleStyle()); 1573 return cssValuePool().createValue(style.columnRuleStyle());
1574 case CSSPropertyWebkitColumnRuleWidth: 1574 case CSSPropertyColumnRuleWidth:
1575 return zoomAdjustedPixelValue(style.columnRuleWidth(), style); 1575 return zoomAdjustedPixelValue(style.columnRuleWidth(), style);
1576 case CSSPropertyWebkitColumnSpan: 1576 case CSSPropertyColumnSpan:
1577 return cssValuePool().createIdentifierValue(style.columnSpan() ? CSSValu eAll : CSSValueNone); 1577 return cssValuePool().createIdentifierValue(style.columnSpan() ? CSSValu eAll : CSSValueNone);
1578 case CSSPropertyWebkitColumnBreakAfter: 1578 case CSSPropertyWebkitColumnBreakAfter:
1579 return cssValuePool().createValue(mapToColumnBreakValue(style.breakAfter ())); 1579 return cssValuePool().createValue(mapToColumnBreakValue(style.breakAfter ()));
1580 case CSSPropertyWebkitColumnBreakBefore: 1580 case CSSPropertyWebkitColumnBreakBefore:
1581 return cssValuePool().createValue(mapToColumnBreakValue(style.breakBefor e())); 1581 return cssValuePool().createValue(mapToColumnBreakValue(style.breakBefor e()));
1582 case CSSPropertyWebkitColumnBreakInside: 1582 case CSSPropertyWebkitColumnBreakInside:
1583 return cssValuePool().createValue(mapToColumnBreakValue(style.breakInsid e())); 1583 return cssValuePool().createValue(mapToColumnBreakValue(style.breakInsid e()));
1584 case CSSPropertyWebkitColumnWidth: 1584 case CSSPropertyColumnWidth:
1585 if (style.hasAutoColumnWidth()) 1585 if (style.hasAutoColumnWidth())
1586 return cssValuePool().createIdentifierValue(CSSValueAuto); 1586 return cssValuePool().createIdentifierValue(CSSValueAuto);
1587 return zoomAdjustedPixelValue(style.columnWidth(), style); 1587 return zoomAdjustedPixelValue(style.columnWidth(), style);
1588 case CSSPropertyTabSize: 1588 case CSSPropertyTabSize:
1589 return cssValuePool().createValue( 1589 return cssValuePool().createValue(
1590 style.tabSize().getPixelSize(1.0), style.tabSize().isSpaces() ? CSSP rimitiveValue::UnitType::Number : CSSPrimitiveValue::UnitType::Pixels); 1590 style.tabSize().getPixelSize(1.0), style.tabSize().isSpaces() ? CSSP rimitiveValue::UnitType::Number : CSSPrimitiveValue::UnitType::Pixels);
1591 case CSSPropertyCursor: { 1591 case CSSPropertyCursor: {
1592 RefPtrWillBeRawPtr<CSSValueList> list = nullptr; 1592 RefPtrWillBeRawPtr<CSSValueList> list = nullptr;
1593 CursorList* cursors = style.cursors(); 1593 CursorList* cursors = style.cursors();
1594 if (cursors && cursors->size() > 0) { 1594 if (cursors && cursors->size() > 0) {
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
2438 case CSSPropertyBorderRadius: 2438 case CSSPropertyBorderRadius:
2439 return valueForBorderRadiusShorthand(style); 2439 return valueForBorderRadiusShorthand(style);
2440 case CSSPropertyBorderRight: 2440 case CSSPropertyBorderRight:
2441 return valuesForShorthandProperty(borderRightShorthand(), style, layoutO bject, styledNode, allowVisitedStyle); 2441 return valuesForShorthandProperty(borderRightShorthand(), style, layoutO bject, styledNode, allowVisitedStyle);
2442 case CSSPropertyBorderStyle: 2442 case CSSPropertyBorderStyle:
2443 return valuesForSidesShorthand(borderStyleShorthand(), style, layoutObje ct, styledNode, allowVisitedStyle); 2443 return valuesForSidesShorthand(borderStyleShorthand(), style, layoutObje ct, styledNode, allowVisitedStyle);
2444 case CSSPropertyBorderTop: 2444 case CSSPropertyBorderTop:
2445 return valuesForShorthandProperty(borderTopShorthand(), style, layoutObj ect, styledNode, allowVisitedStyle); 2445 return valuesForShorthandProperty(borderTopShorthand(), style, layoutObj ect, styledNode, allowVisitedStyle);
2446 case CSSPropertyBorderWidth: 2446 case CSSPropertyBorderWidth:
2447 return valuesForSidesShorthand(borderWidthShorthand(), style, layoutObje ct, styledNode, allowVisitedStyle); 2447 return valuesForSidesShorthand(borderWidthShorthand(), style, layoutObje ct, styledNode, allowVisitedStyle);
2448 case CSSPropertyWebkitColumnRule: 2448 case CSSPropertyColumnRule:
2449 return valuesForShorthandProperty(webkitColumnRuleShorthand(), style, la youtObject, styledNode, allowVisitedStyle); 2449 return valuesForShorthandProperty(columnRuleShorthand(), style, layoutOb ject, styledNode, allowVisitedStyle);
2450 case CSSPropertyWebkitColumns: 2450 case CSSPropertyColumns:
2451 return valuesForShorthandProperty(webkitColumnsShorthand(), style, layou tObject, styledNode, allowVisitedStyle); 2451 return valuesForShorthandProperty(columnsShorthand(), style, layoutObjec t, styledNode, allowVisitedStyle);
2452 case CSSPropertyListStyle: 2452 case CSSPropertyListStyle:
2453 return valuesForShorthandProperty(listStyleShorthand(), style, layoutObj ect, styledNode, allowVisitedStyle); 2453 return valuesForShorthandProperty(listStyleShorthand(), style, layoutObj ect, styledNode, allowVisitedStyle);
2454 case CSSPropertyMargin: 2454 case CSSPropertyMargin:
2455 return valuesForSidesShorthand(marginShorthand(), style, layoutObject, s tyledNode, allowVisitedStyle); 2455 return valuesForSidesShorthand(marginShorthand(), style, layoutObject, s tyledNode, allowVisitedStyle);
2456 case CSSPropertyOutline: 2456 case CSSPropertyOutline:
2457 return valuesForShorthandProperty(outlineShorthand(), style, layoutObjec t, styledNode, allowVisitedStyle); 2457 return valuesForShorthandProperty(outlineShorthand(), style, layoutObjec t, styledNode, allowVisitedStyle);
2458 case CSSPropertyPadding: 2458 case CSSPropertyPadding:
2459 return valuesForSidesShorthand(paddingShorthand(), style, layoutObject, styledNode, allowVisitedStyle); 2459 return valuesForSidesShorthand(paddingShorthand(), style, layoutObject, styledNode, allowVisitedStyle);
2460 // Individual properties not part of the spec. 2460 // Individual properties not part of the spec.
2461 case CSSPropertyBackgroundRepeatX: 2461 case CSSPropertyBackgroundRepeatX:
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2753 case CSSPropertyAll: 2753 case CSSPropertyAll:
2754 return nullptr; 2754 return nullptr;
2755 default: 2755 default:
2756 break; 2756 break;
2757 } 2757 }
2758 ASSERT_NOT_REACHED(); 2758 ASSERT_NOT_REACHED();
2759 return nullptr; 2759 return nullptr;
2760 } 2760 }
2761 2761
2762 } // namespace blink 2762 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698