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

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

Issue 17090005: [CSS Grid Layout] Implement 'justify-self' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Scrubbed and rebaselined patch Created 7 years, 1 month 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 CSSPropertyEmptyCells, 136 CSSPropertyEmptyCells,
137 CSSPropertyFloat, 137 CSSPropertyFloat,
138 CSSPropertyFontFamily, 138 CSSPropertyFontFamily,
139 CSSPropertyFontSize, 139 CSSPropertyFontSize,
140 CSSPropertyFontStyle, 140 CSSPropertyFontStyle,
141 CSSPropertyFontVariant, 141 CSSPropertyFontVariant,
142 CSSPropertyFontWeight, 142 CSSPropertyFontWeight,
143 CSSPropertyHeight, 143 CSSPropertyHeight,
144 CSSPropertyImageRendering, 144 CSSPropertyImageRendering,
145 CSSPropertyIsolation, 145 CSSPropertyIsolation,
146 CSSPropertyJustifySelf,
146 CSSPropertyLeft, 147 CSSPropertyLeft,
147 CSSPropertyLetterSpacing, 148 CSSPropertyLetterSpacing,
148 CSSPropertyLineHeight, 149 CSSPropertyLineHeight,
149 CSSPropertyListStyleImage, 150 CSSPropertyListStyleImage,
150 CSSPropertyListStylePosition, 151 CSSPropertyListStylePosition,
151 CSSPropertyListStyleType, 152 CSSPropertyListStyleType,
152 CSSPropertyMarginBottom, 153 CSSPropertyMarginBottom,
153 CSSPropertyMarginLeft, 154 CSSPropertyMarginLeft,
154 CSSPropertyMarginRight, 155 CSSPropertyMarginRight,
155 CSSPropertyMarginTop, 156 CSSPropertyMarginTop,
(...skipping 1933 matching lines...) Expand 10 before | Expand all | Expand 10 after
2089 return cssValuePool().createIdentifierValue(CSSValueAuto); 2090 return cssValuePool().createIdentifierValue(CSSValueAuto);
2090 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING); 2091 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING);
2091 case CSSPropertyWebkitBorderFit: 2092 case CSSPropertyWebkitBorderFit:
2092 if (style->borderFit() == BorderFitBorder) 2093 if (style->borderFit() == BorderFitBorder)
2093 return cssValuePool().createIdentifierValue(CSSValueBorder); 2094 return cssValuePool().createIdentifierValue(CSSValueBorder);
2094 return cssValuePool().createIdentifierValue(CSSValueLines); 2095 return cssValuePool().createIdentifierValue(CSSValueLines);
2095 case CSSPropertyImageRendering: 2096 case CSSPropertyImageRendering:
2096 return CSSPrimitiveValue::create(style->imageRendering()); 2097 return CSSPrimitiveValue::create(style->imageRendering());
2097 case CSSPropertyIsolation: 2098 case CSSPropertyIsolation:
2098 return cssValuePool().createValue(style->isolation()); 2099 return cssValuePool().createValue(style->isolation());
2100 case CSSPropertyJustifySelf: {
2101 RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
2102 result->append(CSSPrimitiveValue::create(style->justifySelf()));
2103 if (style->justifySelf() >= JustifySelfCenter && style->justifySelfO verflowAlignment() != JustifySelfOverflowAlignmentDefault)
2104 result->append(CSSPrimitiveValue::create(style->justifySelfOverf lowAlignment()));
2105 return result.release();
2106 }
2099 case CSSPropertyLeft: 2107 case CSSPropertyLeft:
2100 return valueForPositionOffset(*style, CSSPropertyLeft, renderer, m_n ode->document().renderView()); 2108 return valueForPositionOffset(*style, CSSPropertyLeft, renderer, m_n ode->document().renderView());
2101 case CSSPropertyLetterSpacing: 2109 case CSSPropertyLetterSpacing:
2102 if (!style->letterSpacing()) 2110 if (!style->letterSpacing())
2103 return cssValuePool().createIdentifierValue(CSSValueNormal); 2111 return cssValuePool().createIdentifierValue(CSSValueNormal);
2104 return zoomAdjustedPixelValue(style->letterSpacing(), *style); 2112 return zoomAdjustedPixelValue(style->letterSpacing(), *style);
2105 case CSSPropertyWebkitLineClamp: 2113 case CSSPropertyWebkitLineClamp:
2106 if (style->lineClamp().isNone()) 2114 if (style->lineClamp().isNone())
2107 return cssValuePool().createIdentifierValue(CSSValueNone); 2115 return cssValuePool().createIdentifierValue(CSSValueNone);
2108 return cssValuePool().createValue(style->lineClamp().value(), style- >lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveVa lue::CSS_NUMBER); 2116 return cssValuePool().createValue(style->lineClamp().value(), style- >lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveVa lue::CSS_NUMBER);
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
3237 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3245 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3238 CSSPropertyB ackgroundClip }; 3246 CSSPropertyB ackgroundClip };
3239 3247
3240 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3248 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3241 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3249 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3242 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3250 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3243 return list.release(); 3251 return list.release();
3244 } 3252 }
3245 3253
3246 } // namespace WebCore 3254 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698