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

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

Issue 20526006: Remove -webkit-hyphens and -webkit-hyphenate-limit-* properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: init removal Created 7 years, 5 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/core.gypi ('k') | Source/core/css/CSSParser-in.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 * 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 CSSPropertyGridAutoFlow, 260 CSSPropertyGridAutoFlow,
261 CSSPropertyGridAutoRows, 261 CSSPropertyGridAutoRows,
262 CSSPropertyGridColumnEnd, 262 CSSPropertyGridColumnEnd,
263 CSSPropertyGridColumnStart, 263 CSSPropertyGridColumnStart,
264 CSSPropertyGridDefinitionColumns, 264 CSSPropertyGridDefinitionColumns,
265 CSSPropertyGridDefinitionRows, 265 CSSPropertyGridDefinitionRows,
266 CSSPropertyGridRowEnd, 266 CSSPropertyGridRowEnd,
267 CSSPropertyGridRowStart, 267 CSSPropertyGridRowStart,
268 CSSPropertyWebkitHighlight, 268 CSSPropertyWebkitHighlight,
269 CSSPropertyWebkitHyphenateCharacter, 269 CSSPropertyWebkitHyphenateCharacter,
270 CSSPropertyWebkitHyphenateLimitAfter,
271 CSSPropertyWebkitHyphenateLimitBefore,
272 CSSPropertyWebkitHyphenateLimitLines,
273 CSSPropertyWebkitHyphens,
274 CSSPropertyWebkitLineAlign, 270 CSSPropertyWebkitLineAlign,
275 CSSPropertyWebkitLineBoxContain, 271 CSSPropertyWebkitLineBoxContain,
276 CSSPropertyWebkitLineBreak, 272 CSSPropertyWebkitLineBreak,
277 CSSPropertyWebkitLineClamp, 273 CSSPropertyWebkitLineClamp,
278 CSSPropertyWebkitLineGrid, 274 CSSPropertyWebkitLineGrid,
279 CSSPropertyWebkitLineSnap, 275 CSSPropertyWebkitLineSnap,
280 CSSPropertyWebkitLocale, 276 CSSPropertyWebkitLocale,
281 CSSPropertyWebkitMarginBeforeCollapse, 277 CSSPropertyWebkitMarginBeforeCollapse,
282 CSSPropertyWebkitMarginAfterCollapse, 278 CSSPropertyWebkitMarginAfterCollapse,
283 CSSPropertyWebkitMarqueeDirection, 279 CSSPropertyWebkitMarqueeDirection,
(...skipping 1702 matching lines...) Expand 10 before | Expand all | Expand 10 after
1986 // the "height" property does not apply for non-replaced inline elements. 1982 // the "height" property does not apply for non-replaced inline elements.
1987 if (!renderer->isReplaced() && renderer->isInline()) 1983 if (!renderer->isReplaced() && renderer->isInline())
1988 return cssValuePool().createIdentifierValue(CSSValueAuto); 1984 return cssValuePool().createIdentifierValue(CSSValueAuto);
1989 return zoomAdjustedPixelValue(sizingBox(renderer).height(), styl e.get()); 1985 return zoomAdjustedPixelValue(sizingBox(renderer).height(), styl e.get());
1990 } 1986 }
1991 return zoomAdjustedPixelValueForLength(style->height(), style.get()) ; 1987 return zoomAdjustedPixelValueForLength(style->height(), style.get()) ;
1992 case CSSPropertyWebkitHighlight: 1988 case CSSPropertyWebkitHighlight:
1993 if (style->highlight() == nullAtom) 1989 if (style->highlight() == nullAtom)
1994 return cssValuePool().createIdentifierValue(CSSValueNone); 1990 return cssValuePool().createIdentifierValue(CSSValueNone);
1995 return cssValuePool().createValue(style->highlight(), CSSPrimitiveVa lue::CSS_STRING); 1991 return cssValuePool().createValue(style->highlight(), CSSPrimitiveVa lue::CSS_STRING);
1996 case CSSPropertyWebkitHyphens:
1997 return cssValuePool().createValue(style->hyphens());
1998 case CSSPropertyWebkitHyphenateCharacter: 1992 case CSSPropertyWebkitHyphenateCharacter:
1999 if (style->hyphenationString().isNull()) 1993 if (style->hyphenationString().isNull())
2000 return cssValuePool().createIdentifierValue(CSSValueAuto); 1994 return cssValuePool().createIdentifierValue(CSSValueAuto);
2001 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING); 1995 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING);
2002 case CSSPropertyWebkitHyphenateLimitAfter:
2003 if (style->hyphenationLimitAfter() < 0)
2004 return CSSPrimitiveValue::createIdentifier(CSSValueAuto);
2005 return CSSPrimitiveValue::create(style->hyphenationLimitAfter(), CSS PrimitiveValue::CSS_NUMBER);
2006 case CSSPropertyWebkitHyphenateLimitBefore:
2007 if (style->hyphenationLimitBefore() < 0)
2008 return CSSPrimitiveValue::createIdentifier(CSSValueAuto);
2009 return CSSPrimitiveValue::create(style->hyphenationLimitBefore(), CS SPrimitiveValue::CSS_NUMBER);
2010 case CSSPropertyWebkitHyphenateLimitLines:
2011 if (style->hyphenationLimitLines() < 0)
2012 return CSSPrimitiveValue::createIdentifier(CSSValueNoLimit);
2013 return CSSPrimitiveValue::create(style->hyphenationLimitLines(), CSS PrimitiveValue::CSS_NUMBER);
2014 case CSSPropertyWebkitBorderFit: 1996 case CSSPropertyWebkitBorderFit:
2015 if (style->borderFit() == BorderFitBorder) 1997 if (style->borderFit() == BorderFitBorder)
2016 return cssValuePool().createIdentifierValue(CSSValueBorder); 1998 return cssValuePool().createIdentifierValue(CSSValueBorder);
2017 return cssValuePool().createIdentifierValue(CSSValueLines); 1999 return cssValuePool().createIdentifierValue(CSSValueLines);
2018 case CSSPropertyImageRendering: 2000 case CSSPropertyImageRendering:
2019 return CSSPrimitiveValue::create(style->imageRendering()); 2001 return CSSPrimitiveValue::create(style->imageRendering());
2020 case CSSPropertyLeft: 2002 case CSSPropertyLeft:
2021 return getPositionOffsetValue(style.get(), CSSPropertyLeft, renderer , m_node->document()->renderView()); 2003 return getPositionOffsetValue(style.get(), CSSPropertyLeft, renderer , m_node->document()->renderView());
2022 case CSSPropertyLetterSpacing: 2004 case CSSPropertyLetterSpacing:
2023 if (!style->letterSpacing()) 2005 if (!style->letterSpacing())
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
3077 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3059 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3078 CSSPropertyB ackgroundClip }; 3060 CSSPropertyB ackgroundClip };
3079 3061
3080 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3062 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3081 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3063 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3082 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3064 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3083 return list.release(); 3065 return list.release();
3084 } 3066 }
3085 3067
3086 } // namespace WebCore 3068 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698