| OLD | NEW |
| 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 5771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5782 return false; | 5782 return false; |
| 5783 } | 5783 } |
| 5784 args->next(); | 5784 args->next(); |
| 5785 } | 5785 } |
| 5786 | 5786 |
| 5787 if (flexGrow == unsetValue) | 5787 if (flexGrow == unsetValue) |
| 5788 flexGrow = 1; | 5788 flexGrow = 1; |
| 5789 if (flexShrink == unsetValue) | 5789 if (flexShrink == unsetValue) |
| 5790 flexShrink = 1; | 5790 flexShrink = 1; |
| 5791 if (!flexBasis) | 5791 if (!flexBasis) |
| 5792 flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX); | 5792 flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PERCENT
AGE); |
| 5793 | 5793 |
| 5794 addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(fle
xGrow), CSSPrimitiveValue::CSS_NUMBER), important); | 5794 addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(fle
xGrow), CSSPrimitiveValue::CSS_NUMBER), important); |
| 5795 addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(f
lexShrink), CSSPrimitiveValue::CSS_NUMBER), important); | 5795 addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(f
lexShrink), CSSPrimitiveValue::CSS_NUMBER), important); |
| 5796 addProperty(CSSPropertyFlexBasis, flexBasis, important); | 5796 addProperty(CSSPropertyFlexBasis, flexBasis, important); |
| 5797 return true; | 5797 return true; |
| 5798 } | 5798 } |
| 5799 | 5799 |
| 5800 bool CSSPropertyParser::parseObjectPosition(bool important) | 5800 bool CSSPropertyParser::parseObjectPosition(bool important) |
| 5801 { | 5801 { |
| 5802 RefPtrWillBeRawPtr<CSSValue> xValue = nullptr; | 5802 RefPtrWillBeRawPtr<CSSValue> xValue = nullptr; |
| (...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8434 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8434 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8435 if (!seenStroke) | 8435 if (!seenStroke) |
| 8436 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8436 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8437 if (!seenMarkers) | 8437 if (!seenMarkers) |
| 8438 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8438 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8439 | 8439 |
| 8440 return parsedValues.release(); | 8440 return parsedValues.release(); |
| 8441 } | 8441 } |
| 8442 | 8442 |
| 8443 } // namespace blink | 8443 } // namespace blink |
| OLD | NEW |