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

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

Issue 15758002: Unprefix Flexbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests Created 7 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 | 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 CSSPropertyWebkitColumnAxis, 237 CSSPropertyWebkitColumnAxis,
238 CSSPropertyWebkitColumnCount, 238 CSSPropertyWebkitColumnCount,
239 CSSPropertyWebkitColumnGap, 239 CSSPropertyWebkitColumnGap,
240 CSSPropertyWebkitColumnProgression, 240 CSSPropertyWebkitColumnProgression,
241 CSSPropertyWebkitColumnRuleColor, 241 CSSPropertyWebkitColumnRuleColor,
242 CSSPropertyWebkitColumnRuleStyle, 242 CSSPropertyWebkitColumnRuleStyle,
243 CSSPropertyWebkitColumnRuleWidth, 243 CSSPropertyWebkitColumnRuleWidth,
244 CSSPropertyWebkitColumnSpan, 244 CSSPropertyWebkitColumnSpan,
245 CSSPropertyWebkitColumnWidth, 245 CSSPropertyWebkitColumnWidth,
246 CSSPropertyWebkitFilter, 246 CSSPropertyWebkitFilter,
247 CSSPropertyWebkitAlignContent, 247 CSSPropertyAlignContent,
248 CSSPropertyWebkitAlignItems, 248 CSSPropertyAlignItems,
249 CSSPropertyWebkitAlignSelf, 249 CSSPropertyAlignSelf,
250 CSSPropertyWebkitFlexBasis, 250 CSSPropertyFlexBasis,
251 CSSPropertyWebkitFlexGrow, 251 CSSPropertyFlexGrow,
252 CSSPropertyWebkitFlexShrink, 252 CSSPropertyFlexShrink,
253 CSSPropertyWebkitFlexDirection, 253 CSSPropertyFlexDirection,
254 CSSPropertyWebkitFlexWrap, 254 CSSPropertyFlexWrap,
255 CSSPropertyWebkitJustifyContent, 255 CSSPropertyJustifyContent,
256 CSSPropertyWebkitFontKerning, 256 CSSPropertyWebkitFontKerning,
257 CSSPropertyWebkitFontSmoothing, 257 CSSPropertyWebkitFontSmoothing,
258 CSSPropertyWebkitFontVariantLigatures, 258 CSSPropertyWebkitFontVariantLigatures,
259 CSSPropertyGridAutoColumns, 259 CSSPropertyGridAutoColumns,
260 CSSPropertyGridAutoFlow, 260 CSSPropertyGridAutoFlow,
261 CSSPropertyGridAutoRows, 261 CSSPropertyGridAutoRows,
262 CSSPropertyGridColumns, 262 CSSPropertyGridColumns,
263 CSSPropertyGridRows, 263 CSSPropertyGridRows,
264 CSSPropertyGridStart, 264 CSSPropertyGridStart,
265 CSSPropertyGridEnd, 265 CSSPropertyGridEnd,
(...skipping 24 matching lines...) Expand all
290 CSSPropertyWebkitMaskBoxImageSlice, 290 CSSPropertyWebkitMaskBoxImageSlice,
291 CSSPropertyWebkitMaskBoxImageSource, 291 CSSPropertyWebkitMaskBoxImageSource,
292 CSSPropertyWebkitMaskBoxImageWidth, 292 CSSPropertyWebkitMaskBoxImageWidth,
293 CSSPropertyWebkitMaskClip, 293 CSSPropertyWebkitMaskClip,
294 CSSPropertyWebkitMaskComposite, 294 CSSPropertyWebkitMaskComposite,
295 CSSPropertyWebkitMaskImage, 295 CSSPropertyWebkitMaskImage,
296 CSSPropertyWebkitMaskOrigin, 296 CSSPropertyWebkitMaskOrigin,
297 CSSPropertyWebkitMaskPosition, 297 CSSPropertyWebkitMaskPosition,
298 CSSPropertyWebkitMaskRepeat, 298 CSSPropertyWebkitMaskRepeat,
299 CSSPropertyWebkitMaskSize, 299 CSSPropertyWebkitMaskSize,
300 CSSPropertyWebkitOrder, 300 CSSPropertyOrder,
301 CSSPropertyWebkitPerspective, 301 CSSPropertyWebkitPerspective,
302 CSSPropertyWebkitPerspectiveOrigin, 302 CSSPropertyWebkitPerspectiveOrigin,
303 CSSPropertyWebkitPrintColorAdjust, 303 CSSPropertyWebkitPrintColorAdjust,
304 CSSPropertyWebkitRtlOrdering, 304 CSSPropertyWebkitRtlOrdering,
305 CSSPropertyWebkitShapeInside, 305 CSSPropertyWebkitShapeInside,
306 CSSPropertyWebkitShapeOutside, 306 CSSPropertyWebkitShapeOutside,
307 CSSPropertyWebkitTapHighlightColor, 307 CSSPropertyWebkitTapHighlightColor,
308 CSSPropertyWebkitTextCombine, 308 CSSPropertyWebkitTextCombine,
309 CSSPropertyWebkitTextDecorationsInEffect, 309 CSSPropertyWebkitTextDecorationsInEffect,
310 CSSPropertyWebkitTextEmphasisColor, 310 CSSPropertyWebkitTextEmphasisColor,
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1834 return list.release(); 1834 return list.release();
1835 } 1835 }
1836 return value.release(); 1836 return value.release();
1837 } 1837 }
1838 case CSSPropertyDirection: 1838 case CSSPropertyDirection:
1839 return cssValuePool().createValue(style->direction()); 1839 return cssValuePool().createValue(style->direction());
1840 case CSSPropertyDisplay: 1840 case CSSPropertyDisplay:
1841 return cssValuePool().createValue(style->display()); 1841 return cssValuePool().createValue(style->display());
1842 case CSSPropertyEmptyCells: 1842 case CSSPropertyEmptyCells:
1843 return cssValuePool().createValue(style->emptyCells()); 1843 return cssValuePool().createValue(style->emptyCells());
1844 case CSSPropertyWebkitAlignContent: 1844 case CSSPropertyAlignContent:
1845 return cssValuePool().createValue(style->alignContent()); 1845 return cssValuePool().createValue(style->alignContent());
1846 case CSSPropertyWebkitAlignItems: 1846 case CSSPropertyAlignItems:
1847 return cssValuePool().createValue(style->alignItems()); 1847 return cssValuePool().createValue(style->alignItems());
1848 case CSSPropertyWebkitAlignSelf: 1848 case CSSPropertyAlignSelf:
1849 if (style->alignSelf() == AlignAuto) { 1849 if (style->alignSelf() == AlignAuto) {
1850 Node* parent = styledNode->parentNode(); 1850 Node* parent = styledNode->parentNode();
1851 if (parent && parent->computedStyle()) 1851 if (parent && parent->computedStyle())
1852 return cssValuePool().createValue(parent->computedStyle()->a lignItems()); 1852 return cssValuePool().createValue(parent->computedStyle()->a lignItems());
1853 return cssValuePool().createValue(AlignStretch); 1853 return cssValuePool().createValue(AlignStretch);
1854 } 1854 }
1855 return cssValuePool().createValue(style->alignSelf()); 1855 return cssValuePool().createValue(style->alignSelf());
1856 case CSSPropertyWebkitFlex: 1856 case CSSPropertyFlex:
1857 return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthan d()); 1857 return getCSSPropertyValuesForShorthandProperties(flexShorthand());
1858 case CSSPropertyWebkitFlexBasis: 1858 case CSSPropertyFlexBasis:
1859 return cssValuePool().createValue(style->flexBasis()); 1859 return cssValuePool().createValue(style->flexBasis());
1860 case CSSPropertyWebkitFlexDirection: 1860 case CSSPropertyFlexDirection:
1861 return cssValuePool().createValue(style->flexDirection()); 1861 return cssValuePool().createValue(style->flexDirection());
1862 case CSSPropertyWebkitFlexFlow: 1862 case CSSPropertyFlexFlow:
1863 return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShor thand()); 1863 return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand( ));
1864 case CSSPropertyWebkitFlexGrow: 1864 case CSSPropertyFlexGrow:
1865 return cssValuePool().createValue(style->flexGrow()); 1865 return cssValuePool().createValue(style->flexGrow());
1866 case CSSPropertyWebkitFlexShrink: 1866 case CSSPropertyFlexShrink:
1867 return cssValuePool().createValue(style->flexShrink()); 1867 return cssValuePool().createValue(style->flexShrink());
1868 case CSSPropertyWebkitFlexWrap: 1868 case CSSPropertyFlexWrap:
1869 return cssValuePool().createValue(style->flexWrap()); 1869 return cssValuePool().createValue(style->flexWrap());
1870 case CSSPropertyWebkitJustifyContent: 1870 case CSSPropertyJustifyContent:
1871 return cssValuePool().createValue(style->justifyContent()); 1871 return cssValuePool().createValue(style->justifyContent());
1872 case CSSPropertyWebkitOrder: 1872 case CSSPropertyOrder:
1873 return cssValuePool().createValue(style->order(), CSSPrimitiveValue: :CSS_NUMBER); 1873 return cssValuePool().createValue(style->order(), CSSPrimitiveValue: :CSS_NUMBER);
1874 case CSSPropertyFloat: 1874 case CSSPropertyFloat:
1875 if (style->display() != NONE && style->hasOutOfFlowPosition()) 1875 if (style->display() != NONE && style->hasOutOfFlowPosition())
1876 return cssValuePool().createIdentifierValue(CSSValueNone); 1876 return cssValuePool().createIdentifierValue(CSSValueNone);
1877 return cssValuePool().createValue(style->floating()); 1877 return cssValuePool().createValue(style->floating());
1878 case CSSPropertyFont: { 1878 case CSSPropertyFont: {
1879 RefPtr<FontValue> computedFont = FontValue::create(); 1879 RefPtr<FontValue> computedFont = FontValue::create();
1880 computedFont->style = fontStyleFromStyle(style.get()); 1880 computedFont->style = fontStyleFromStyle(style.get());
1881 computedFont->variant = fontVariantFromStyle(style.get()); 1881 computedFont->variant = fontVariantFromStyle(style.get());
1882 computedFont->weight = fontWeightFromStyle(style.get()); 1882 computedFont->weight = fontWeightFromStyle(style.get());
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
2984 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2984 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2985 CSSPropertyB ackgroundClip }; 2985 CSSPropertyB ackgroundClip };
2986 2986
2987 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2987 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2988 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2988 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2989 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2990 return list.release(); 2990 return list.release();
2991 } 2991 }
2992 2992
2993 } // namespace WebCore 2993 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698