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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 478233004: Flexbox flex: 1 incorrectly sets flex-basis to 0px (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 5765 matching lines...) Expand 10 before | Expand all | Expand 10 after
5776 return false; 5776 return false;
5777 } 5777 }
5778 args->next(); 5778 args->next();
5779 } 5779 }
5780 5780
5781 if (flexGrow == unsetValue) 5781 if (flexGrow == unsetValue)
5782 flexGrow = 1; 5782 flexGrow = 1;
5783 if (flexShrink == unsetValue) 5783 if (flexShrink == unsetValue)
5784 flexShrink = 1; 5784 flexShrink = 1;
5785 if (!flexBasis) 5785 if (!flexBasis)
5786 flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX); 5786 flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PERCENT AGE);
5787 5787
5788 addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(fle xGrow), CSSPrimitiveValue::CSS_NUMBER), important); 5788 addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(fle xGrow), CSSPrimitiveValue::CSS_NUMBER), important);
5789 addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(f lexShrink), CSSPrimitiveValue::CSS_NUMBER), important); 5789 addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(f lexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
5790 addProperty(CSSPropertyFlexBasis, flexBasis, important); 5790 addProperty(CSSPropertyFlexBasis, flexBasis, important);
5791 return true; 5791 return true;
5792 } 5792 }
5793 5793
5794 bool CSSPropertyParser::parseObjectPosition(bool important) 5794 bool CSSPropertyParser::parseObjectPosition(bool important)
5795 { 5795 {
5796 RefPtrWillBeRawPtr<CSSValue> xValue = nullptr; 5796 RefPtrWillBeRawPtr<CSSValue> xValue = nullptr;
(...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after
8428 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8428 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8429 if (!seenStroke) 8429 if (!seenStroke)
8430 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8430 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8431 if (!seenMarkers) 8431 if (!seenMarkers)
8432 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8432 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8433 8433
8434 return parsedValues.release(); 8434 return parsedValues.release();
8435 } 8435 }
8436 8436
8437 } // namespace blink 8437 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698