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

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

Issue 23537037: [CSS Grid Layout] Use CSS_FR for flexible lengths instead of CSS_DIMENSION (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed the FIXME :) Created 7 years, 3 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
« no previous file with comments | « no previous file | Source/core/css/CSSPrimitiveValue.cpp » ('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 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 break; 994 break;
995 } 995 }
996 list->append(filterValue.release()); 996 list->append(filterValue.release());
997 } 997 }
998 998
999 return list.release(); 999 return list.release();
1000 } 1000 }
1001 1001
1002 static PassRefPtr<CSSValue> valueForGridTrackBreadth(const GridLength& trackBrea dth, const RenderStyle* style, RenderView* renderView) 1002 static PassRefPtr<CSSValue> valueForGridTrackBreadth(const GridLength& trackBrea dth, const RenderStyle* style, RenderView* renderView)
1003 { 1003 {
1004 if (!trackBreadth.isLength()) { 1004 if (!trackBreadth.isLength())
1005 String flex = String::number(trackBreadth.flex()) + "fr"; 1005 return cssValuePool().createValue(trackBreadth.flex(), CSSPrimitiveValue ::CSS_FR);
1006 return cssValuePool().createValue(flex, CSSPrimitiveValue::CSS_DIMENSION );
1007 }
1008 1006
1009 const Length& trackBreadthLength = trackBreadth.length(); 1007 const Length& trackBreadthLength = trackBreadth.length();
1010 if (trackBreadthLength.isAuto()) 1008 if (trackBreadthLength.isAuto())
1011 return cssValuePool().createIdentifierValue(CSSValueAuto); 1009 return cssValuePool().createIdentifierValue(CSSValueAuto);
1012 if (trackBreadthLength.isViewportPercentage()) 1010 if (trackBreadthLength.isViewportPercentage())
1013 return zoomAdjustedPixelValue(valueForLength(trackBreadthLength, 0, rend erView), style); 1011 return zoomAdjustedPixelValue(valueForLength(trackBreadthLength, 0, rend erView), style);
1014 return zoomAdjustedPixelValueForLength(trackBreadthLength, style); 1012 return zoomAdjustedPixelValueForLength(trackBreadthLength, style);
1015 } 1013 }
1016 1014
1017 static PassRefPtr<CSSValue> valueForGridTrackSize(const GridTrackSize& trackSize , const RenderStyle* style, RenderView* renderView) 1015 static PassRefPtr<CSSValue> valueForGridTrackSize(const GridTrackSize& trackSize , const RenderStyle* style, RenderView* renderView)
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after
3202 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3200 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3203 CSSPropertyB ackgroundClip }; 3201 CSSPropertyB ackgroundClip };
3204 3202
3205 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3203 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3206 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3204 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3207 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3205 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3208 return list.release(); 3206 return list.release();
3209 } 3207 }
3210 3208
3211 } // namespace WebCore 3209 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSPrimitiveValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698