| OLD | NEW |
| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 CSSPropertyFontStretch, | 119 CSSPropertyFontStretch, |
| 120 CSSPropertyFontStyle, | 120 CSSPropertyFontStyle, |
| 121 CSSPropertyFontVariant, | 121 CSSPropertyFontVariant, |
| 122 CSSPropertyFontVariantLigatures, | 122 CSSPropertyFontVariantLigatures, |
| 123 CSSPropertyFontWeight, | 123 CSSPropertyFontWeight, |
| 124 CSSPropertyHeight, | 124 CSSPropertyHeight, |
| 125 CSSPropertyImageRendering, | 125 CSSPropertyImageRendering, |
| 126 CSSPropertyLeft, | 126 CSSPropertyLeft, |
| 127 CSSPropertyLetterSpacing, | 127 CSSPropertyLetterSpacing, |
| 128 CSSPropertyLineHeight, | 128 CSSPropertyLineHeight, |
| 129 CSSPropertyListStyleImage, | |
| 130 CSSPropertyListStylePosition, | |
| 131 CSSPropertyListStyleType, | |
| 132 CSSPropertyMarginBottom, | 129 CSSPropertyMarginBottom, |
| 133 CSSPropertyMarginLeft, | 130 CSSPropertyMarginLeft, |
| 134 CSSPropertyMarginRight, | 131 CSSPropertyMarginRight, |
| 135 CSSPropertyMarginTop, | 132 CSSPropertyMarginTop, |
| 136 CSSPropertyMaxHeight, | 133 CSSPropertyMaxHeight, |
| 137 CSSPropertyMaxWidth, | 134 CSSPropertyMaxWidth, |
| 138 CSSPropertyMinHeight, | 135 CSSPropertyMinHeight, |
| 139 CSSPropertyMinWidth, | 136 CSSPropertyMinWidth, |
| 140 CSSPropertyObjectFit, | 137 CSSPropertyObjectFit, |
| 141 CSSPropertyObjectPosition, | 138 CSSPropertyObjectPosition, |
| (...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 case CSSPropertyImageRendering: | 1462 case CSSPropertyImageRendering: |
| 1466 return CSSPrimitiveValue::create(style->imageRendering()); | 1463 return CSSPrimitiveValue::create(style->imageRendering()); |
| 1467 case CSSPropertyLeft: | 1464 case CSSPropertyLeft: |
| 1468 return valueForPositionOffset(*style, CSSPropertyLeft, renderer); | 1465 return valueForPositionOffset(*style, CSSPropertyLeft, renderer); |
| 1469 case CSSPropertyLetterSpacing: | 1466 case CSSPropertyLetterSpacing: |
| 1470 if (!style->letterSpacing()) | 1467 if (!style->letterSpacing()) |
| 1471 return cssValuePool().createIdentifierValue(CSSValueNormal); | 1468 return cssValuePool().createIdentifierValue(CSSValueNormal); |
| 1472 return pixelValue(style->letterSpacing(), *style); | 1469 return pixelValue(style->letterSpacing(), *style); |
| 1473 case CSSPropertyLineHeight: | 1470 case CSSPropertyLineHeight: |
| 1474 return valueForLineHeight(*style); | 1471 return valueForLineHeight(*style); |
| 1475 case CSSPropertyListStyleImage: | |
| 1476 if (style->listStyleImage()) | |
| 1477 return style->listStyleImage()->cssValue(); | |
| 1478 return cssValuePool().createIdentifierValue(CSSValueNone); | |
| 1479 case CSSPropertyListStylePosition: | |
| 1480 return cssValuePool().createValue(style->listStylePosition()); | |
| 1481 case CSSPropertyListStyleType: | |
| 1482 return cssValuePool().createValue(style->listStyleType()); | |
| 1483 case CSSPropertyWebkitLocale: | 1472 case CSSPropertyWebkitLocale: |
| 1484 if (style->locale().isNull()) | 1473 if (style->locale().isNull()) |
| 1485 return cssValuePool().createIdentifierValue(CSSValueAuto); | 1474 return cssValuePool().createIdentifierValue(CSSValueAuto); |
| 1486 return cssValuePool().createValue(style->locale(), CSSPrimitiveValue
::CSS_STRING); | 1475 return cssValuePool().createValue(style->locale(), CSSPrimitiveValue
::CSS_STRING); |
| 1487 case CSSPropertyMarginTop: { | 1476 case CSSPropertyMarginTop: { |
| 1488 Length marginTop = style->marginTop(); | 1477 Length marginTop = style->marginTop(); |
| 1489 if (marginTop.isFixed() || !renderer || !renderer->isBox()) | 1478 if (marginTop.isFixed() || !renderer || !renderer->isBox()) |
| 1490 return pixelValueForLength(marginTop, *style); | 1479 return pixelValueForLength(marginTop, *style); |
| 1491 return pixelValue(toRenderBox(renderer)->marginTop(), *style); | 1480 return pixelValue(toRenderBox(renderer)->marginTop(), *style); |
| 1492 } | 1481 } |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2038 case CSSPropertyBorderRadius: | 2027 case CSSPropertyBorderRadius: |
| 2039 return valueForBorderRadiusShorthand(*style); | 2028 return valueForBorderRadiusShorthand(*style); |
| 2040 case CSSPropertyBorderRight: | 2029 case CSSPropertyBorderRight: |
| 2041 return valuesForShorthandProperty(borderRightShorthand()); | 2030 return valuesForShorthandProperty(borderRightShorthand()); |
| 2042 case CSSPropertyBorderStyle: | 2031 case CSSPropertyBorderStyle: |
| 2043 return valuesForSidesShorthand(borderStyleShorthand()); | 2032 return valuesForSidesShorthand(borderStyleShorthand()); |
| 2044 case CSSPropertyBorderTop: | 2033 case CSSPropertyBorderTop: |
| 2045 return valuesForShorthandProperty(borderTopShorthand()); | 2034 return valuesForShorthandProperty(borderTopShorthand()); |
| 2046 case CSSPropertyBorderWidth: | 2035 case CSSPropertyBorderWidth: |
| 2047 return valuesForSidesShorthand(borderWidthShorthand()); | 2036 return valuesForSidesShorthand(borderWidthShorthand()); |
| 2048 case CSSPropertyListStyle: | |
| 2049 return valuesForShorthandProperty(listStyleShorthand()); | |
| 2050 case CSSPropertyMargin: | 2037 case CSSPropertyMargin: |
| 2051 return valuesForSidesShorthand(marginShorthand()); | 2038 return valuesForSidesShorthand(marginShorthand()); |
| 2052 case CSSPropertyOutline: | 2039 case CSSPropertyOutline: |
| 2053 return valuesForShorthandProperty(outlineShorthand()); | 2040 return valuesForShorthandProperty(outlineShorthand()); |
| 2054 case CSSPropertyPadding: | 2041 case CSSPropertyPadding: |
| 2055 return valuesForSidesShorthand(paddingShorthand()); | 2042 return valuesForSidesShorthand(paddingShorthand()); |
| 2056 /* Individual properties not part of the spec */ | 2043 /* Individual properties not part of the spec */ |
| 2057 case CSSPropertyBackgroundRepeatX: | 2044 case CSSPropertyBackgroundRepeatX: |
| 2058 case CSSPropertyBackgroundRepeatY: | 2045 case CSSPropertyBackgroundRepeatY: |
| 2059 break; | 2046 break; |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2289 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, | 2276 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB
ackgroundSize, CSSPropertyBackgroundOrigin, |
| 2290 CSSPropertyB
ackgroundClip }; | 2277 CSSPropertyB
ackgroundClip }; |
| 2291 | 2278 |
| 2292 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); | 2279 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); |
| 2293 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash
Seperator)))); | 2280 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash
Seperator)))); |
| 2294 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe
perator)))); | 2281 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa
ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe
perator)))); |
| 2295 return list.release(); | 2282 return list.release(); |
| 2296 } | 2283 } |
| 2297 | 2284 |
| 2298 } // namespace blink | 2285 } // namespace blink |
| OLD | NEW |