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

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

Issue 131773002: Broaden justify-self's parsing name (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | « no previous file | Source/core/css/CSSPrimitiveValueMappings.h » ('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 2090 matching lines...) Expand 10 before | Expand all | Expand 10 after
2101 if (style->borderFit() == BorderFitBorder) 2101 if (style->borderFit() == BorderFitBorder)
2102 return cssValuePool().createIdentifierValue(CSSValueBorder); 2102 return cssValuePool().createIdentifierValue(CSSValueBorder);
2103 return cssValuePool().createIdentifierValue(CSSValueLines); 2103 return cssValuePool().createIdentifierValue(CSSValueLines);
2104 case CSSPropertyImageRendering: 2104 case CSSPropertyImageRendering:
2105 return CSSPrimitiveValue::create(style->imageRendering()); 2105 return CSSPrimitiveValue::create(style->imageRendering());
2106 case CSSPropertyIsolation: 2106 case CSSPropertyIsolation:
2107 return cssValuePool().createValue(style->isolation()); 2107 return cssValuePool().createValue(style->isolation());
2108 case CSSPropertyJustifySelf: { 2108 case CSSPropertyJustifySelf: {
2109 RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated(); 2109 RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
2110 result->append(CSSPrimitiveValue::create(style->justifySelf())); 2110 result->append(CSSPrimitiveValue::create(style->justifySelf()));
2111 if (style->justifySelf() >= JustifySelfCenter && style->justifySelfO verflowAlignment() != JustifySelfOverflowAlignmentDefault) 2111 if (style->justifySelf() >= ItemPositionCenter && style->justifySelf OverflowAlignment() != OverflowAlignmentDefault)
2112 result->append(CSSPrimitiveValue::create(style->justifySelfOverf lowAlignment())); 2112 result->append(CSSPrimitiveValue::create(style->justifySelfOverf lowAlignment()));
2113 return result.release(); 2113 return result.release();
2114 } 2114 }
2115 case CSSPropertyLeft: 2115 case CSSPropertyLeft:
2116 return valueForPositionOffset(*style, CSSPropertyLeft, renderer); 2116 return valueForPositionOffset(*style, CSSPropertyLeft, renderer);
2117 case CSSPropertyLetterSpacing: 2117 case CSSPropertyLetterSpacing:
2118 if (!style->letterSpacing()) 2118 if (!style->letterSpacing())
2119 return cssValuePool().createIdentifierValue(CSSValueNormal); 2119 return cssValuePool().createIdentifierValue(CSSValueNormal);
2120 return zoomAdjustedPixelValue(style->letterSpacing(), *style); 2120 return zoomAdjustedPixelValue(style->letterSpacing(), *style);
2121 case CSSPropertyWebkitLineClamp: 2121 case CSSPropertyWebkitLineClamp:
(...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after
3253 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3253 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3254 CSSPropertyB ackgroundClip }; 3254 CSSPropertyB ackgroundClip };
3255 3255
3256 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3256 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3257 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3257 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3258 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3258 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3259 return list.release(); 3259 return list.release();
3260 } 3260 }
3261 3261
3262 } // namespace WebCore 3262 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698