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

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

Issue 333423005: [CSS Grid Layout] Implement 'justify-items' parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 CSSPropertyFontFamily, 129 CSSPropertyFontFamily,
130 CSSPropertyFontKerning, 130 CSSPropertyFontKerning,
131 CSSPropertyFontSize, 131 CSSPropertyFontSize,
132 CSSPropertyFontStyle, 132 CSSPropertyFontStyle,
133 CSSPropertyFontVariant, 133 CSSPropertyFontVariant,
134 CSSPropertyFontVariantLigatures, 134 CSSPropertyFontVariantLigatures,
135 CSSPropertyFontWeight, 135 CSSPropertyFontWeight,
136 CSSPropertyHeight, 136 CSSPropertyHeight,
137 CSSPropertyImageRendering, 137 CSSPropertyImageRendering,
138 CSSPropertyIsolation, 138 CSSPropertyIsolation,
139 CSSPropertyJustifyItems,
139 CSSPropertyJustifySelf, 140 CSSPropertyJustifySelf,
140 CSSPropertyLeft, 141 CSSPropertyLeft,
141 CSSPropertyLetterSpacing, 142 CSSPropertyLetterSpacing,
142 CSSPropertyLineHeight, 143 CSSPropertyLineHeight,
143 CSSPropertyListStyleImage, 144 CSSPropertyListStyleImage,
144 CSSPropertyListStylePosition, 145 CSSPropertyListStylePosition,
145 CSSPropertyListStyleType, 146 CSSPropertyListStyleType,
146 CSSPropertyMarginBottom, 147 CSSPropertyMarginBottom,
147 CSSPropertyMarginLeft, 148 CSSPropertyMarginLeft,
148 CSSPropertyMarginRight, 149 CSSPropertyMarginRight,
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2020 return cssValuePool().createIdentifierValue(CSSValueAuto); 2021 return cssValuePool().createIdentifierValue(CSSValueAuto);
2021 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING); 2022 return cssValuePool().createValue(style->hyphenationString(), CSSPri mitiveValue::CSS_STRING);
2022 case CSSPropertyWebkitBorderFit: 2023 case CSSPropertyWebkitBorderFit:
2023 if (style->borderFit() == BorderFitBorder) 2024 if (style->borderFit() == BorderFitBorder)
2024 return cssValuePool().createIdentifierValue(CSSValueBorder); 2025 return cssValuePool().createIdentifierValue(CSSValueBorder);
2025 return cssValuePool().createIdentifierValue(CSSValueLines); 2026 return cssValuePool().createIdentifierValue(CSSValueLines);
2026 case CSSPropertyImageRendering: 2027 case CSSPropertyImageRendering:
2027 return CSSPrimitiveValue::create(style->imageRendering()); 2028 return CSSPrimitiveValue::create(style->imageRendering());
2028 case CSSPropertyIsolation: 2029 case CSSPropertyIsolation:
2029 return cssValuePool().createValue(style->isolation()); 2030 return cssValuePool().createValue(style->isolation());
2031 case CSSPropertyJustifyItems:
2032 return valueForItemPositionWithOverflowAlignment(style->justifyItems (), style->justifyItemsOverflowAlignment());
2030 case CSSPropertyJustifySelf: 2033 case CSSPropertyJustifySelf:
2031 return valueForItemPositionWithOverflowAlignment(style->justifySelf( ), style->justifySelfOverflowAlignment()); 2034 return valueForItemPositionWithOverflowAlignment(style->justifySelf( ), style->justifySelfOverflowAlignment());
2032 case CSSPropertyLeft: 2035 case CSSPropertyLeft:
2033 return valueForPositionOffset(*style, CSSPropertyLeft, renderer); 2036 return valueForPositionOffset(*style, CSSPropertyLeft, renderer);
2034 case CSSPropertyLetterSpacing: 2037 case CSSPropertyLetterSpacing:
2035 if (!style->letterSpacing()) 2038 if (!style->letterSpacing())
2036 return cssValuePool().createIdentifierValue(CSSValueNormal); 2039 return cssValuePool().createIdentifierValue(CSSValueNormal);
2037 return zoomAdjustedPixelValue(style->letterSpacing(), *style); 2040 return zoomAdjustedPixelValue(style->letterSpacing(), *style);
2038 case CSSPropertyWebkitLineClamp: 2041 case CSSPropertyWebkitLineClamp:
2039 if (style->lineClamp().isNone()) 2042 if (style->lineClamp().isNone())
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 return list.release(); 3060 return list.release();
3058 } 3061 }
3059 3062
3060 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 3063 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
3061 { 3064 {
3062 visitor->trace(m_node); 3065 visitor->trace(m_node);
3063 CSSStyleDeclaration::trace(visitor); 3066 CSSStyleDeclaration::trace(visitor);
3064 } 3067 }
3065 3068
3066 } // namespace WebCore 3069 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698