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

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

Issue 15758002: Unprefix Flexbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased 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 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 return list.release(); 1857 return list.release();
1858 } 1858 }
1859 return value.release(); 1859 return value.release();
1860 } 1860 }
1861 case CSSPropertyDirection: 1861 case CSSPropertyDirection:
1862 return cssValuePool().createValue(style->direction()); 1862 return cssValuePool().createValue(style->direction());
1863 case CSSPropertyDisplay: 1863 case CSSPropertyDisplay:
1864 return cssValuePool().createValue(style->display()); 1864 return cssValuePool().createValue(style->display());
1865 case CSSPropertyEmptyCells: 1865 case CSSPropertyEmptyCells:
1866 return cssValuePool().createValue(style->emptyCells()); 1866 return cssValuePool().createValue(style->emptyCells());
1867 case CSSPropertyWebkitAlignContent: 1867 case CSSPropertyAlignContent:
1868 return cssValuePool().createValue(style->alignContent()); 1868 return cssValuePool().createValue(style->alignContent());
1869 case CSSPropertyWebkitAlignItems: 1869 case CSSPropertyAlignItems:
1870 return cssValuePool().createValue(style->alignItems()); 1870 return cssValuePool().createValue(style->alignItems());
1871 case CSSPropertyWebkitAlignSelf: 1871 case CSSPropertyAlignSelf:
1872 if (style->alignSelf() == AlignAuto) { 1872 if (style->alignSelf() == AlignAuto) {
1873 Node* parent = styledNode->parentNode(); 1873 Node* parent = styledNode->parentNode();
1874 if (parent && parent->computedStyle()) 1874 if (parent && parent->computedStyle())
1875 return cssValuePool().createValue(parent->computedStyle()->a lignItems()); 1875 return cssValuePool().createValue(parent->computedStyle()->a lignItems());
1876 return cssValuePool().createValue(AlignStretch); 1876 return cssValuePool().createValue(AlignStretch);
1877 } 1877 }
1878 return cssValuePool().createValue(style->alignSelf()); 1878 return cssValuePool().createValue(style->alignSelf());
1879 case CSSPropertyWebkitFlex: 1879 case CSSPropertyFlex:
1880 return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthan d()); 1880 return getCSSPropertyValuesForShorthandProperties(flexShorthand());
1881 case CSSPropertyWebkitFlexBasis: 1881 case CSSPropertyFlexBasis:
1882 return cssValuePool().createValue(style->flexBasis()); 1882 return cssValuePool().createValue(style->flexBasis());
1883 case CSSPropertyWebkitFlexDirection: 1883 case CSSPropertyFlexDirection:
1884 return cssValuePool().createValue(style->flexDirection()); 1884 return cssValuePool().createValue(style->flexDirection());
1885 case CSSPropertyWebkitFlexFlow: 1885 case CSSPropertyFlexFlow:
1886 return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShor thand()); 1886 return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand( ));
1887 case CSSPropertyWebkitFlexGrow: 1887 case CSSPropertyFlexGrow:
1888 return cssValuePool().createValue(style->flexGrow()); 1888 return cssValuePool().createValue(style->flexGrow());
1889 case CSSPropertyWebkitFlexShrink: 1889 case CSSPropertyFlexShrink:
1890 return cssValuePool().createValue(style->flexShrink()); 1890 return cssValuePool().createValue(style->flexShrink());
1891 case CSSPropertyWebkitFlexWrap: 1891 case CSSPropertyFlexWrap:
1892 return cssValuePool().createValue(style->flexWrap()); 1892 return cssValuePool().createValue(style->flexWrap());
1893 case CSSPropertyWebkitJustifyContent: 1893 case CSSPropertyJustifyContent:
1894 return cssValuePool().createValue(style->justifyContent()); 1894 return cssValuePool().createValue(style->justifyContent());
1895 case CSSPropertyWebkitOrder: 1895 case CSSPropertyOrder:
1896 return cssValuePool().createValue(style->order(), CSSPrimitiveValue: :CSS_NUMBER); 1896 return cssValuePool().createValue(style->order(), CSSPrimitiveValue: :CSS_NUMBER);
1897 case CSSPropertyFloat: 1897 case CSSPropertyFloat:
1898 if (style->display() != NONE && style->hasOutOfFlowPosition()) 1898 if (style->display() != NONE && style->hasOutOfFlowPosition())
1899 return cssValuePool().createIdentifierValue(CSSValueNone); 1899 return cssValuePool().createIdentifierValue(CSSValueNone);
1900 return cssValuePool().createValue(style->floating()); 1900 return cssValuePool().createValue(style->floating());
1901 case CSSPropertyFont: { 1901 case CSSPropertyFont: {
1902 RefPtr<FontValue> computedFont = FontValue::create(); 1902 RefPtr<FontValue> computedFont = FontValue::create();
1903 computedFont->style = fontStyleFromStyle(style.get()); 1903 computedFont->style = fontStyleFromStyle(style.get());
1904 computedFont->variant = fontVariantFromStyle(style.get()); 1904 computedFont->variant = fontVariantFromStyle(style.get());
1905 computedFont->weight = fontWeightFromStyle(style.get()); 1905 computedFont->weight = fontWeightFromStyle(style.get());
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3015 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3015 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3016 CSSPropertyB ackgroundClip }; 3016 CSSPropertyB ackgroundClip };
3017 3017
3018 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3018 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3019 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator)))); 3019 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(prope rtiesBeforeSlashSeperator))));
3020 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator)))); 3020 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(CSSPropertyBackground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(proper tiesAfterSlashSeperator))));
3021 return list.release(); 3021 return list.release();
3022 } 3022 }
3023 3023
3024 } // namespace WebCore 3024 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698