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

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

Issue 26588002: Remove support for -webkit-line-clamp Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Base files missing... 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 | Annotate | Revision Log
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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 CSSPropertyGridColumnStart, 276 CSSPropertyGridColumnStart,
277 CSSPropertyGridDefinitionColumns, 277 CSSPropertyGridDefinitionColumns,
278 CSSPropertyGridDefinitionRows, 278 CSSPropertyGridDefinitionRows,
279 CSSPropertyGridRowEnd, 279 CSSPropertyGridRowEnd,
280 CSSPropertyGridRowStart, 280 CSSPropertyGridRowStart,
281 CSSPropertyWebkitHighlight, 281 CSSPropertyWebkitHighlight,
282 CSSPropertyWebkitHyphenateCharacter, 282 CSSPropertyWebkitHyphenateCharacter,
283 CSSPropertyWebkitLineAlign, 283 CSSPropertyWebkitLineAlign,
284 CSSPropertyWebkitLineBoxContain, 284 CSSPropertyWebkitLineBoxContain,
285 CSSPropertyWebkitLineBreak, 285 CSSPropertyWebkitLineBreak,
286 CSSPropertyWebkitLineClamp,
287 CSSPropertyWebkitLineGrid, 286 CSSPropertyWebkitLineGrid,
288 CSSPropertyWebkitLineSnap, 287 CSSPropertyWebkitLineSnap,
289 CSSPropertyWebkitLocale, 288 CSSPropertyWebkitLocale,
290 CSSPropertyWebkitMarginBeforeCollapse, 289 CSSPropertyWebkitMarginBeforeCollapse,
291 CSSPropertyWebkitMarginAfterCollapse, 290 CSSPropertyWebkitMarginAfterCollapse,
292 CSSPropertyWebkitMaskBoxImage, 291 CSSPropertyWebkitMaskBoxImage,
293 CSSPropertyWebkitMaskBoxImageOutset, 292 CSSPropertyWebkitMaskBoxImageOutset,
294 CSSPropertyWebkitMaskBoxImageRepeat, 293 CSSPropertyWebkitMaskBoxImageRepeat,
295 CSSPropertyWebkitMaskBoxImageSlice, 294 CSSPropertyWebkitMaskBoxImageSlice,
296 CSSPropertyWebkitMaskBoxImageSource, 295 CSSPropertyWebkitMaskBoxImageSource,
(...skipping 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after
2094 case CSSPropertyImageRendering: 2093 case CSSPropertyImageRendering:
2095 return CSSPrimitiveValue::create(style->imageRendering()); 2094 return CSSPrimitiveValue::create(style->imageRendering());
2096 case CSSPropertyIsolation: 2095 case CSSPropertyIsolation:
2097 return cssValuePool().createValue(style->isolation()); 2096 return cssValuePool().createValue(style->isolation());
2098 case CSSPropertyLeft: 2097 case CSSPropertyLeft:
2099 return valueForPositionOffset(style.get(), CSSPropertyLeft, renderer , m_node->document().renderView()); 2098 return valueForPositionOffset(style.get(), CSSPropertyLeft, renderer , m_node->document().renderView());
2100 case CSSPropertyLetterSpacing: 2099 case CSSPropertyLetterSpacing:
2101 if (!style->letterSpacing()) 2100 if (!style->letterSpacing())
2102 return cssValuePool().createIdentifierValue(CSSValueNormal); 2101 return cssValuePool().createIdentifierValue(CSSValueNormal);
2103 return zoomAdjustedPixelValue(style->letterSpacing(), style.get()); 2102 return zoomAdjustedPixelValue(style->letterSpacing(), style.get());
2104 case CSSPropertyWebkitLineClamp:
2105 if (style->lineClamp().isNone())
2106 return cssValuePool().createIdentifierValue(CSSValueNone);
2107 return cssValuePool().createValue(style->lineClamp().value(), style- >lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveVa lue::CSS_NUMBER);
2108 case CSSPropertyLineHeight: 2103 case CSSPropertyLineHeight:
2109 return valueForLineHeight(style.get(), m_node->document().renderView ()); 2104 return valueForLineHeight(style.get(), m_node->document().renderView ());
2110 case CSSPropertyListStyleImage: 2105 case CSSPropertyListStyleImage:
2111 if (style->listStyleImage()) 2106 if (style->listStyleImage())
2112 return style->listStyleImage()->cssValue(); 2107 return style->listStyleImage()->cssValue();
2113 return cssValuePool().createIdentifierValue(CSSValueNone); 2108 return cssValuePool().createIdentifierValue(CSSValueNone);
2114 case CSSPropertyListStylePosition: 2109 case CSSPropertyListStylePosition:
2115 return cssValuePool().createValue(style->listStylePosition()); 2110 return cssValuePool().createValue(style->listStylePosition());
2116 case CSSPropertyListStyleType: 2111 case CSSPropertyListStyleType:
2117 return cssValuePool().createValue(style->listStyleType()); 2112 return cssValuePool().createValue(style->listStyleType());
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
3234 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3229 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3235 CSSPropertyB ackgroundClip }; 3230 CSSPropertyB ackgroundClip };
3236 3231
3237 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3232 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3233 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3239 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3234 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3240 return list.release(); 3235 return list.release();
3241 } 3236 }
3242 3237
3243 } // namespace WebCore 3238 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698