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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 761283002: Remove webkit-line-clamp (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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 * 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 CSSPropertyFlexGrow, 222 CSSPropertyFlexGrow,
223 CSSPropertyFlexShrink, 223 CSSPropertyFlexShrink,
224 CSSPropertyFlexDirection, 224 CSSPropertyFlexDirection,
225 CSSPropertyFlexWrap, 225 CSSPropertyFlexWrap,
226 CSSPropertyJustifyContent, 226 CSSPropertyJustifyContent,
227 CSSPropertyWebkitFontSmoothing, 227 CSSPropertyWebkitFontSmoothing,
228 CSSPropertyWebkitHighlight, 228 CSSPropertyWebkitHighlight,
229 CSSPropertyWebkitHyphenateCharacter, 229 CSSPropertyWebkitHyphenateCharacter,
230 CSSPropertyWebkitLineBoxContain, 230 CSSPropertyWebkitLineBoxContain,
231 CSSPropertyWebkitLineBreak, 231 CSSPropertyWebkitLineBreak,
232 CSSPropertyWebkitLineClamp,
233 CSSPropertyWebkitLocale, 232 CSSPropertyWebkitLocale,
234 CSSPropertyWebkitMarginBeforeCollapse, 233 CSSPropertyWebkitMarginBeforeCollapse,
235 CSSPropertyWebkitMarginAfterCollapse, 234 CSSPropertyWebkitMarginAfterCollapse,
236 CSSPropertyWebkitMaskBoxImage, 235 CSSPropertyWebkitMaskBoxImage,
237 CSSPropertyWebkitMaskBoxImageOutset, 236 CSSPropertyWebkitMaskBoxImageOutset,
238 CSSPropertyWebkitMaskBoxImageRepeat, 237 CSSPropertyWebkitMaskBoxImageRepeat,
239 CSSPropertyWebkitMaskBoxImageSlice, 238 CSSPropertyWebkitMaskBoxImageSlice,
240 CSSPropertyWebkitMaskBoxImageSource, 239 CSSPropertyWebkitMaskBoxImageSource,
241 CSSPropertyWebkitMaskBoxImageWidth, 240 CSSPropertyWebkitMaskBoxImageWidth,
242 CSSPropertyWebkitMaskClip, 241 CSSPropertyWebkitMaskClip,
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 return cssValuePool().createIdentifierValue(CSSValueAuto); 1566 return cssValuePool().createIdentifierValue(CSSValueAuto);
1568 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING); 1567 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING);
1569 case CSSPropertyImageRendering: 1568 case CSSPropertyImageRendering:
1570 return CSSPrimitiveValue::create(style->imageRendering()); 1569 return CSSPrimitiveValue::create(style->imageRendering());
1571 case CSSPropertyLeft: 1570 case CSSPropertyLeft:
1572 return valueForPositionOffset(*style, CSSPropertyLeft, renderer); 1571 return valueForPositionOffset(*style, CSSPropertyLeft, renderer);
1573 case CSSPropertyLetterSpacing: 1572 case CSSPropertyLetterSpacing:
1574 if (!style->letterSpacing()) 1573 if (!style->letterSpacing())
1575 return cssValuePool().createIdentifierValue(CSSValueNormal); 1574 return cssValuePool().createIdentifierValue(CSSValueNormal);
1576 return pixelValue(style->letterSpacing(), *style); 1575 return pixelValue(style->letterSpacing(), *style);
1577 case CSSPropertyWebkitLineClamp:
1578 if (style->lineClamp().isNone())
1579 return cssValuePool().createIdentifierValue(CSSValueNone);
1580 return cssValuePool().createValue(style->lineClamp().value(), style- >lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveVa lue::CSS_NUMBER);
1581 case CSSPropertyLineHeight: 1576 case CSSPropertyLineHeight:
1582 return valueForLineHeight(*style); 1577 return valueForLineHeight(*style);
1583 case CSSPropertyListStyleImage: 1578 case CSSPropertyListStyleImage:
1584 if (style->listStyleImage()) 1579 if (style->listStyleImage())
1585 return style->listStyleImage()->cssValue(); 1580 return style->listStyleImage()->cssValue();
1586 return cssValuePool().createIdentifierValue(CSSValueNone); 1581 return cssValuePool().createIdentifierValue(CSSValueNone);
1587 case CSSPropertyListStylePosition: 1582 case CSSPropertyListStylePosition:
1588 return cssValuePool().createValue(style->listStylePosition()); 1583 return cssValuePool().createValue(style->listStylePosition());
1589 case CSSPropertyListStyleType: 1584 case CSSPropertyListStyleType:
1590 return cssValuePool().createValue(style->listStyleType()); 1585 return cssValuePool().createValue(style->listStyleType());
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
2459 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2454 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2460 CSSPropertyB ackgroundClip }; 2455 CSSPropertyB ackgroundClip };
2461 2456
2462 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2457 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2463 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2458 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2464 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2459 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2465 return list.release(); 2460 return list.release();
2466 } 2461 }
2467 2462
2468 } // namespace blink 2463 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698